diff --git a/TODO b/TODO
index bb5574e..715c96e 100644
--- a/TODO
+++ b/TODO
@@ -5,17 +5,17 @@
         [x] Fix user timeouts / deletion
             [x] User sockets, or "users" are made innactive after timeout on socket
              -  Prevents softlock of users and stops socket spamming
-    [ ] Game lobying system
+    [-] Game lobying system
         [ ] Delete lobby once user disconnects
         [ ] Matchmaking system
     [ ] 1v1 game framework that allows spectators
         [ ] 
     [ ] Game logic implementation
 [ ] CLIENT
-    [ ] Lobby page
+    [-] Lobby page
         [x] Basic connection stuff
-        [ ] Create lobby
-        [ ] Join lobby
+        [x] Create lobby
+        [x] Join lobby
         [ ] Public lobby list
         [ ] Matchmaking with ELO system (?)
     [ ] Save username and re-request automatically if uid changed
diff --git a/server/src/game-registrar.js b/server/src/game-registrar.js
index a6eae64..c443d2a 100644
--- a/server/src/game-registrar.js
+++ b/server/src/game-registrar.js
@@ -149,24 +149,31 @@ function UserDisconnect(useruid)
 
 
 module.exports = {
+    // Global exports
     OnlineUsers: OnlineUsers,
 
+    // User validation exports
     CheckUsernameAvailability: CheckUsernameAvailability,
     CheckValidUID: CheckValidUID,
     CountIPs: CountIPs,
     ValidUsername: ValidUsername,
 
+    // Get user exports
     GetUserByUID: GetUserByUID,
     GetUserByUsername: GetUserByUsername,
     
+    // Change user state exports
     RegisterUser: RegisterUser,
     DeRegisterUser: DeRegisterUser,
 
 
+    // User connection validation exports
     UserConnectionExists: UserConnectionExists,
     
+    // Get user connection exports
     GetUserbyConnection: GetUserbyConnection,
 
+    // Change user connection state exports
     UserConnect: UserConnect,
     UserDisconnect: UserDisconnect
 }
diff --git a/server/src/lobbies.js b/server/src/lobbies.js
index db9dcf6..b0c518f 100644
--- a/server/src/lobbies.js
+++ b/server/src/lobbies.js
@@ -79,11 +79,14 @@ function DeRegisterLobby(lobbyid)
 
 
 module.exports = {
+    // Lobby validation exports
     CheckUserAvailability: CheckUserAvailability,
 
+    // Get lobby exports
     GetLobbyByUID: GetLobbyByUID,
     GetLobbyByUserUID: GetLobbyByUserUID,
 
+    // Change lobby state exports
     RegisterLobby: RegisterLobby,
     DeRegisterLobby: DeRegisterLobby
 }