Started to add country/state stuff to profile. Probably going to remove
it all. So this commit is to save it, just in case.