Moved around server stuff
Fixed weird merge