Refactoring.
Work on a new map.