diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/MessageFormatter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/MessageFormatter.java
index 066b7a1..5325e86 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/MessageFormatter.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/MessageFormatter.java
@@ -65,6 +65,13 @@ public class MessageFormatter {
         stringBuilder.append(Protocol.listLobbies + "$");
         s = ""; //Command has no parameters
         break;
+      case "/j":
+        stringBuilder.append(Protocol.joinLobby + "$");
+        try {
+          s = msg.substring(3);
+        } catch (Exception ignored) {
+        }
+        break;
       default:
         s = msg;
     }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java
index 1c18590..5729ae4 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java
@@ -113,6 +113,11 @@ public class Protocol {
    */
   public static final String leaveLobby = "LEAVL";
 
+  /**
+   * Whisper chat
+   */
+  public static final String whisper ="WHISP";
+
 
 
   //SERVER TO CLIENT COMMANDS