refactored and pushed more into countrysvc