Movement over server, map drawing on map loading, bit of refactoring