make the country field actually optional
refactor
refactor 2