Finished testing and implementing country code selection