Finished new client/server