Update

Moved some of the classes to the server side and updated the gui