Starting to integrate the new map functions into the main game.