Move map loading into WorldMap