diff --git a/src/server/Paxos.java b/src/server/Paxos.java
index 27248cc476dd2c350bdb14e14ea8107535fa46b5..6186cf76a9a917065374f1c7af6ff58cc6d5c914 100644
--- a/src/server/Paxos.java
+++ b/src/server/Paxos.java
@@ -21,4 +21,5 @@ public class Paxos
 		DatagramPacket sendPacket = new DatagramPacket();
 		clientSocket.send(sendPacket);
 	}
+
 }
\ No newline at end of file
diff --git a/src/server/Server.java b/src/server/Server.java
index f28bbe7db3c92f21da55b8afec14a1dc882ba8e7..1b8582de73880248bce6f36534f0b3c0e76a57bb 100644
--- a/src/server/Server.java
+++ b/src/server/Server.java
@@ -10,23 +10,37 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.parser.JSONParser;
 
-public class Server 
+public class Server implements Runnable
 {
 	private String host;
     private int port;
     private Socket socket;
     private final String DEFAULT_HOST = "localhost";
+    private ServerSocket serverSocket;
+    PrintStream streamToClient;
+    BufferedReader streamFromClient;
+    Socket fromClient;
+    static int count = 0;
+    Thread thread;
 
 	public Server() 
 	{
 		this.host = host;
 		this.port = port;
 		this.socket = socket;
+
+		try{
+			serverSocket = new ServerSocket(1001);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
 	}
 
 	public boolean isWerewolf()
 	{
 		boolean yes = false;
+		// for werewolf
 		return yes;
 	}
 
@@ -64,8 +78,29 @@ public class Server
 		out.flush();
 	}
 
-	public static void main(String[] args) throws Exception 
+	public void runServer()
 	{
+		try{
+			while(true){
+				fromClient = serverSocket.accept();
+				count++;
+				streamFromClient = new BufferedReader();
 
+				InputStreamReader((fromClient.getInputStream()));
+				streamToClient = new PrintStream(fromClient.getInputStream());
+				String str = streamFromClient.readLine();
+				System.out.println(str);
+				streamToClient.println("Halo, "+str);
+			}
+		} catch (Exception e){
+			e.printStackTrace();
+		} finally {
+			try {
+				fromClient.close();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
 	}
+
 }
\ No newline at end of file