diff --git a/src/main/java/ChatServer.java b/src/main/java/ChatServer.java
index 0fd0416..0327ad7 100644
--- a/src/main/java/ChatServer.java
+++ b/src/main/java/ChatServer.java
@@ -10,10 +10,12 @@ public class ChatServer {
 		try {
 			serverSocket = new ServerSocket(port);
 			System.out.println("Started ChatServer on port " + port);
-
+			
+			while(true) {
 			Socket connectionToClient = serverSocket.accept();
-
+			ClientHandler client = new ClientHandler(this, connectionToClient);
 			System.out.println("Accepted new Client");
+			}
 		} catch (IOException e) {
 			e.printStackTrace();
 		}