diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/main.py b/main.py
index e26f08e..e4070c2 100644
--- a/main.py
+++ b/main.py
@@ -2,14 +2,48 @@
 
 import asyncio
 import os
+import json
 
 import websockets
 
-async def echo(websocket, path):
-    async for message in websocket:
-        await websocket.send(message)
+GAMES = {}
 
-start_server = websockets.serve(echo, "", int(os.environ["PORT"]))
+# EVENT RESPONSES
+
+def wait_for_player_response():
+    return json.dump({"type": "wait_for_player"})
+
+def start_game_response():
+    return json.dump({"type": "start_game"})
+
+# EVENTS
+
+async def enter_game(game_id, player_web_socket):
+    # TODO fix asssumption that there will only be two players per game
+    if game_id not in GAMES:
+        GAMES[game_id] = {'players': [player_web_socket], 'game_id': game_id}
+        message = wait_for_player_response()
+        await player_web_socket.send(message)
+    else:
+        GAMES[game_id]['players'].append(player_web_socket)
+        message = start_game_response()
+        await asyncio.wait([player.send(message) for player in GAMES[game_id]['players']])
+        
+# --------------------------
+
+async def init(websocket, path):
+    try:
+        async for message in websocket:
+            data = json.loads(message)
+            if data["action"] == "enter_game":
+                await enter_game(data["gameId"], websocket)
+            else:
+                print("Unsupported action...")
+    finally:
+        print("Connection closed...")
+
+#start_server = websockets.serve(init, "", int(os.environ["PORT"]))
+start_server = websockets.serve(init, "localhost", 5001)
 
 asyncio.get_event_loop().run_until_complete(start_server)
 asyncio.get_event_loop().run_forever()
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 4629e89..71b6983 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-asyncio
-websockets
\ No newline at end of file
+asyncio==3.4.3
+websockets==9.1
\ No newline at end of file