Updated some bits and added the server