From 509aa71d9fd704f2a15ed9221b295729a08116e6 Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Tue, 7 Apr 2026 22:08:16 +0200
Subject: [PATCH] Add: Implement Commands for Chat Protocol

---
 build.gradle                                  |   2 +-
 .../casono/client/chat/ChatController.java    |  86 +++++++++----
 .../cs108/casono/client/chat/ChatModel.java   |  61 +++++----
 .../cs108/casono/client/chat/Message.java     |  60 +++++++--
 .../casono/client/network/ChatClient.java     |  13 +-
 .../casono/client/network/ClientService.java  |  32 +++--
 .../casono/client/network/CoreClient.java     |   1 -
 .../client/ui/chatui/ChatBoxController.java   |  63 +++++++++
 .../client/ui/chatui/ChatViewController.java  | 120 +++++++-----------
 .../client/ui/chatui/GlobalChatView.java      |  73 -----------
 .../client/ui/chatui/LobbyChatView.java       |  72 -----------
 .../client/ui/chatui/WhisperChatView.java     |   3 -
 .../client/ui/lobbyui/Casinomainui.java       |   4 +-
 .../dbis/cs108/casono/server/ServerApp.java   |  35 ++++-
 .../check_nick/CheckUsernameParser.java       |   2 +-
 .../check_nick/CheckUsernameResponse.java     |   4 +-
 .../check_nick/UsernameAvailability.java      |   2 +-
 .../GetMessageCountHandler.java               |  40 ++++++
 .../GetMessageCountParser.java                |  13 ++
 .../GetMessageCountRequest.java               |  10 ++
 .../GetMessageCountResponse.java              |  13 ++
 .../GetNextMessageHandler.java                |  41 ++++++
 .../GetNextMessageParser.java                 |  13 ++
 .../GetNextMessageRequest.java                |  10 ++
 .../GetNextMessageResponse.java               |  14 ++
 .../send_message/SendMessageHandler.java      |  30 +++++
 .../send_message/SendMessageParser.java       |  13 ++
 .../send_message/SendMessageRequest.java      |  19 +++
 .../server/domain/message/MessageManager.java |   4 +-
 .../cs108/casono/server/domain/user/User.java |  11 +-
 .../protocol/response/SuccessResponse.java    |   4 +-
 .../components/chatui/chatbox.fxml            |  56 +++-----
 .../chatui/{globalchat.fxml => chattab.fxml}  |  24 ++--
 .../components/chatui/lobbychat.fxml          |  39 ------
 .../components/chatui/whisperchat.fxml        |  37 ------
 .../dbis/cs108/casono/client/chat/Chat.java   |   9 ++
 .../casono/client/chat/ChatApplication.java   |  48 +++++++
 .../cs108/casono/client/chat/ChatTest.java    |   2 +-
 38 files changed, 644 insertions(+), 439 deletions(-)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountHandler.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountParser.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountRequest.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountResponse.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageParser.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageRequest.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageRequest.java
 rename src/main/resources/ui-structure/components/chatui/{globalchat.fxml => chattab.fxml} (52%)
 delete mode 100644 src/main/resources/ui-structure/components/chatui/lobbychat.fxml
 delete mode 100644 src/main/resources/ui-structure/components/chatui/whisperchat.fxml
 create mode 100644 src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Chat.java
 create mode 100644 src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java

diff --git a/build.gradle b/build.gradle
index 4360c82..6f82563 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     // Source: https://mvnrepository.com/artifact/org.apache.logging.log4j
     implementation("org.apache.logging.log4j:log4j-api:2.25.3")
     runtimeOnly("org.apache.logging.log4j:log4j-core:2.25.3")
-
+    implementation("org.jspecify:jspecify:1.0.0")
     // Source: https://mvnrepository.com/artifact/org.fusesource.jansi/jansi
     runtimeOnly("org.fusesource.jansi:jansi:2.4.2")
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
index c3a809f..a3861a5 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
@@ -2,8 +2,15 @@ package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ChatClient;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
-import java.util.ArrayList;
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatBoxController;
+import org.jspecify.annotations.Nullable;
+
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.Map;
 import java.util.List;
+import java.util.LinkedHashMap;
+
 
 /**
  * responsible for the transferring of messages from the server to the ChatModel or from the
@@ -12,49 +19,84 @@ import java.util.List;
 public class ChatController {
 
     private final String username;
-    private final ClientService clientService;
 
-    private final ArrayList<ChatModel> chatModelArrayList;
     private final ChatClient chatClient;
 
+    public ChatBoxController getChatBoxController() {
+        return chatBoxController;
+    }
+
+    private final ChatBoxController chatBoxController;
+    private int lobbyId = -1;
+    private final Timer timer;
+
+
+    public record ChatKey(ChatType type, @Nullable String targetUser){
+        public ChatKey(ChatType type){
+            this(type, null);
+        }
+    }
+
+    public Map<ChatKey, ChatModel> getChatModelMap() {
+        return chatModelMap;
+    }
+
+    private Map<ChatKey, ChatModel> chatModelMap;
+
+    private static final long REFRESH_TIME = 1000;
+
     public ChatController(String username, ClientService clientService) {
         this.username = username;
-        this.clientService = clientService;
-        chatModelArrayList = new ArrayList<>();
-        chatModelArrayList.add(new ChatModel(ChatType.GLOBAL, username));
         chatClient = new ChatClient(clientService);
+        chatModelMap = new LinkedHashMap<>();
+        this.chatBoxController = new ChatBoxController(username, this);
+        this.timer = new Timer();
+        timer.schedule(
+                new TimerTask() {
+                    @Override
+                    public void run() {
+                        clientService.ping();
+                        receiveMessage();
+                    }
+                },
+                0,
+                REFRESH_TIME);
     }
 
-    public ChatModel getChatModel(int index) {
-        return chatModelArrayList.get(index);
-    }
-
-    public void createLobbyChat(int lobbyId, ChatType chatType) {
-        ChatModel chatModel = new ChatModel(chatType, username, lobbyId);
-        chatModelArrayList.add(chatModel);
+    public void setLobbyChat(int lobbyId) {
+        this.lobbyId = lobbyId;
+        ChatModel lobbyChatModel = new ChatModel(ChatType.LOBBY, username, lobbyId, null);
+        chatModelMap.put(new ChatKey(ChatType.LOBBY), lobbyChatModel);
     }
 
     /** method to get all messages from the server */
