a bit of refactoring and towards outlines of nations on the map