map revamp (wip)