Added some effort in worldmap. 2 commits away from finishing this stuff.