Add broken client-server stuff
...?
Clean up client and server code