Created a class representing the map itself and moved the map navigator's functionality into it.