Includes updates to server

Still needs some bug fixing... apparently there is a no access control
allow origin header.