More work on WorldMap framework done.
Merged WorldMap