diff --git a/html/oldIndex.html b/html/oldIndex.html
index 26c2037..c5cebad 100644
--- a/html/oldIndex.html
+++ b/html/oldIndex.html
@@ -18,7 +18,6 @@ <h1>Welcome to The Word Search Game</h1>
         <form id="nickForm">
             <label for="nickInput">Enter your nickname:</label>
             <input type="text" id="nickInput" placeholder="Nickname" required>
-            <button type="submit">Enter Lobby</button>
             <p id="error" style="color: red; display: none;">Your nick is already taken, please reenter.</p>
         </form>
     </div>
@@ -91,15 +90,15 @@ <h1>The Word Search Game</h1>
         </div>
         <div id="gameListSection">
             <p style="display: inline;">Game1</p>
-            <div class="Room" id="Game1" style="display: block;">text</div>
+            <div class="Room" id="Game1" style="display: block;"></div>
             <p style="display: inline;">Game2</p>
-            <div class="Room" id="Game2" style="display: block;">text</div>
+            <div class="Room" id="Game2" style="display: block;"></div>
             <p style="display: inline;">Game3</p>
-            <div class="Room" id="Game3" style="display: block;">text</div>
+            <div class="Room" id="Game3" style="display: block;"></div>
             <p style="display: inline;">Game4</p>
-            <div class="Room" id="Game4" style="display: block;">text</div>
+            <div class="Room" id="Game4" style="display: block;"></div>
             <p style="display: inline;">Game5</p>
-            <div class="Room" id="Game5" style="display: block;">text</div>
+            <div class="Room" id="Game5" style="display: block;"></div>
         </div>
 
 
@@ -157,6 +156,8 @@ <h2>Leaderboard</h2>
     var attemptArr;//array of cell numbers in an attempt
     var score;
     var playerColor="";
+    var message="";
+    var allMessages=new Array();
     socket.onopen = function(evt) {
         console.log("Open");
         requestGameList();
@@ -254,11 +255,16 @@ <h2>Leaderboard</h2>
             document.getElementsByClassName("Room").innerHTML="";
             for(i=0;i<keys.length;i++)
             {
-                lobbyInfo = "Slots filled: \n"
+                
                 document.getElementById(values[i]).innerHTML=keys[i]+"\n";
             }
             
         }
+        else if(type==="message")
+        {
+            allMessages.push(messageData.player+": "+ messageData.message);
+            console.log(allMessages);
+        }
 
     };
 
@@ -309,7 +315,6 @@ <h2>Leaderboard</h2>
         console.log("GameId after confirmation: "+gameId);
         var mode = document.getElementById('modeSelect').value;
         playerColor = document.getElementById('playerColor').value;
-
         player.nick=nick;
         
         if (!nick) 
@@ -322,7 +327,7 @@ <h2>Leaderboard</h2>
             alert('Please select a game and mode.');
             return;
         }
-        
+        sendChat(nick,document.getElementById('nickInput').value.trim());
         joinGame(nick, gameIndex, mode);
         
     });
@@ -539,5 +544,15 @@ <h2>Leaderboard</h2>
     socket.send(JSON.stringify(data));
     
 }
+
+function sendChat(nick,message)
+{
+    var data={
+        type: "message",
+        message: message,
+        player: nick
+    }
+    socket.send(JSON.stringify(data));
+}
 </script>
 
diff --git a/src/main/java/uta/cse3310/App.java b/src/main/java/uta/cse3310/App.java
index dab8064..8e9ea34 100644
--- a/src/main/java/uta/cse3310/App.java
+++ b/src/main/java/uta/cse3310/App.java
@@ -322,8 +322,15 @@ public void toLobby() {
         // Logic for navigating to the lobby
     }
 
-    public void globalChat() {
-        // Logic for handling global chat
+    public void globalChat(Gson gson, JsonObject object)
+    {
+        // Logic for handling local chat
+        JsonObject jsonObject=new JsonObject();
+        jsonObject.addProperty("type","message");
+        jsonObject.addProperty("message",object.get("message").getAsString());
+        jsonObject.addProperty("player",object.get("player").getAsString());
+
+        broadcast(jsonObject.toString());
     }
 
     public void getPlayerColor() {
@@ -507,6 +514,9 @@ public void messageHandler(Gson gson, String jsonString, WebSocket conn)
             case("updateLobby"):
                 updateLobby(gson,jsonObject);
                 break;
+            case("message"):
+                globalChat(gson,object);
+                break;
             default:
                 System.out.println("Unexpected message");