Finished server and made a few adjustments to client.

Now time to test