Basic functionality working for the Server

No networking yet :(
Just spacing changes.