For now, I am just going to use the results of your work the upgrade the country, zones, and zone to geo.
It can be changed later again if necessary.
I need to get this tested and a beta out so I can get some feed back.
Lots of fixes and new features.