diff --git a/server/src/events/lobby/create.ts b/server/src/events/lobby/create.ts
index 45f9c33..0fae63b 100644
--- a/server/src/events/lobby/create.ts
+++ b/server/src/events/lobby/create.ts
@@ -2,6 +2,7 @@ import { Status, ICreateLobby, colours, spaceships } from "common";
 import { WebsocketEvent } from "@/types/WebsocketEvent";
 import { Player } from "@/objects/Player";
 import { Game } from "@/objects/Game";
+import { games } from "@/main";
 
 const data: WebsocketEvent = {
 	name: "req:lobby.create",
@@ -24,7 +25,17 @@ const data: WebsocketEvent = {
 			ship: spaceships[0],
 		});
 		let game = new Game(host);
-		game.log.info(`New game created by ${data.name}`)
+		game.log.info(`New game created by ${data.name}`);
+
+		socket.join(game.id);
+		socket.emit(`res:lobby.create`, {
+			status: Status.Success,
+			game_code: game.id,
+			players: [],
+		});
+
+		games.set(game);
+		games.cleanup();
 	},
 };
 export default data;
\ No newline at end of file