diff --git a/source/client/client.cpp b/source/client/client.cpp
index a5fe5ba..d781ce3 100644
--- a/source/client/client.cpp
+++ b/source/client/client.cpp
@@ -101,17 +101,23 @@ int runClient(int argc, char* argv[])
 
     while ( n >= 0 )
     {
-        memset(buffer,0,sizeof(buffer));
-
         std::cout<<"Waiting for gamestate"<<std::endl;
-        // Receive gamestate
-        if (read(sockfd,buffer,sizeof(buffer)-1) < 0)
-            error("ERROR reading from client");
 
-        std::cout<<buffer<<std::endl;
+        std::string gamestate;
+        while( gamestate.find("END") == std::string::npos )
+        {
+            // Receive gamestate
+            memset(buffer,0,sizeof(buffer));
+            if (read(sockfd,buffer,sizeof(buffer)-1) < 0)
+                error("ERROR reading from client");
+
+            gamestate+=buffer;
+        }
+
+        std::cout<<gamestate<<std::endl;
 
         // Output orders
-        std::string orders = std::to_string(sockfd);
+        std::string orders = "END";
 
         std::cout<<"Sending orders"<<std::endl;
         std::cout<<orders<<std::endl;
diff --git a/source/client/net.cpp b/source/client/net.cpp
index 967aa73..2536f73 100644
--- a/source/client/net.cpp
+++ b/source/client/net.cpp
@@ -11,21 +11,29 @@
 int WaitForOrdersFromClient(const ClientInfo info, std::mutex &mut, CTTRTSGame &game)
 {
     char buffer[1028]; // buffer for orders
-    memset(buffer,0,sizeof(buffer));
 
     std::cout<<"Waiting for "<<inet_ntoa(info.cli_addr.sin_addr)<<std::endl;
 
-    // Read in the new socket
-    // read will block until the client has called write
-    // up to the full size of the buffer
-    if (read(info.clientsockfd,buffer,sizeof(buffer)-1) < 0)
-        error("ERROR reading from client");
+    std::string orders;
+
+    while ( orders.find("END") == std::string::npos )
+    {
+        memset(buffer,0,sizeof(buffer));
+
+        // Read in the new socket
+        // read will block until the client has called write
+        // up to the full size of the buffer
+        if (read(info.clientsockfd,buffer,sizeof(buffer)-1) < 0)
+            error("ERROR reading from client");
+
+        // Append the received orders
+        orders+=buffer;
+    }
 
     std::cout<<"Recieved orders from "<<inet_ntoa(info.cli_addr.sin_addr)<<std::endl;
-    std::cout<<buffer<<std::endl;
 
     mut.lock();
-    game.IssueOrders(info.player , buffer);
+    game.IssueOrders(info.player , orders);
     mut.unlock();
 
     return 0;