Resolves #6, Client and server are now one