diff --git a/src/server/BaseGame.java b/src/server/BaseGame.java
index 692fc3d..b7e2a67 100644
--- a/src/server/BaseGame.java
+++ b/src/server/BaseGame.java
@@ -3,6 +3,8 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.Socket;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import org.json.JSONObject;
@@ -131,6 +133,11 @@
 	
 	protected abstract void receive(DataInputStream inStream);
 
+	public static void Log(String msg){
+		SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+		System.out.println("[" + sdf.format(new Date()) + "]: " + msg);
+	}
+
 	class SocketListenerThread implements Runnable {
 		Socket socket;
 		DataInputStream inStream;
diff --git a/src/server/ClientGame.java b/src/server/ClientGame.java
index f8f4c19..e6a3857 100644
--- a/src/server/ClientGame.java
+++ b/src/server/ClientGame.java
@@ -33,12 +33,10 @@
 	volatile int ownId; // TODO lock?
 
 	public ClientGame(){
-		System.out.println("ctor");
 		preinit();
 	}
 	
 	protected void preinit(){
-		System.out.println("Preinit");
 		port = 1337;
 		hostName = "localhost";
 		isConnected = false;
@@ -59,9 +57,9 @@
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			System.out.println("Waiting for connection to host");
+			Log("Waiting for connection to host");
 		}
-		System.out.println("Connection to " + hostName + " on port " + port + " as player " + ownId + " established!");
+		Log("Connection to " + hostName + " on port " + port + " as player " + ownId + " established!");
 		while(!initGameReceived){
 			try {
 				Thread.sleep(1000);
@@ -69,13 +67,12 @@
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			System.out.println("Client " + ownId + " waiting for game...");
+			Log("Client " + ownId + " waiting for game...");
 		}
 	}
 	
 	@Override
 	protected void init() {
-		System.out.println("init");
 		super.init();
 	}
 	@Override
@@ -89,7 +86,6 @@
 	}
 
 	protected void loadOptions(){
-		System.out.println("loadOptions");
 		try {
 			JSONTokener tokener = new JSONTokener(options.toURI().toURL().openStream());
 			root = new JSONObject(tokener);
@@ -152,8 +148,8 @@
 	}
 
 	private void send(byte msgType, String msg) {
-		System.out.println("Client - Sending to server");
-		System.out.println("sending " + msg);
+		Log("Client - Sending to server");
+		Log("sending " + msg);
 		DataOutputStream os = null;
 		try {
 			os = new DataOutputStream(socket.getOutputStream());
@@ -196,7 +192,7 @@
 
 	@Override
 	protected void receive(DataInputStream inStream) {
-		System.out.println("Client  - Received data!");
+		Log("Client  - Received data!");
 		byte[] magic = new byte[4];
 		byte proto = 0;
 		byte msgType = 0;
@@ -211,7 +207,10 @@
 			e.printStackTrace();
 		}
 		
-		System.out.println("Received magic: " + magic[0] + magic[1] + magic[2] + magic[3]);
+		Log("Received magic: " + magic[0] + magic[1] + magic[2] + magic[3]);
+		Log("Received proto: " + proto);
+		Log("Received msgType: " + msgType);
+		Log("Received useless: " + useless[0] + useless[1]);
 		
 		// TODO check Protocol
 //		switch(proto){
@@ -229,7 +228,7 @@
 		}
 		// TODO error handling
 		if(msg != null){
-			System.out.println("The not null msg is: " + msg);
+			Log("The not null msg is: " + msg);
 			jo = new JSONObject(msg);
 		}
 		else return;
@@ -240,9 +239,9 @@
 			ownId = jo.getInt("id");
 			break;
 		case MOVE_UPDATE:
-			System.out.println("received update");
+			Log("received update");
 			if(!initGameReceived){
-				System.out.println("first update!");
+				Log("first update!");
 				// TODO move createXY() somewhere else?
 				createDeck();
 				createTrash();
@@ -254,9 +253,7 @@
 				initGameReceived = true;
 				break;
 			}
-			System.out.println("Client updating game...");
 			updateGame(jo);
-			System.out.println("Client updating UI...");
 			updateUI();
 			break;
 		}
@@ -277,7 +274,6 @@
 		if(!initGameReceived){
 			createPlayers();
 		}
-		System.out.println("update game");
 		// TODO movesLeft = jo.getInt("movesLeft");
 		cardsInDeck = jo.getInt("cardsInDeck");
 		hints = jo.getInt("hints");
diff --git a/src/server/ServerGame.java b/src/server/ServerGame.java
index 055f303..8b11f95 100644
--- a/src/server/ServerGame.java
+++ b/src/server/ServerGame.java
@@ -61,10 +61,10 @@
 				connectionJson.put("id", nrOfPlayers);
 				sendToClient(CONNECTION_VALID, connectionJson.toString(), socket);
 				nrOfPlayers++;
-				System.out.println(nrOfPlayers + " players connected!");
+				Log(nrOfPlayers + " players connected!");
 				// TODO do this somewhere else
-				System.out.println("Creating new Socket Listener for #" + (sockets.size()-1));
-				System.out.println("Socket id: " + socket);
+				Log("Creating new Socket Listener for #" + (sockets.size()-1));
+				Log("Socket id: " + socket);
 				new Thread(new SocketListenerThread(socket)).start();
 			}
 		} catch (IOException e) {
@@ -73,10 +73,10 @@
 			// e.printStackTrace();
 			System.err.println("Exception is currently suppressed");
 		}
