Refactored the server, added more shit