-    public Boolean receiveMessage() {
+    public void receiveMessage() {
         List<Message> newMessages = chatClient.getMessages();
         if (!newMessages.isEmpty()) {
             for (Message msg : newMessages) {
                 switch (msg.getMessageType()) {
                     case ChatType.GLOBAL:
-                        chatModelArrayList.get(0).addMessage(msg);
+                        chatModelMap.get(new ChatKey(ChatType.GLOBAL)).addMessage(msg);
                     case ChatType.LOBBY:
-                        ChatModel chatModel = chatModelArrayList.get(1);
-                        if (chatModel != null && chatModel.lobbyId == msg.lobbyId) {
-                            chatModel.addMessage(msg);
+                        if (msg.lobbyId == lobbyId) {
+                            chatModelMap.computeIfAbsent(new ChatKey(ChatType.LOBBY),
+                                    (_key) -> new ChatModel(ChatType.LOBBY, username, msg.lobbyId, null)).addMessage(msg);
                         }
                     case ChatType.WHISPER:
                         // TODO: Check, if target person is user and if yes, iterate through all
-                        // whisper chats.
+                        if (msg.target.equals(username)) {
+                            if (chatModelMap.containsKey(new ChatKey(ChatType.WHISPER, msg.sender))) {
+                                chatModelMap.get(new ChatKey(ChatType.WHISPER, msg.sender)).addMessage(msg);
+                            } else {
+                                ChatModel value = new ChatModel(ChatType.WHISPER, username, -1, msg.sender);
+                                chatModelMap.put(new ChatKey(ChatType.WHISPER, msg.sender), value);
+                                chatBoxController.addWhisperChat(msg.sender, value);
+                            }
+                        }
+
+
                 }
             }
-            return true;
-        } else {
-            return false;
         }
     }
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
index 6fd4177..894d957 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
@@ -1,5 +1,9 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+
 import java.util.ArrayList;
 
 /**
@@ -11,33 +15,30 @@ public class ChatModel {
 
     public ArrayList<Message> messages;
 
-    private ChatType chattype;
+    private final ChatType chattype;
 
-    public String username;
+    /**
+     * The person currently using this client
+     */
+    public final String username;
 
-    public int count;
+    /**
+     * The person to send the message to
+     * If the chat is a whisper chat
+     */
+    private final String target;
+
+    private final IntegerProperty count;
 
     public int lobbyId;
 
-    /**
-     * Creates a new ChatModel, given a username of the client
-     *
-     * @param chattype
-     * @param username
-     */
-    public ChatModel(ChatType chattype, String username) {
+    public ChatModel(ChatType chattype, String username, int lobbyId, String target) {
         this.messages = new ArrayList<Message>();
         this.chattype = chattype;
         this.username = username;
-        this.count = 0;
-    }
-
-    public ChatModel(ChatType chattype, String username, int lobbyId) {
-        this.messages = new ArrayList<Message>();
-        this.chattype = chattype;
-        this.username = username;
-        this.count = 0;
+        this.count = new SimpleIntegerProperty(0);
         this.lobbyId = lobbyId;
+        this.target = target;
     }
 
     public ChatType getChattype() {
@@ -49,9 +50,9 @@ public class ChatModel {
      * ChatModel
      */
     public synchronized String viewNextMessage() {
-        count--;
+        count.subtract(1);
         Message msg = messages.getLast();
-        return String.format("[%s] %s: %s", msg.timestamp, msg.user, msg.getMessage());
+        return String.format("[%s] %s: %s", msg.timestamp, msg.sender, msg.getMessage());
     }
 
     /**
@@ -61,13 +62,21 @@ public class ChatModel {
      */
     public synchronized void addMessage(Message msg) {
         messages.add(msg);
-        count++;
+        count.add(1);
     }
 
-    /** method to send all current messages to the ChatViewController, if needed */
-    public void addCompleteChat() {
-        for (int i = 0; i < this.messages.size(); i++) {
-            Message msg = this.messages.get(i);
-        }
+
+    public void addListener(ChatViewController chatViewController) {
+        count.addListener(
+                (_count, _p, n) ->
+                {
+                    if(n.intValue() > 0) {
+                        chatViewController.showMessage();
+                    }
+                });
+    }
+
+    public String getTarget() {
+        return target;
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
index 60cb568..7869271 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
@@ -1,7 +1,11 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
+import org.jspecify.annotations.NonNull;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -12,7 +16,7 @@ import java.util.regex.Pattern;
 public class Message {
     private final ChatType type;
     private final String message;
-    public String user;
+    public String sender;
     public String timestamp;
     public int lobbyId = 0;
     public String target = null;
@@ -22,20 +26,20 @@ public class Message {
      *
      * @param type - Either global, local or whisper
      * @param lobbyId - lobby id, or null, if the typChatType
-     * @param user - username
+     * @param sender - username
      * @param target - username of the target user, for whisper chat
      * @param message
      */
     public Message(
             ChatType type,
             int lobbyId,
-            String user,
+            String sender,
             String target,
             String timestamp,
             String message) {
         this.type = type;
         this.lobbyId = lobbyId;
-        this.user = user;
+        this.sender = sender;
         this.target = target;
         this.timestamp = timestamp;
         this.message = message;
@@ -47,14 +51,14 @@ public class Message {
      *
      * @param type - Either global, local or whisper
      * @param lobbyId - lobby id, or null, if the type is global
-     * @param user - username
+     * @param sender - username
      * @param target - username of the target user, for whisper chat
      * @param message
      */
-    public Message(ChatType type, int lobbyId, String user, String target, String message) {
+    public Message(ChatType type, int lobbyId, String sender, String target, String message) {
         this.type = type;
         this.lobbyId = lobbyId;
-        this.user = user;
+        this.sender = sender;
         this.target = target;
         this.message = message;
         LocalDateTime now = LocalDateTime.now();
@@ -77,10 +81,10 @@ public class Message {
      */
     public String toArgsString() {
         return String.format(
-                "TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s",
+                "TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT='%s'",
                 this.type.toString(),
                 this.lobbyId,
-                this.user,
+                this.sender,
                 this.target,
                 this.timestamp,
                 this.message);
@@ -91,7 +95,7 @@ public class Message {
             Pattern.compile(
                     "TYPE=(?<type>\\w+) " + "GAME=(?<game>\\w+) " +
                             "USER=(?<user>\\w+) " + "TARGET=(?<target>\\w+) " +
-                            "TIME=(?<time>[0-9:.]+) " + "TEXT=(?<text>.*)$");
+                            "TIME=(?<time>[0-9:.]+) " + "TEXT='(?<text>([^']|\\')+)'");
 
     /**
      * Method to create a Message Object, from the information given by the String
@@ -138,4 +142,40 @@ public class Message {
                 throw new RuntimeException("Unknown message type " + typeString);
         }
     }
+
+    public static Message toMessage(List<RequestParameter> parameters) {
+        String typeString = getParString(parameters, "TYPE");
+        ChatType type = ChatType.valueOf(typeString);
+        return switch (type) {
+            case GLOBAL -> new Message(ChatType.GLOBAL,
+                    0,
+                    getParString(parameters, "USER"),
+                    null,
+                    getParString(parameters, "TIME"),
+                    getParString(parameters, "TEXT")
+            );
+            case LOBBY -> new Message(ChatType.LOBBY,
+                    Integer.parseInt(getParString(parameters, "GAME")),
+                    getParString(parameters, "USER"),
+                    null,
+                    getParString(parameters, "TIME"),
+                    getParString(parameters, "TEXT")
+            );
+            case WHISPER -> new Message(ChatType.WHISPER,
+                    Integer.parseInt(getParString(parameters, "GAME")),
+                    getParString(parameters, "USER"),
+                    getParString(parameters, "TARGET"),
+                    getParString(parameters, "TIME"),
+                    getParString(parameters, "TEXT")
+            );
+        };
+
+    }
+
+    private static @NonNull String getParString(List<RequestParameter> parameters, String keyString) {
+        return parameters.stream().filter((p) -> "TYPE".equals(p.key()))
+                .findFirst()
+                .map(RequestParameter::value)
+                .orElseThrow(() -> new RuntimeException("No " + keyString + " found"));
+    }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
index e5a17cb..8284077 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
@@ -4,6 +4,8 @@ import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * The ChatClient class is responsible for sending messages to the server and
@@ -12,7 +14,7 @@ import java.util.List;
  */
 public class ChatClient {
 
-    private ClientService clientService;
+    private final ClientService clientService;
 
     /**
      * Constructs a ChatClient with the given ClientService for communication.
@@ -46,7 +48,11 @@ public class ChatClient {
      */
     public List<Message> getMessages() {
         String countStr = clientService.processCommand("GET_MESSAGE_COUNT");
-        int count = Integer.parseInt(countStr);
+        Matcher m = countRex.matcher(countStr);
+        if (!m.matches()) {
+            throw new RuntimeException("Can not parse response: " + countStr);
+        }
+        int count = Integer.parseInt(m.group("count"));
         System.out.println("Got " + count + " messages");
         List<Message> messages = new ArrayList<>();
         for (int i = 0; i < count; i++) {
@@ -58,4 +64,7 @@ public class ChatClient {
         }
         return messages;
     }
+
+    public static Pattern countRex = Pattern.compile("COUNT=(?<count>[0-9]+)");
 }
+// (?<key>\w+)='(?<string>([^']|\')+)'|(?<primVal>[\d\w]+)
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index e5785a9..b347ad6 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -1,10 +1,10 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.network;
 
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TcpTransport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+
 import java.io.IOException;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -71,16 +71,24 @@ public class ClientService {
                 () -> {
                     try {
                         writeToTransport(message);
-                        String responseLine = null;
+                        String responseText = null;
                         do {
-                            responseLine = clienttcptransport.read().payload();
-                            logger.info("Raw message '" + responseLine + "'");
-                            if ("+OK".equals(responseLine)) {
-                                return;
-                            } else if (("-ERROR").equals(responseLine)) {
-                                throw new RuntimeException(responseLine);
+                            responseText = clienttcptransport.read().payload();
+                            logger.info("Raw message '" + responseText + "'");
+                            for(String line: responseText.split("\n")) {
+                                if ("+OK".equals(line)) {
+                                    return;
+                                } else if (("-ERROR").equals(responseText)) {
+                                    throw new RuntimeException(responseText);
+                                } else {
+                                    String start = response.get();
+                                    if(start == null) {
+                                        response.set(line);
+                                    } else {
+                                        response.set(start + "\n" + line);
+                                    }
+                                }
                             }
-                            response.set(responseLine);
                         } while (true);
                     } catch (Exception e) {
                         throw getRuntimeException(e);
@@ -158,4 +166,10 @@ public class ClientService {
         int id = this.idGenerator.incrementAndGet();
         this.clienttcptransport.write(new RawPacket(id, s));
     }
+
+    public void ping() {
+        processCommand("PING");
+    }
+
+
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
index 2db2111..99827f6 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java
@@ -9,7 +9,6 @@ package ch.unibas.dmi.dbis.cs108.casono.client.network;
  */
 public class CoreClient {
     private final ClientService clientService;
-
     /**
      * Constructs a CoreClient with the given ClientService for communication.
      *
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java
new file mode 100644
index 0000000..020bffa
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java
@@ -0,0 +1,63 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.layout.VBox;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class ChatBoxController {
+
+    private String username;
+
+    private ChatController chatController;
+
+    @FXML private VBox chatBox;
+
+    @FXML private TabPane ChatTabPane;
+
+    private FXMLLoader fxmlLoader;
+
+    private String ressource =  "/ui-structure/components/chatui/chattab.fxml";
+
+
+    public ChatBoxController(String username, ChatController chatController) {
+        this.username = username;
+        this.chatController = chatController;
+    }
+
+    @FXML
+    public void initialize() {
+        ChatModel globalChatModel = new ChatModel(ChatType.GLOBAL, username, -1, null);
+        chatController.getChatModelMap().put(new ChatController.ChatKey(ChatType.GLOBAL), globalChatModel);
+        addChatTab("GLOBAL", globalChatModel);
+        //TODO: Button to add new Whisper Chat
+    }
+
+
+    public void addWhisperChat(String target, ChatModel chatModel) {
+        chatController.getChatModelMap().put(new ChatController.ChatKey(ChatType.WHISPER, target), chatModel);
+        addChatTab(target, chatModel);
+    }
+
+
+    public void addChatTab(String title, ChatModel chatModel) {
+        URL resource = getClass().getResource(ressource);
+        FXMLLoader fxmlLoader = new FXMLLoader(resource);
+        ChatViewController chatViewController = new ChatViewController(username, chatModel, chatController);
+        chatModel.addListener(chatViewController);
+        try {
+            fxmlLoader.setController(chatViewController);
+            Tab newChat = new Tab(title, fxmlLoader.load());
+            this.ChatTabPane.getTabs().add(newChat);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
index 17d07ec..eaf6e94 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
@@ -2,45 +2,40 @@ package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
 
 import java.net.URL;
 import java.util.ResourceBundle;
-import java.util.Timer;
-import java.util.TimerTask;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ToggleButton;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.VBox;
 
 /** Responsible for the presentation of the ChatModel to the Client */
 public class ChatViewController implements Initializable {
 
-    private final ChatModel globalChatModel;
-    private GlobalChatView globalChatView;
+    @FXML private Button sendButton;
 
-    private LobbyChatView lobbyChatView;
+    @FXML private TextField inputField;
+
+    @FXML private VBox chatVBox;
+
+    @FXML private HBox controlBar;
+
+    @FXML private ScrollPane scrollPane;
+
+    @FXML private VBox Chat;
+
+    private final ChatModel chatModel;
 
     private final String username;
 
     private final ChatController controller;
 
-    private final Timer timer;
-
-    private Boolean lobbyActivated;
-
-    @FXML private ToggleButton changeGlobalChatButton;
-
-    @FXML private ToggleButton changeLobbyChatButton;
-
-    @FXML private ToggleButton changeWhisperChatButton;
-
-    @FXML private ButtonBar buttonBar;
-
-    private static final int REFRESH_TIME = 1000;
-
     private static final int CHAT_PADDING = 20;
 
     public ChatViewController() {
@@ -48,65 +43,38 @@ public class ChatViewController implements Initializable {
     }
 
     public ChatViewController(
-            String username, ChatModel globalChatModel, ChatController controller) {
+            String username, ChatModel chatModel, ChatController controller) {
         this.username = username;
         this.controller = controller;
-        this.timer = new Timer();
-        this.globalChatModel = globalChatModel;
-        timer.schedule(
-                new TimerTask() {
-                    @Override
-                    public void run() {
-                        if (controller.receiveMessage()) {
-                            globalChatView.showGlobalMessage();
-                            if (lobbyActivated) {
-                                lobbyChatView.showLobbyMessage();
-                            }
-                        }
-                    }
-                },
-                0,
-                REFRESH_TIME);
+        this.chatModel = chatModel;
     }
 
     
     @Override
     public void initialize(URL location, ResourceBundle resourceBundle) {
-        this.globalChatView =
-                new GlobalChatView(username, globalChatModel, controller);
-
+        inputField.setOnAction(event -> sendMessage());
+        sendButton.setOnAction(event -> sendMessage());
+        scrollPane.vvalueProperty().bind(chatVBox.heightProperty());
     }
 
-    public void setLobbyChat(int lobbyId) {
-        this.lobbyChatView =
-                new LobbyChatView(
-                        username, new ChatModel(ChatType.LOBBY, username), controller, lobbyId);
-
-        changeGlobalChatButton.setOnAction(event -> switchChat("globalChatButton"));
-        changeLobbyChatButton.setOnAction(event -> switchChat("lobbyChatButton"));
-        changeWhisperChatButton.setOnAction(event -> switchChat("whisperChatButton"));
-
-        ToggleGroup toggleGroup = new ToggleGroup();
-        changeGlobalChatButton.setToggleGroup(toggleGroup);
-        changeLobbyChatButton.setToggleGroup(toggleGroup);
-        changeWhisperChatButton.setToggleGroup(toggleGroup);
-        this.lobbyActivated = true;
-    }
-
-    @FXML
-    public void switchChat(String button) {
-        switch (button) {
-            case "globalChatButton":
-                globalChatView.setVisibility(true);
-                lobbyChatView.setVisibility(false);
-
-            case "lobbyChatButton":
-                globalChatView.setVisibility(false);
-                lobbyChatView.setVisibility(true);
-
-            case "whisperChatButton":
-                globalChatView.setVisibility(false);
-                lobbyChatView.setVisibility(false);
+    public void sendMessage() {
+        String message = inputField.getText().trim();
+        if (!message.isEmpty()) {
+            inputField.clear();
+            Message msg = new Message(chatModel.getChattype(), chatModel.lobbyId, username, chatModel.getTarget(), message);
+            controller.onSendToNetwork(msg);
         }
     }
+
+    public void showMessage() {
+        String msg = chatModel.viewNextMessage();
+        Label label = new Label(msg);
+        label.getStyleClass().add("info-text");
+        label.setWrapText(true);
+        label.maxWidthProperty().bind(chatVBox.widthProperty().subtract(CHAT_PADDING));
+        chatVBox.getChildren().add(label);
+    }
+
+
+
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
deleted file mode 100644
index dab5782..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/GlobalChatView.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
-
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-
-public class GlobalChatView {
-
-    private final String username;
-    private ChatModel globalChatModel;
-
-    private final ChatController controller;
-
-    @FXML private Button globalChatSendButton;
-
-    @FXML private TextField globalChatInputField;
-
-    @FXML private VBox globalChatVBox;
-
-    @FXML private VBox globalChat;
-
-    @FXML private ScrollPane globalChatScrollPane;
-
-    final BooleanProperty isContentVisible = new SimpleBooleanProperty(true);
-
-    private static final int CHAT_PADDING = 20;
-
-    public GlobalChatView(String username, ChatModel globalChatModel, ChatController controller) {
-        this.username = username;
-        this.controller = controller;
-        this.globalChatModel = globalChatModel;
-    }
-
-    public void initialize() {
-        globalChatInputField.setOnAction(event -> sendGlobalMessage());
-        globalChatSendButton.setOnAction(event -> sendGlobalMessage());
-        globalChatScrollPane.vvalueProperty().bind(globalChatVBox.heightProperty());
-        globalChatVBox.visibleProperty().bind(isContentVisible);
-    }
-
-    public void sendGlobalMessage() {
-        String message = globalChatInputField.getText().trim();
-        if (!message.isEmpty()) {
-            globalChatInputField.clear();
-            Message msg = new Message(ChatType.GLOBAL, 0, username, null, message);
-            controller.onSendToNetwork(msg);
-        }
-    }
-
-    public void showGlobalMessage() {
-        for (int i = 0; i < globalChatModel.count; i++) {
-            String msg = globalChatModel.viewNextMessage();
-            Label label = new Label(msg);
-            label.getStyleClass().add("info-text");
-            label.setWrapText(true);
-            label.maxWidthProperty().bind(globalChatVBox.widthProperty().subtract(CHAT_PADDING));
-            globalChatVBox.getChildren().add(label);
-        }
-    }
-
-    public void setVisibility(Boolean bool) {
-        this.isContentVisible.set(bool);
-    }
-}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
deleted file mode 100644
index 7163d9d..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/LobbyChatView.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
-
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatController;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatModel;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.ChatType;
-import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-
-public class LobbyChatView {
-
-    private final String username;
-    private final int lobbyId;
-    private ChatModel lobbyChatModel;
-
-    private final ChatController controller;
-
-    @FXML private Button lobbyChatSendButton;
-
-    @FXML private TextField lobbyChatInputField;
-
-    @FXML private VBox lobbyChatVBox;
-
-    @FXML private VBox lobbyChat;
-
-    @FXML private ScrollPane lobbyChatScrollPane;
-
-    private static final int CHAT_PADDING = 20;
-
-    public LobbyChatView(
-            String username, ChatModel lobbyChatModel, ChatController controller, int lobbyId) {
-        this.username = username;
-        this.controller = controller;
-        this.lobbyChatModel = lobbyChatModel;
-        this.lobbyId = lobbyId;
-    }
-
-    @FXML
-    public void initialize() {
-        lobbyChatInputField.setOnAction(event -> sendLobbyMessage());
-        lobbyChatSendButton.setOnAction(event -> sendLobbyMessage());
-        lobbyChatScrollPane.vvalueProperty().bind(lobbyChatVBox.heightProperty());
-    }
-
-    public void sendLobbyMessage() {
-        String message = lobbyChatInputField.getText().trim();
-        if (!message.isEmpty()) {
-            lobbyChatInputField.clear();
-            Message msg = new Message(ChatType.LOBBY, lobbyId, username, null, message);
-            controller.onSendToNetwork(msg);
-        }
-    }
-
-    public void showLobbyMessage() {
-        for (int i = 0; i < lobbyChatModel.count; i++) {
-            String msg = lobbyChatModel.viewNextMessage();
-            Label label = new Label(msg);
-            label.getStyleClass().add("info-text");
-            label.setWrapText(true);
-            label.maxWidthProperty().bind(lobbyChatVBox.widthProperty().subtract(CHAT_PADDING));
-            lobbyChatVBox.getChildren().add(label);
-        }
-    }
-
-    public void setVisibility(Boolean bool) {
-        lobbyChatVBox.setVisible(bool);
-    }
-}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
deleted file mode 100644
index f4bdc9c..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/WhisperChatView.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
-
-public class WhisperChatView {}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java
index 0088781..608e5a0 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java
@@ -1,12 +1,14 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui;
 
 /** Main UI application for Casono. Loads the main FXML layout and sets up the stage. */
-import java.io.IOException;
+
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
+import java.io.IOException;
+
 /**
  * JavaFX Application class for the Casono main UI.
  *
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
index 1b5f62a..4b005a9 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
@@ -9,9 +9,18 @@ import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.login.LoginRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.logout.LogoutHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.logout.LogoutParser;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.logout.LogoutRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message.GetNextMessageHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message.GetNextMessageParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message.GetNextMessageRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.ping.PingHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.ping.PingParser;
 import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.ping.PingRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message.SendMessageRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserCleanupJob;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager;
@@ -22,12 +31,13 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionDisconnectJob;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.time.Duration;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /** Application class for starting the server. */
 public class ServerApp {
@@ -36,7 +46,7 @@ public class ServerApp {
     private static final int USER_CLEANUP_JOB_RECONNECT_THRESHOLD = 10;
     private static final int SESSION_DISCONNECT_JOB_DELAY = 0;
     private static final int SESSION_DISCONNECT_JOB_PERIOD = 2;
-    private static final int SESSION_DISCONNECT_JOB_TIMEOUT = 5;
+    private static final int SESSION_DISCONNECT_JOB_TIMEOUT = 30;
 
     public static void start(String arg) {
         int port = Integer.parseInt(arg);
@@ -105,5 +115,24 @@ public class ServerApp {
         parserDispatcher.register("LOGOUT", new LogoutParser());
         commandRouter.register(
                 LogoutRequest.class, new LogoutHandler(responseDispatcher, userRegistry));
+        parserDispatcher.register("SEND_MESSAGE", new SendMessageParser());
+        commandRouter.register(
+                SendMessageRequest.class,
+                new SendMessageHandler(responseDispatcher, userRegistry)
+        );
+
+
+        parserDispatcher.register("GET_MESSAGE_COUNT", new GetMessageCountParser());
+        commandRouter.register(
+                GetMessageCountRequest.class,
+                new GetMessageCountHandler(responseDispatcher, userRegistry)
+        );
+
+
+        parserDispatcher.register("GET_NEXT_MESSAGE", new GetNextMessageParser());
+        commandRouter.register(
+                GetNextMessageRequest.class,
+                new GetNextMessageHandler(responseDispatcher, userRegistry)
+        );
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameParser.java
index 20624c0..a60f499 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameParser.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameParser.java
@@ -3,7 +3,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.RequestParameterAccessor;
-
+import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick.CheckUsernameRequest;
 /** Parses a primitive request into a {@link CheckUsernameRequest}. */
 public class CheckUsernameParser implements CommandParser<CheckUsernameRequest> {
     /**
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameResponse.java
index 5018323..5901a80 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameResponse.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/CheckUsernameResponse.java
@@ -2,7 +2,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
 
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.SuccessResponse;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBodyBuilder;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
 
 /** Response indicating the availability status of a username check. */
 public class CheckUsernameResponse extends SuccessResponse {
@@ -13,6 +13,6 @@ public class CheckUsernameResponse extends SuccessResponse {
      * @param availability the availability status of the requested username
      */
     public CheckUsernameResponse(RequestContext context, UsernameAvailability availability) {
-        super(context, new ResponseBodyBuilder().param("STATUS", availability).build());
+        super(context, ResponseBody.builder().param("STATUS", availability).build());
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/UsernameAvailability.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/UsernameAvailability.java
index df3d358..c728971 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/UsernameAvailability.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/check_nick/UsernameAvailability.java
@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick;
 
 /** Represents the availability status of a username */
-enum UsernameAvailability {
+public enum UsernameAvailability {
     /** Username is available */
     FREE,
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountHandler.java
new file mode 100644
index 0000000..9467c1d
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountHandler.java
@@ -0,0 +1,40 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
+
+import java.util.Optional;
+
+public class GetMessageCountHandler implements CommandHandler<GetMessageCountRequest> {
+    public final ResponseDispatcher responseDispatcher;
+    private final UserRegistry userRegistry;
+
+    public GetMessageCountHandler(ResponseDispatcher responseDispatcher, UserRegistry userRegistry) {
+        this.responseDispatcher = responseDispatcher;
+        this.userRegistry = userRegistry;
+    }
+
+    @Override
+    public void execute(GetMessageCountRequest request) {
+        Optional<User> user = userRegistry.getBySessionId(request.getSessionId());
+        if (user.isPresent()) {
+            int count = user.get().getMessageCount();
+            GetMessageCountResponse response = new GetMessageCountResponse(
+                    request.getContext(),
+                    count
+            );
+            responseDispatcher.dispatch(response);
+        } else {
+            ErrorResponse response = new ErrorResponse(
+                    request.getContext(),
+                    "",
+                    "user could not be identified by SessionId"
+
+            );
+            responseDispatcher.dispatch(response);
+        }
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountParser.java
new file mode 100644
index 0000000..35a09ec
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountParser.java
@@ -0,0 +1,13 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.RequestParameterAccessor;
+
+public class GetMessageCountParser implements CommandParser<GetMessageCountRequest> {
+    @Override
+    public GetMessageCountRequest parse(PrimitiveRequest primitiveRequest) {
+        RequestParameterAccessor accessor = new RequestParameterAccessor(primitiveRequest.parameters());
+        return new GetMessageCountRequest(primitiveRequest.context());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountRequest.java
new file mode 100644
index 0000000..36deee8
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountRequest.java
@@ -0,0 +1,10 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+
+public class GetMessageCountRequest extends Request {
+    public GetMessageCountRequest(RequestContext context) {
+        super(context);
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountResponse.java
new file mode 100644
index 0000000..8524f94
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_message_count/GetMessageCountResponse.java
@@ -0,0 +1,13 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.SuccessResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBodyBuilder;
+
+public class GetMessageCountResponse extends SuccessResponse {
+    public GetMessageCountResponse(RequestContext context, int count) {
+        super(context, new ResponseBodyBuilder()
+                .param("COUNT", count)
+                .build());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java
new file mode 100644
index 0000000..8d235a9
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java
@@ -0,0 +1,41 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
+
+import java.util.Optional;
+
+public class GetNextMessageHandler implements CommandHandler<GetNextMessageRequest> {
+    public final ResponseDispatcher responseDispatcher;
+    private final UserRegistry userRegistry;
+
+    public GetNextMessageHandler(ResponseDispatcher responseDispatcher, UserRegistry userRegistry) {
+        this.responseDispatcher = responseDispatcher;
+        this.userRegistry = userRegistry;
+    }
+
+    @Override
+    public void execute(GetNextMessageRequest request) {
+        Optional<User> user = userRegistry.getBySessionId(request.getSessionId());
+        if (user.isPresent()) {
+            Message msg = user.get().dequeMessage();
+            GetNextMessageResponse response = new GetNextMessageResponse(
+                    request.getContext(),
+                    msg
+            );
+            responseDispatcher.dispatch(response);
+        } else {
+            ErrorResponse response = new ErrorResponse(
+                    request.getContext(),
+                    "",
+                    "user could not be identified by SessionId"
+
+            );
+            responseDispatcher.dispatch(response);
+        }
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageParser.java
new file mode 100644
index 0000000..7b24831
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageParser.java
@@ -0,0 +1,13 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor.RequestParameterAccessor;
+
+public class GetNextMessageParser implements CommandParser<GetNextMessageRequest> {
+    @Override
+    public GetNextMessageRequest parse(PrimitiveRequest primitiveRequest) {
+        RequestParameterAccessor accessor = new RequestParameterAccessor(primitiveRequest.parameters());
+        return new GetNextMessageRequest(primitiveRequest.context());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageRequest.java
new file mode 100644
index 0000000..92ec136
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageRequest.java
@@ -0,0 +1,10 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+
+public class GetNextMessageRequest extends Request {
+    public GetNextMessageRequest(RequestContext context) {
+        super(context);
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java
new file mode 100644
index 0000000..f01aaf0
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java
@@ -0,0 +1,14 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.SuccessResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
+
+public class GetNextMessageResponse extends SuccessResponse {
+    public GetNextMessageResponse(RequestContext context, Message msg) {
+        super(context, ResponseBody.builder()
+                .param("MESSAGE", msg.toArgsString())
+                .build());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
new file mode 100644
index 0000000..60d4332
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
@@ -0,0 +1,30 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message;
+
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.OkResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
+
+public class SendMessageHandler implements CommandHandler<SendMessageRequest> {
+    public final ResponseDispatcher responseDispatcher;
+    private final UserRegistry userRegistry;
+
+    public SendMessageHandler(ResponseDispatcher responseDispatcher, UserRegistry userRegistry) {
+        this.responseDispatcher = responseDispatcher;
+        this.userRegistry = userRegistry;
+    }
+
+    @Override
+    public void execute(SendMessageRequest request) {
+        Message message = request.getMessage();
+        broadcast(message);
+        OkResponse response = new OkResponse(request.getContext());
+        responseDispatcher.dispatch(response);
+    }
+    public void broadcast(Message message) {
+        userRegistry.getAllUsers().forEach(user -> user.enqueueMessage(message));
+    }
+
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java
new file mode 100644
index 0000000..723d91c
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java
@@ -0,0 +1,13 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
+
+public class SendMessageParser implements CommandParser<SendMessageRequest> {
+    @Override
+    public SendMessageRequest parse(PrimitiveRequest primitiveRequest) {
+        Message msg = Message.toMessage(primitiveRequest.parameters());
+        return new SendMessageRequest(primitiveRequest.context(), msg);
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageRequest.java
new file mode 100644
index 0000000..a6e0c31
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageRequest.java
@@ -0,0 +1,19 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.send_message;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
+
+public class SendMessageRequest extends Request {
+
+    private final Message msg;
+
+    public SendMessageRequest(RequestContext context, Message msg) {
+        super(context);
+        this.msg = msg;
+    }
+
+    public Message getMessage() {
+        return msg;
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/message/MessageManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/message/MessageManager.java
index b3ba0da..5435142 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/message/MessageManager.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/message/MessageManager.java
@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.domain.message;
-
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 
+/** NOT USED **/
 public class MessageManager {
     private final UserRegistry userRegistry;
 
@@ -10,6 +10,6 @@ public class MessageManager {
     }
 
     public void broadcast(Message message) {
-        userRegistry.getAllUsers().forEach(user -> user.enqueueMessage(message));
+        //userRegistry.getAllUsers().forEach(user -> user.enqueueMessage(message));
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/User.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/User.java
index dc42ac3..d1510cd 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/User.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/User.java
@@ -1,12 +1,9 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.domain.user;
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.message.Message;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 import java.time.Instant;
-import java.util.ArrayDeque;
-import java.util.List;
-import java.util.Optional;
-import java.util.Queue;
+import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 /** Represents an authenticated user on the server. */
@@ -88,6 +85,10 @@ public class User {
         messages.add(message);
     }
 
+    public synchronized int getMessageCount() { return messages.size(); }
+
+    public synchronized Message dequeMessage() throws NoSuchElementException { return messages.remove(); }
+
     public synchronized List<Message> dequeueAllMessages(Message message) {
         List<Message> allMessages = new ArrayDeque<>(messages).stream().toList();
         messages.clear();
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
index 9b96860..a4956b8 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
@@ -9,14 +9,14 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.
  * <p>Implementations of this class use the {@code +OK} prefix. It provides a protected constructor
  * so subclasses can supply the response body content.
  */
-public abstract class SuccessResponse extends Response {
+public class SuccessResponse extends Response {
     /**
      * Create a successful response with the provided body.
      *
      * @param context the RequestContext of the request
      * @param body the response body
      */
-    protected SuccessResponse(RequestContext context, ResponseBody body) {
+    public SuccessResponse(RequestContext context, ResponseBody body) {
         super(context, body);
     }
 
diff --git a/src/main/resources/ui-structure/components/chatui/chatbox.fxml b/src/main/resources/ui-structure/components/chatui/chatbox.fxml
index e090466..10a683c 100644
--- a/src/main/resources/ui-structure/components/chatui/chatbox.fxml
+++ b/src/main/resources/ui-structure/components/chatui/chatbox.fxml
@@ -4,46 +4,30 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 
-<!--
-    Dieses Fenster wird später mit den Serveranfragen verknüpft,
-    um Nachrichten von Mitspielern und Systemmeldungen in Echtzeit anzuzeigen.
-
-    Der Chat unterscheidet intern zwischen:
-    - Player-to-Player (Privater 2-Personen-Chat)
-    - Lobby-Chat (Aktueller Raum)
-    - Globaler Chat (Gesamter Server)
-
-    Features, die später implementiert werden sollen:
-    - Schicke Chat-Bubbles mit Namen und Uhrzeit./home/mathis/dev/Gruppe-13/src/main/resources/ui-structure/gameuicomponents/chatui
--->
-
-<StackPane xmlns="http://javafx.com/javafx/21"
+<VBox xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController"
-      alignment="CENTER"
-      stylesheets="@chatui.css">
+      fx:id="chatBox"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatBoxController"
+      VBox.vgrow="ALWAYS"
+      styleClass="chat-box"
+      spacing="10"
+      maxWidth="Infinity">
 
-    <!-- Innenabstand: Schafft oben, rechts und unten 30 Pixel Platz, links nur 10 Pixel (asymmetrisch) -->
-    <padding>
-        <Insets top="30" right="30" bottom="30" left="10"/>
-    </padding>
+    <children>
+        <HBox>
+            <children>
+                <Label text="== CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+                <Region minHeight="4" styleClass="chat-separator"/>
+            </children>
+
+        </HBox>
+
+        <TabPane fx:id="ChatTabPane">
+        </TabPane>
 
 
-    <fx:include source="globalchat.fxml"/>
 
-    <fx:include source="lobbychat.fxml"/>
+    </children>
 
-    <fx:include source="whisperchat.fxml"/>
 
-    <ButtonBar fx:id="buttonBar">
-        <padding>
-            <Insets>...</Insets>
-        </padding>
-        <buttons>
-            <ToggleButton fx:id="changeGlobalChatButton" text="Global Chat" onAction="#switchChat" styleClass="yellow-button"/>
-            <ToggleButton fx:id="changeLobbyChatButton" text="Lobby Chat" styleClass="yellow-button"/>
-            <ToggleButton fx:id="changeWhisperChatButton" text="Whisper Chat" styleClass="yellow-button"/>
-        </buttons>
-    </ButtonBar>
-
-</StackPane>
\ No newline at end of file
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/ui-structure/components/chatui/globalchat.fxml b/src/main/resources/ui-structure/components/chatui/chattab.fxml
similarity index 52%
rename from src/main/resources/ui-structure/components/chatui/globalchat.fxml
rename to src/main/resources/ui-structure/components/chatui/chattab.fxml
index 906855b..94f8124 100644
--- a/src/main/resources/ui-structure/components/chatui/globalchat.fxml
+++ b/src/main/resources/ui-structure/components/chatui/chattab.fxml
@@ -9,30 +9,26 @@
 <!-- VBox for the global chat, should only be visible when activated via changeGlobalChatButton-->
 <VBox xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:id="globalChatVBox"
-      VBox.vgrow="ALWAYS"
-      styleClass="chat-box"
-      spacing="10"
-      maxWidth="Infinity"
-      visible="true"
-      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.GlobalChatView">
+      fx:id="chatVBox">
 
-    <Label text="== GLOBAL CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
+    <Label text="== CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
     <Region minHeight="4" styleClass="chat-separator"/>
+
     <!-- Chatnachrichten werden hier hinzugefügt -->
-    <ScrollPane fx:id="globalChatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER"
+    <ScrollPane fx:id="scrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER"
                 VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
         <content>
-            <VBox fx:id="globalChat" spacing="10" styleClass="chat-VBox"/>
+            <VBox fx:id="Chat" spacing="10" styleClass="chat-VBox"/>
         </content>
     </ScrollPane>
 
     <!-- Eingabebereich -->
-    <HBox spacing="10">
+    <HBox spacing="10"
+          fx:id="controlBar">
         <!-- TODO: Größe des TextFields dynamisch anpassen -->
-        <TextField fx:id="globalChatInputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..."
-                   styleClass="gray-input-field" onAction="#sendGlobalMessage"/>
-        <Button fx:id="globalChatSendButton" text="SENDEN" onAction="#sendGlobalMessage"
+        <TextField fx:id="inputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..."
+                   styleClass="gray-input-field" onAction="#sendMessage"/>
+        <Button fx:id="sendButton" text="SENDEN" onAction="#sendMessage"
                 styleClass="yellow-button"/>
     </HBox>
 </VBox>
diff --git a/src/main/resources/ui-structure/components/chatui/lobbychat.fxml b/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
deleted file mode 100644
index 3488296..0000000
--- a/src/main/resources/ui-structure/components/chatui/lobbychat.fxml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<!-- VBox for the lobby chat, should only be visible when activated via changeLobbyChatButton-->
-
-<VBox xmlns="http://javafx.com/javafx/21"
-      xmlns:fx="http://javafx.com/fxml/1"
-      fx:id="lobbyChatVBox"
-      VBox.vgrow="ALWAYS"
-      styleClass="chat-box"
-      spacing="10"
-      maxWidth="Infinity"
-      visible="false"
-      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.LobbyChatView">
-
-    <children>
-        <Label text="== LOBBY CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
-        <Region minHeight="4" styleClass="chat-separator"/>
-
-        <!-- Chatnachrichten werden hier hinzugefügt -->
-        <ScrollPane fx:id="lobbyChatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER" VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
-            <content>
-                <VBox fx:id="lobbyChat" spacing="10" styleClass="chat-VBox"/>
-            </content>
-        </ScrollPane>
-
-        <!-- Eingabebereich -->
-        <HBox spacing="10">
-            <!-- TODO: Größe des TextFields dynamisch anpassen -->
-            <TextField fx:id="lobbyChatInputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..." styleClass="gray-input-field" onAction="#sendLobbyMessage"/>
-            <Button fx:id="lobbyChatSendButton" text="SENDEN" onAction="#sendLobbyMessage" styleClass="yellow-button"/>
-        </HBox>
-    </children>
-</VBox>
diff --git a/src/main/resources/ui-structure/components/chatui/whisperchat.fxml b/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
deleted file mode 100644
index 18953e8..0000000
--- a/src/main/resources/ui-structure/components/chatui/whisperchat.fxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<!-- VBox for the whisper chat, should only be visible when activated via changeWhisperChatButton-->
-
-<VBox xmlns="http://javafx.com/javafx/21"
-      xmlns:fx="http://javafx.com/fxml/1"
-      fx:id="whisperChatVBox"
-      VBox.vgrow="ALWAYS"
-      styleClass="chat-box"
-      spacing="10"
-      maxWidth="Infinity"
-      visible="false">
-
-    <children>
-        <Label text="== WHISPER CHAT ==" styleClass="chat-header" alignment="CENTER" maxWidth="Infinity"/>
-        <Region minHeight="4" styleClass="chat-separator"/>
-        <!-- Chatnachrichten werden hier hinzugefügt
-        <ScrollPane fx:id="chatScrollPane" fitToWidth="true" vbarPolicy="AS_NEEDED" hbarPolicy="NEVER" VBox.vgrow="ALWAYS" styleClass="chat-scroll-pane">
-            <content>
-                <VBox fx:id="chatVBox" spacing="10" styleClass="chat-VBox"/>
-            </content>
-        </ScrollPane>
-
-
-        <HBox spacing="10">
-            <TextField fx:id="inputField" HBox.hgrow="ALWAYS" promptText="Nachricht eingeben..." styleClass="gray-input-field" onAction="#sendMessage"/>
-            <Button fx:id="sendButton" text="SENDEN" onAction="#sendMessage" styleClass="yellow-button"/>
-        </HBox>
-        -->
-    </children>
-</VBox>
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Chat.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Chat.java
new file mode 100644
index 0000000..15b81d7
--- /dev/null
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Chat.java
@@ -0,0 +1,9 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import javafx.application.Application;
+
+public class Chat {
+     public static void main(String[] args) {
+         Application.launch(ChatApplication.class);
+     }
+}
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java
new file mode 100644
index 0000000..77b2e33
--- /dev/null
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java
@@ -0,0 +1,48 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
+import ch.unibas.dmi.dbis.cs108.casono.client.network.CoreClient;
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatBoxController;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class ChatApplication extends Application {
+
+    private static final int SCENE_WIDTH = 1200;
+    private static final int SCENE_HEIGHT = 800;
+    String ip = "localhost";
+    String username = "mathis";
+    int port = 5000;
+
+    public ChatApplication() {}
+
+    public void start(Stage stage) throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/ui-structure/components/chatui/chatbox.fxml"));
+        ClientService clientService = new ClientService(ip, port);
+        CoreClient coreClient = new CoreClient(clientService);
+        // TODO login UI
+        coreClient.login(username);
+        ChatController chatController = new ChatController(username, clientService);
+        fxmlLoader.setControllerFactory(type -> {
+                if (type == ChatBoxController.class) {
+                    return chatController.getChatBoxController();
+                } else {
+                    try {
+                        return type.getConstructor().newInstance();
+                    } catch (Throwable e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+        });
+
+        Scene scene = new Scene(fxmlLoader.load(), SCENE_WIDTH, SCENE_HEIGHT);
+        stage.setTitle("Chat");
+        stage.setScene(scene);
+        stage.show();
+    }
+
+}
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
index 31f9964..b781cda 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
@@ -6,6 +6,6 @@ public class ChatTest {
 
     @Test
     public void chatTest() {
-        Client.main(new String[]{"mathis"});
+
     }
 }