WIP more with countries