-		System.out.println("Initalizing game...");
+		Log("Initalizing game...");
 		init();
-		System.out.println("Sending game to clients");
-		System.out.println("game: " + toJson().toString());
+		Log("Sending game to clients");
+		Log("game: " + toJson().toString());
 		String msg = toJson().toString();
 		sendToAll(MOVE_UPDATE, msg);
 		addToHistory(msg);
@@ -165,7 +165,7 @@
 	// }
 
 	protected void receive(DataInputStream inStream) {
-		System.out.println("Server - Receiving");
+		Log("Server - Receiving");
 		byte[] magic = new byte[4];
 		byte proto = 0;
 		byte msgType = 0;
@@ -181,6 +181,11 @@
 			System.err.println("Exception is currently suppressed");
 		}
 
+		Log("Received magic: " + magic[0] + magic[1] + magic[2] + magic[3]);
+		Log("Received proto: " + proto);
+		Log("Received msgType: " + msgType);
+		Log("Received useless: " + useless[0] + useless[1]);
+
 		// TODO check Protocol
 //		switch(proto){
 //		case VIBE_DUMB:
@@ -199,7 +204,7 @@
 			System.err.println("Exception is currently suppressed");
 		}
 		if(msg != null) jo = new JSONObject(msg);
-		System.out.println("Server received: " + msg);
+		Log("Server received: " + msg);
 		// TODO MOVE_DRY
 		switch(msgType){
 		case MOVE_PLACE_CARD:
@@ -218,14 +223,14 @@
 			wasMove = true;
 			break;
 		}
-		System.out.println("game: " + toJson().toString());
+		Log("game: " + toJson().toString());
 		if(!isValid){
-			System.out.println("was invalid move");
+			Log("was invalid move");
 			sendToAll(MOVE_INVALID); // TODO only send to person who did the move
 			return;
 		}
 		if(wasMove){
-			System.out.println("was VALID move");
+			Log("was VALID move");
 			currentPlayer++;
 			if(currentPlayer == nrOfPlayers) currentPlayer = 0;
 			// TODO notify players
@@ -416,10 +421,10 @@
 	}
 
 	protected void sendToAll(byte msgType, String msg){
-		System.out.println("Server - Sending to all:");
+		Log("Server - Sending to all:");
 		int i=0;
 		for(Socket s : sockets){
-			System.out.println("Sending " + msg + " to socket " + (i++));
+			Log("Sending " + msg + " to socket " + (i++));
 			sendToClient(msgType, msg, s);
 		}
 	}