diff -r 32c6cc55256a -r b70d30e1b0fe src/proto2/NetworkServer.hh
--- a/src/proto2/NetworkServer.hh	Sat Nov 08 18:02:58 2008 +0000
+++ b/src/proto2/NetworkServer.hh	Sat Nov 08 20:34:14 2008 +0000
@@ -9,23 +9,46 @@
 #include <ClanLib/core.h>
 
 // forward-declare
-class NetworkServerClient;
+class NetworkServerPlayer;
 
 class NetworkServer : public NetworkCore {
+	friend class NetworkServerPlayer;
+
+	private:
+		uint16_t pid_pool;
+	
+	public:
+		std::map<CL_NetComputer, NetworkServerPlayer*> players;
+
 	public:
 		NetworkServer (GameState &state, const std::string &listen_port);
 
 	private:
 		void on_connect (CL_NetComputer &computer);
 		void on_disconnect (CL_NetComputer &computer);
+
+	
 };
 
-class NetworkServerClient {
+class NetworkServerPlayer : public RemotePlayer {
 	private:
 		NetworkServer &server;
+		CL_NetComputer &computer;
+		CL_NetObject_Server netobj;
+
+		CL_SlotContainer slots;
+
+		uint16_t pid;
 		
+	public:
+		NetworkServerPlayer (NetworkServer &server, CL_NetComputer &computer, uint16_t pid);
+
+		void disconnected (void);
+
 	private:
-		NetworkServerClient (NetworkServer &server);
+		void on_move (CL_NetComputer &from, CL_NetPacket &pkt);
+
+		void send_position_update (void);
 };
 
 #endif