diff --git a/source/client/CMakeLists.txt b/source/client/CMakeLists.txt
index 92360c6..7f26ed1 100644
--- a/source/client/CMakeLists.txt
+++ b/source/client/CMakeLists.txt
@@ -33,7 +33,7 @@ add_executable( ${PROJECT_NAME} ${SOURCES} )
 set_target_properties( ${PROJECT_NAME} PROPERTIES OUTPUT_NAME ttrts )
 
 # dependent on main ttrts libary
-target_link_libraries( ${PROJECT_NAME} ttrts )
+target_link_libraries( ${PROJECT_NAME} ttrts pthread )
 
 # Installation target
 install( TARGETS ${PROJECT_NAME} DESTINATION bin )
diff --git a/source/client/server.cpp b/source/client/server.cpp
index 2a4edf7..9dabe82 100644
--- a/source/client/server.cpp
+++ b/source/client/server.cpp
@@ -1,5 +1,7 @@
 #include "server.h"
 
+#include <thread>
+#include <vector>
 #include <iostream>
 
 #include <stdio.h>
@@ -15,64 +17,17 @@
 
 #include "net.h"
 
-int runServer(int argc, char* argv[])
+std::vector<std::thread> gClientThreads;
+
+int clientHandler( sockaddr_in cli_addr, socklen_t clilen, int clientsockfd)
 {
-    sockaddr_in serv_addr; // Server address
-    int sockfd; 	// socket File descriptor
-    int portno = TTRTS_PORT;		// Port number
-
-    struct sockaddr_in cli_addr;  // Client address
-    int newsockfd; 	// new socket File descriptor
-    socklen_t clilen;		// length of client address
-
-    clilen = sizeof(sockaddr_in);
-
-    int n = 0;			// return value for read and write calls
+    std::cout<<"Client connected from "<<inet_ntoa(cli_addr.sin_addr)<<std::endl;
 
     char buffer[1028]; // buffer for socked read
     memset(buffer,0,sizeof(buffer));
 
-
-    // Create a new socket
-    // AF_INET is general internetsocked domain
-    // SOCK_STREAM as messages will be read in on this socket, SOCK_DGRAM would be for packets
-    // 0 is for default protocol
-    sockfd = socket(AF_INET, SOCK_STREAM, 0);
-    if (sockfd < 0)
-        error("ERROR opening socket");
-
-    // empty the server address
-    memset(&serv_addr,0, sizeof(serv_addr));
-    
-    // Set the server address family to AF_INET
-    serv_addr.sin_family = AF_INET;
-
-    // Set the port number
-    // htons swaps from host byte order to network byte order
-    serv_addr.sin_port = htons(portno);
-
-    // The host for this address is this current machines's IP
-    // INADDR_ANY fetches this
-    serv_addr.sin_addr.s_addr = INADDR_ANY;
-
-    // bind out socket to this server address
-    if (bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
-        error("ERROR on binding");
-
-    // Listen on the socket for messages
-    // Second param is length of backlog queue, the maximum number of connections
-    // that can be waiting while the process is handling a single connection
-    // max is usually set to 5
-    listen(sockfd,5);
-
-    // accept waits for a connection from a client
-    // it returns a new socket file descriptor for this connection
-    // client information will be stored in cli_addr
-    newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, &clilen);
-    if (newsockfd < 0)
-        error("ERROR on accept");
-
     // loop
+    int n = 0;			// return value for read and write calls
     while( n >= 0 )
     {
         // empty the buffer
@@ -81,7 +36,7 @@ int runServer(int argc, char* argv[])
         // Read in the new socket
         // read will block until the client has called write
         // up to the full size of the buffer
-        n = read(newsockfd,buffer,sizeof(buffer)-1);
+        n = read(clientsockfd,buffer,sizeof(buffer)-1);
         if (n < 0)
             error("ERROR reading from socket");
 
@@ -89,6 +44,88 @@ int runServer(int argc, char* argv[])
         printf("%s",buffer);
     }
 
+    return 0;
+}
+
+int runServer(int argc, char* argv[])
+{
+    std::cout<<"Setting up server on port "<<TTRTS_PORT<<std::endl;
+
+    // Server side information
+    int sockfd; 	        // socket File descriptor
+    sockaddr_in serv_addr;  // Server address
+    int portno = TTRTS_PORT;
+
+    // empty the server address
+    memset(&serv_addr,0, sizeof(serv_addr));
+    // Set the server address family to AF_INET
+    serv_addr.sin_family = AF_INET;
+    // htons swaps from host byte order to network byte order
+    serv_addr.sin_port = htons(portno);
+    // The host for this address is this current machine's IP, INADDR_ANY fetches this
+    serv_addr.sin_addr.s_addr = INADDR_ANY;
+
+    std::cout<<"Opening socket"<<std::endl;
+    // Create a new socket
+    // AF_INET is general internet socket domain
+    // SOCK_STREAM as messages will be read in on this socket, SOCK_DGRAM would be for packets
+    // 0 is for default protocol
+    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    if (sockfd < 0)
+        error("ERROR opening socket");
+
+    // bind our socket to this server address
+    std::cout<<"Binding socket"<<std::endl;
+    int retry = 1;
+    while (1)
+    {
+        if(retry > 10)
+        {
+            error("Binding failed after retries");
+        }
+
+        if (bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) >= 0)
+            break;
+
+        std::cout<<"Binding failed on try "<<retry<<std::endl;
+        sleep(retry);
+        retry++;
+    }
+
+    // Listen on the socket for messages
+    // Second param is length of backlog queue, the maximum number of connections
+    // that can be waiting while the process is handling a single connection
+    // max is usually set to 5
+    listen(sockfd,5);
+
+    std::cout<<"Waiting for clients"<<std::endl;
+
+    // Loop while we're connecting the clients
+    bool connectingClients = true;
+    while ( connectingClients )
+    {
+
+        // information for each client
+        sockaddr_in cli_addr;   // Client address
+        socklen_t clilen;		// length of client address
+        int clientsockfd; 	    // new socket File descriptor
+
+        clilen = sizeof(sockaddr_in);
+
+
+        // accept waits for a connection from a client
+        // it returns a new socket file descriptor for this connection
+        // client information will be stored in cli_addr
+        clientsockfd = accept(sockfd, (sockaddr *) &cli_addr, &clilen);
+        if (clientsockfd < 0)
+            error("ERROR on accept");
+
+        std::cout<<"Client recieved"<<std::endl;
+        std::thread clientThread = std::thread(clientHandler,cli_addr,clilen,clientsockfd);
+
+        gClientThreads.push_back(std::move(clientThread));
+    }
+
     // Return
     return 0;
 }
\ No newline at end of file