Local TODO
Switched country and type. Removed old add functions.