country refactoring completed (wip)