Mapnificent Refactor.