Working towards client/server implementation
Finally splitting client and server