reworked map and movement system