Start working more

Started working hard on the server. Last commit of the night