diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java
index 26ed67a..52e7fb3 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java
@@ -18,7 +18,7 @@ public class ChatApp extends Application {
   public static final BudaLogConfig l = new BudaLogConfig(LOGGER);
 
   private  static ClientModel clientModel;
-  private ChatController chatController;
+  private static ChatController chatController;
 
   public ChatApp() {
     super();
@@ -31,9 +31,9 @@ public class ChatApp extends Application {
     this.chatController = new ChatController(clientModel);
   }
 
-  public void setChatController(
-      ChatController chatController) {
-    this.chatController = chatController;
+  public static void setChatController(
+      ChatController chatC) {
+    chatController = chatC;
   }
 
   public static void setClientModel(ClientModel clientM) {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java
index caf52ef..eacfbc3 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java
@@ -1,6 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.chat;
 
 
+import ch.unibas.dmi.dbis.cs108.BudaLogConfig;
 import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ClientModel;
 import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.Protocol;
 import java.net.URL;
@@ -23,8 +24,12 @@ import javafx.scene.control.TextField;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class ChatController implements Initializable {
+  public static final Logger LOGGER = LogManager.getLogger(ChatController.class);
+  public static final BudaLogConfig l = new BudaLogConfig(LOGGER);
 
   @FXML
   private SplitPane chatPaneRoot;
@@ -49,12 +54,12 @@ public class ChatController implements Initializable {
   public ChatController() { //TODO: why does this get called
     super();
     whisperTargetChosen = new SimpleBooleanProperty();
-    cmd = "";
+    cmd = "CHATA$";
   }
   public ChatController(ClientModel client) {
     this.client = client;
     whisperTargetChosen = new SimpleBooleanProperty();
-    cmd = "";
+    cmd = "CHATA";
 
   }
 
@@ -69,6 +74,7 @@ public class ChatController implements Initializable {
   @Override
   public void initialize(URL location, ResourceBundle resources) {
   setClient(ChatApp.getClientModel());
+  ChatApp.setChatController(this);
     vBoxChatMessages.getChildren().addListener(new ListChangeListener<Node>() {
       @Override
       public void onChanged(Change<? extends Node> c) {
@@ -100,6 +106,7 @@ public class ChatController implements Initializable {
         String msg = chatMsgField.getText();
         if (!msg.isEmpty()) {
           client.getClient().sendMsgToServer(cmd.toString() + msg);
+          LOGGER.info("Message trying to send is: " + cmd.toString() + msg);
           Label l = new Label(client.getUsername() + " (you): " + msg);
           l.setBackground(Background.fill(Color.LAVENDER));
           vBoxChatMessages.getChildren().add(l);