diff --git a/frontend/src/ws/websocket.ts b/frontend/src/ws/websocket.ts
index 165f245..ba91dcb 100644
--- a/frontend/src/ws/websocket.ts
+++ b/frontend/src/ws/websocket.ts
@@ -1,6 +1,7 @@
 // nice and easy way to get types for the
 
 import { User } from "next-auth";
+import EventEmitter from "events";
 import IdentityData from "../interfaces/Identity";
 import { MessageTypes } from "../interfaces/IMessage";
 import Message from "../util/Message";
@@ -15,15 +16,28 @@ if (typeof window !== "undefined") {
 }
 
 export default class PlayerSocket extends Websocket {
+  private clientID: string;
+  public emitter: EventEmitter;
   constructor(private user: User) {
     super(process.env.NEXT_PUBLIC_WS_URI);
+    this.emitter = new EventEmitter();
+    this.clientID = process.env.NEXT_PUBLIC_CLIENT_ID;
     this.onopen = this.onOpen;
+    this.onmessage = this.onMessage;
+    this.onclose = this.onClose;
+  }
+  onMessage(evt: MessageEvent<any>) {
+    let message = MessageUtil.decode(evt.data);
+    if (message.type === MessageTypes["Ping"]) {
+      return;
+    }
+    this.emitter.emit(MessageTypes[message.type], message.data);
   }
   onOpen() {
     this.send(
       MessageUtil.encode(
         new Message(MessageTypes.Identify, {
-          clientID: process.env.NEXT_PUBLIC_CLIENT_ID,
+          clientID: this.clientID,
           user: {
             id: this.user.id,
             name: this.user.name,
@@ -31,6 +45,7 @@ export default class PlayerSocket extends Websocket {
         } as IdentityData)
       )
     );
+    this.emitter.emit("open");
     this.pingEvent();
   }
   pingEvent() {
@@ -40,9 +55,20 @@ export default class PlayerSocket extends Websocket {
         return;
       }
       console.log("[WS] running ping event");
-      this.send(MessageUtil.encode(new Message(MessageTypes.Ping)));
+      this.send(
+        MessageUtil.encode(
+          new Message(MessageTypes.Ping, {
+            clientID: this.clientID,
+          })
+        )
+      );
     }, 20000);
   }
+  onClose(event: CloseEvent) {
+    console.log("[WS] socket connection closed");
+    console.log(event);
+    this.emitter.emit("closed");
+  }
   get open() {
     return this.readyState === this.OPEN;
   }