diff --git a/.gitignore b/.gitignore
index b83d222..beb9ac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /target/
+/src/main/java/ChatServer
\ No newline at end of file
diff --git a/src/main/java/ClientHandler.java b/src/main/java/ClientHandler.java
index f3f9b3c..200dccf 100644
--- a/src/main/java/ClientHandler.java
+++ b/src/main/java/ClientHandler.java
@@ -4,14 +4,27 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.ServerSocket;
+import java.net.Socket;
+
 
 public class ClientHandler implements Runnable {
-  private Server server;
-  private ServerSocket connectionToClient;
+  private ChatServer chatServer;
+  private Socket connectionToClient;
   private String name; 
   private BufferedReader fromClientReader;
   private PrintWriter toClientWriter;
   
+  
+  public ClientHandler(ChatServer chatServer, Socket connectionToClient) {
+    this.chatServer = chatServer;
+    this.connectionToClient = connectionToClient;
+    name = connectionToClient.getInetAddress().getHostAddress();
+    new Thread(this).start();
+  }
+  
+  
+  
+  
   @Override
   public void run() {
     // TODO Auto-generated method stub