diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/ClientThread.java
similarity index 78%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/ClientThread.java
index fdb3ded..a2f22dd 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/ClientThread.java
@@ -1,14 +1,13 @@
 package ch.unibas.dmi.dbis.cs108.Multiplayer.Client;
 
-import java.awt.image.BufferStrategy;
 import java.io.*;
 import java.net.Socket;
 
-public class Client implements Runnable {
+public class ClientThread implements Runnable {
     private int name;
     private final Socket socket;
 
-    public Client(int name, Socket socket) {
+    public ClientThread(int name, Socket socket) {
         this.name = name;
         this.socket = socket;
     }
@@ -17,6 +16,9 @@ public class Client implements Runnable {
         try {
             BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             BufferedWriter out = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
+            while(socket.isConnected()){
+
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/Server.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/Server.java
index 73098a0..850df96 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/Server.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/Server.java
@@ -1,4 +1,23 @@
 package ch.unibas.dmi.dbis.cs108.Multiplayer.Server;
 
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
 public class Server {
+
+    int port = 42069;
+
+    public static void main(String[] args) {
+
+        try {
+            ServerSocket gameServer = new ServerSocket(42069);
+            System.out.println("Waiting for a connection on Port 42069");
+            while(true) {
+                Socket connector = gameServer.accept();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }