diff --git a/.ds.baseline b/.ds.baseline
new file mode 100644
index 0000000000..cec28396cd
--- /dev/null
+++ b/.ds.baseline
@@ -0,0 +1,714 @@
+{
+  "version": "1.5.0",
+  "plugins_used": [
+    {
+      "name": "ArtifactoryDetector"
+    },
+    {
+      "name": "AWSKeyDetector"
+    },
+    {
+      "name": "AzureStorageKeyDetector"
+    },
+    {
+      "name": "Base64HighEntropyString",
+      "limit": 4.5
+    },
+    {
+      "name": "BasicAuthDetector"
+    },
+    {
+      "name": "CloudantDetector"
+    },
+    {
+      "name": "DiscordBotTokenDetector"
+    },
+    {
+      "name": "GitHubTokenDetector"
+    },
+    {
+      "name": "GitLabTokenDetector"
+    },
+    {
+      "name": "HexHighEntropyString",
+      "limit": 3.0
+    },
+    {
+      "name": "IbmCloudIamDetector"
+    },
+    {
+      "name": "IbmCosHmacDetector"
+    },
+    {
+      "name": "IPPublicDetector"
+    },
+    {
+      "name": "JwtTokenDetector"
+    },
+    {
+      "name": "KeywordDetector",
+      "keyword_exclude": ""
+    },
+    {
+      "name": "MailchimpDetector"
+    },
+    {
+      "name": "NpmDetector"
+    },
+    {
+      "name": "OpenAIDetector"
+    },
+    {
+      "name": "PrivateKeyDetector"
+    },
+    {
+      "name": "PypiTokenDetector"
+    },
+    {
+      "name": "SendGridDetector"
+    },
+    {
+      "name": "SlackDetector"
+    },
+    {
+      "name": "SoftlayerDetector"
+    },
+    {
+      "name": "SquareOAuthDetector"
+    },
+    {
+      "name": "StripeDetector"
+    },
+    {
+      "name": "TelegramBotTokenDetector"
+    },
+    {
+      "name": "TwilioKeyDetector"
+    }
+  ],
+  "filters_used": [
+    {
+      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_baseline_file",
+      "filename": ".ds.baseline"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
+      "min_level": 2
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_lock_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_sequential_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_swagger_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_templated_secret"
+    }
+  ],
+  "results": {
+    ".github/workflows/checks.yml": [
+      {
+        "type": "Secret Keyword",
+        "filename": ".github/workflows/checks.yml",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 61,
+        "is_secret": false
+      },
+      {
+        "type": "Basic Auth Credentials",
+        "filename": ".github/workflows/checks.yml",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 95,
+        "is_secret": false
+      }
+    ],
+    "app/assets/js/uswds.min.js": [
+      {
+        "type": "Secret Keyword",
+        "filename": "app/assets/js/uswds.min.js",
+        "hashed_secret": "372ea08cab33e71c02c651dbc83a474d32c676ea",
+        "is_verified": false,
+        "line_number": 85,
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "app/assets/js/uswds.min.js",
+        "hashed_secret": "53e07a32bf191d6917ee6fd863f0b52632a86798",
+        "is_verified": false,
+        "line_number": 85,
+        "is_secret": false
+      }
+    ],
+    "app/config.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "app/config.py",
+        "hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc",
+        "is_verified": false,
+        "line_number": 111,
+        "is_secret": false
+      }
+    ],
+    "app/main/_commonly_used_passwords.py": [
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "82e19fa12aab7cfc718a002fc82c0f074bf070e7",
+        "is_verified": false,
+        "line_number": 123,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "a172ffc990129fe6f68b50f6037c54a1894ee3fd",
+        "is_verified": false,
+        "line_number": 240,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "4de69ee6b12b7fc91070873b71ba6e2929b90619",
+        "is_verified": false,
+        "line_number": 244,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "370194ff6e0f93a7432e16cc9badd9427e8b4e13",
+        "is_verified": false,
+        "line_number": 284,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "3dd635a808ddb6dd4b6731f7c409d53dd4b14df2",
+        "is_verified": false,
+        "line_number": 356,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "67a74306b06d0c01624fe0d0249a570f4d093747",
+        "is_verified": false,
+        "line_number": 374,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "61d6504733ca7757e259c644acd085c4dd471019",
+        "is_verified": false,
+        "line_number": 910,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "4ea872dfd7eefbde0036da7f0780826353dc7477",
+        "is_verified": false,
+        "line_number": 940,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "b214f706bb602c1cc2adc5c6165e73622305f4bb",
+        "is_verified": false,
+        "line_number": 1010,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "5cbabd43e49a1fedbbc3b86311aa6c8fe446abf9",
+        "is_verified": false,
+        "line_number": 1195,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "18ad10fd4a67f21fc07b1aa5046b410f6b2bedf1",
+        "is_verified": false,
+        "line_number": 1213,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "10470c3b4b1fed12c3baac014be15fac67c6e815",
+        "is_verified": false,
+        "line_number": 1263,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "65e1946c8f102eca8ba0af291f7c5e807516d94c",
+        "is_verified": false,
+        "line_number": 1346,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "0075df0a74c07ee295c98238c018401c9a80183b",
+        "is_verified": false,
+        "line_number": 1397,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "ca0023d7b345802fbc227b902cb9c57a3e02195f",
+        "is_verified": false,
+        "line_number": 1442,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "c8c6ca2e11c2dfd2a40914585b5944bffea15c8c",
+        "is_verified": false,
+        "line_number": 1555,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "b85b97a99eab8c809570c61d6404c1e49bdefbb4",
+        "is_verified": false,
+        "line_number": 1596,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "dec7dd342a499dfd4d283d872ccf598d8a7b6039",
+        "is_verified": false,
+        "line_number": 1789,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "2dc5053699a351121bf839c446bd4a878dda5735",
+        "is_verified": false,
+        "line_number": 1939,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "e5d54f0ac13abbdaa94b696c2469148b96dd11ab",
+        "is_verified": false,
+        "line_number": 2242,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "6059f42e2bbae78141e8a9e6286755ee691d5ce0",
+        "is_verified": false,
+        "line_number": 2305,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "fe703d258c7ef5f50b71e06565a65aa07194907f",
+        "is_verified": false,
+        "line_number": 2348,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "c229b68e1c3ffd9874838b5cb5354a0ee1367ddc",
+        "is_verified": false,
+        "line_number": 2349,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "756de479126e911b6f3400ae686d663d9d26b509",
+        "is_verified": false,
+        "line_number": 2920,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "6b174322afcdb440ee9cc3cc11eb16f9a00dec04",
+        "is_verified": false,
+        "line_number": 2975,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "9860783bfb510cbb2bf34471ec0b84a7ea587695",
+        "is_verified": false,
+        "line_number": 3359,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "b227cbd22eaa96019ebfc4aff35ad2add2a47439",
+        "is_verified": false,
+        "line_number": 3590,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "381d48209aecab8834eb495c5b5406100da07882",
+        "is_verified": false,
+        "line_number": 3811,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "app/main/_commonly_used_passwords.py",
+        "hashed_secret": "508b38590a90d32990aadd7350d160b795c3ab41",
+        "is_verified": false,
+        "line_number": 3850,
+        "is_secret": false
+      }
+    ],
+    "app/main/views/sign_in.py": [
+      {
+        "type": "Private Key",
+        "filename": "app/main/views/sign_in.py",
+        "hashed_secret": "1348b145fa1a555461c1b790a2f66614781091e9",
+        "is_verified": false,
+        "line_number": 27,
+        "is_secret": false
+      }
+    ],
+    "app/templates/new/components/head.html": [
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "app/templates/new/components/head.html",
+        "hashed_secret": "ee5048791fc7ff45a1545e24f85bec3317371327",
+        "is_verified": false,
+        "line_number": 35,
+        "is_secret": false
+      }
+    ],
+    "app/templates/old/admin_template.html": [
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "app/templates/old/admin_template.html",
+        "hashed_secret": "ee5048791fc7ff45a1545e24f85bec3317371327",
+        "is_verified": false,
+        "line_number": 18,
+        "is_secret": false
+      }
+    ],
+    "deploy-config/sandbox.yml": [
+      {
+        "type": "Secret Keyword",
+        "filename": "deploy-config/sandbox.yml",
+        "hashed_secret": "113151dd10316fcb0d5507b6215d78e2f3fe9e54",
+        "is_verified": false,
+        "line_number": 8,
+        "is_secret": false
+      }
+    ],
+    "pytest.ini": [
+      {
+        "type": "Secret Keyword",
+        "filename": "pytest.ini",
+        "hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc",
+        "is_verified": false,
+        "line_number": 7,
+        "is_secret": false
+      },
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "pytest.ini",
+        "hashed_secret": "d347784b1ab6074a65cda7bc42f1561bed85493f",
+        "is_verified": false,
+        "line_number": 7,
+        "is_secret": false
+      },
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "pytest.ini",
+        "hashed_secret": "ed1754d5cc82c8fd83205ebfb8c43fe4e88415a4",
+        "is_verified": false,
+        "line_number": 9,
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "pytest.ini",
+        "hashed_secret": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
+        "is_verified": false,
+        "line_number": 11,
+        "is_secret": false
+      }
+    ],
+    "tests/__init__.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/__init__.py",
+        "hashed_secret": "f8377c90fcfd699f0ddbdcb30c2c9183d2d933ea",
+        "is_verified": false,
+        "line_number": 388,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/forms/test_register_user_form.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/forms/test_register_user_form.py",
+        "hashed_secret": "8c6c978dc8e08771c7dea1ea2370fdf2446e5ba5",
+        "is_verified": false,
+        "line_number": 38,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/test_errorhandlers.py": [
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "tests/app/main/test_errorhandlers.py",
+        "hashed_secret": "005fa73b3f2be8f0d71d361c1f0a9d787cd09b4e",
+        "is_verified": false,
+        "line_number": 33,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/test_request_header.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/test_request_header.py",
+        "hashed_secret": "6866ef97a972ba3a2c6ff8bb2812981054770162",
+        "is_verified": false,
+        "line_number": 21,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/views/organizations/test_organization_invites.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/organizations/test_organization_invites.py",
+        "hashed_secret": "bdbb156d25d02fd7792865824201dda1c60f4473",
+        "is_verified": false,
+        "line_number": 265,
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/organizations/test_organization_invites.py",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 273,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/views/test_accept_invite.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_accept_invite.py",
+        "hashed_secret": "07f0a6c13923fc3b5f0c57ffa2d29b715eb80d71",
+        "is_verified": false,
+        "line_number": 607,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/views/test_new_password.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_new_password.py",
+        "hashed_secret": "a41d5c3bbcd0b39c627b9cbf4897c6d25efa694f",
+        "is_verified": false,
+        "line_number": 89,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/views/test_register.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_register.py",
+        "hashed_secret": "bdbb156d25d02fd7792865824201dda1c60f4473",
+        "is_verified": false,
+        "line_number": 116,
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_register.py",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 192,
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_register.py",
+        "hashed_secret": "bb5b7caa27d005d38039e3797c3ddb9bcd22c3c8",
+        "is_verified": false,
+        "line_number": 260,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/views/test_sign_in.py": [
+      {
+        "type": "Private Key",
+        "filename": "tests/app/main/views/test_sign_in.py",
+        "hashed_secret": "1348b145fa1a555461c1b790a2f66614781091e9",
+        "is_verified": false,
+        "line_number": 31,
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_sign_in.py",
+        "hashed_secret": "8b8b69116ee882b5e987e330f55db81aba0636f9",
+        "is_verified": false,
+        "line_number": 104,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/views/test_two_factor.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_two_factor.py",
+        "hashed_secret": "dc66ad927c29e31c6c374231f57a4684b0687bfe",
+        "is_verified": false,
+        "line_number": 267,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/views/test_user_profile.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_user_profile.py",
+        "hashed_secret": "8072d7aad32964ec43fbcb699c75dc38890792f7",
+        "is_verified": false,
+        "line_number": 350,
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_user_profile.py",
+        "hashed_secret": "4c9dbb972da179e4f66f023eaa5fb9451d835030",
+        "is_verified": false,
+        "line_number": 351,
+        "is_secret": false
+      }
+    ],
+    "tests/app/main/views/test_verify.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/main/views/test_verify.py",
+        "hashed_secret": "faafcfa63e128929409bf310b7ea5a415f2331ce",
+        "is_verified": false,
+        "line_number": 160,
+        "is_secret": false
+      }
+    ],
+    "tests/app/notify_client/test_user_client.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/notify_client/test_user_client.py",
+        "hashed_secret": "f2c57870308dc87f432e5912d4de6f8e322721ba",
+        "is_verified": false,
+        "line_number": 55,
+        "is_secret": false
+      }
+    ],
+    "tests/app/test_cloudfoundry_config.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/test_cloudfoundry_config.py",
+        "hashed_secret": "5e44dae2de8b6e57c797b968035265c9f2cd2b3e",
+        "is_verified": false,
+        "line_number": 12,
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/app/test_cloudfoundry_config.py",
+        "hashed_secret": "e5e178db7317356946d13e5d2da037d39ac61c71",
+        "is_verified": false,
+        "line_number": 27,
+        "is_secret": false
+      }
+    ],
+    "tests/conftest.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/conftest.py",
+        "hashed_secret": "f8377c90fcfd699f0ddbdcb30c2c9183d2d933ea",
+        "is_verified": false,
+        "line_number": 3289,
+        "is_secret": false
+      }
+    ],
+    "tests/notifications_utils/clients/antivirus/test_antivirus_client.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/notifications_utils/clients/antivirus/test_antivirus_client.py",
+        "hashed_secret": "932b25270abe1301c22c709a19082dff07d469ff",
+        "is_verified": false,
+        "line_number": 16,
+        "is_secret": false
+      }
+    ],
+    "tests/notifications_utils/clients/encryption/test_encryption_client.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/notifications_utils/clients/encryption/test_encryption_client.py",
+        "hashed_secret": "f1e923a9667de11be6a210849a8651c1bfd81605",
+        "is_verified": false,
+        "line_number": 13,
+        "is_secret": false
+      }
+    ],
+    "tests/notifications_utils/clients/zendesk/test_zendesk_client.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "tests/notifications_utils/clients/zendesk/test_zendesk_client.py",
+        "hashed_secret": "913a73b565c8e2c8ed94497580f619397709b8b6",
+        "is_verified": false,
+        "line_number": 16,
+        "is_secret": false
+      }
+    ]
+  },
+  "generated_at": "2024-05-20T16:03:05Z"
+}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 057c1ec169..cb3c48cae9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v4.6.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -11,3 +11,14 @@ repos:
     -   id: debug-statements
     -   id: check-merge-conflict
     -   id: check-toml
+    -   id: check-ast
+    -   id: fix-byte-order-marker
+    -   id: detect-aws-credentials
+        args: [--allow-missing-credentials]
+    -   id: detect-private-key
+    -   id: mixed-line-ending
+-   repo: https://github.com/Yelp/detect-secrets
+    rev: v1.5.0
+    hooks:
+    -   id: detect-secrets
+        args: ['--baseline', '.ds.baseline']
diff --git a/Makefile b/Makefile
index 7085bee586..eb6bb81316 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ too-complex:
 .PHONY: py-test
 py-test: export NEW_RELIC_ENVIRONMENT=test
 py-test: ## Run python unit tests
-	poetry run coverage run --omit=*/notifications_utils/* -m pytest --maxfail=10 --ignore=tests/end_to_end tests/
+	poetry run coverage run -m pytest --maxfail=10 --ignore=tests/end_to_end tests/
 	poetry run coverage report --fail-under=96
 	poetry run coverage html -d .coverage_cache
 
@@ -101,13 +101,6 @@ py-lock: ## Syncs dependencies and updates lock file without performing recursiv
 	poetry lock --no-update
 	poetry install --sync
 
-.PHONY: update-utils
-update-utils: ## Forces Poetry to pull the latest changes from the notifications-utils repo; requires that you commit the changes to poetry.lock!
-	poetry update notifications-utils
-	@echo
-	@echo !!! PLEASE MAKE SURE TO COMMIT AND PUSH THE UPDATED poetry.lock FILE !!!
-	@echo
-
 .PHONY: freeze-requirements
 freeze-requirements: ## create static requirements.txt
 	poetry export --without-hashes --format=requirements.txt > requirements.txt
diff --git a/README.md b/README.md
index 0d7ffc5bc3..1c4df2aa5e 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,6 @@ UI's backend and is required for most things to function. Set that up first!
 Our other repositories are:
 
 - [notifications-admin](https://github.com/GSA/notifications-admin)
-- [notifications-utils](https://github.com/GSA/notifications-utils)
 - [us-notify-compliance](https://github.com/GSA/us-notify-compliance/)
 - [notify-python-demo](https://github.com/GSA/notify-python-demo)
 
@@ -420,23 +419,6 @@ In either situation, once you are finished and have verified the dependency
 changes are working, please be sure to commit both the `pyproject.toml` and
 `poetry.lock` files.
 
-### Keeping the notification-utils Dependency Up-to-Date
-
-The `notifications-utils` dependency references the other repository we have at
-https://github.com/GSA/notifications-utils - this dependency requires a bit of
-extra legwork to ensure it stays up-to-date.
-
-Whenever a PR is merged in the `notifications-utils` repository, we need to make
-sure the changes are pulled in here and committed to this repository as well.
-You can do this by going through these steps:
-
-- Make sure your local `main` branch is up-to-date
-- Create a new branch to work in
-- Run `make update-utils`
-- Commit the updated `poetry.lock` file and push the changes
-- Make a new PR with the change
-- Have the PR get reviewed and merged
-
 ## Known Installation Issues
 
 ### Python Installation Errors
diff --git a/app/__init__.py b/app/__init__.py
index d2c61d0a06..5c9283c79b 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -23,12 +23,6 @@
 from flask_wtf.csrf import CSRFError
 from itsdangerous import BadSignature
 from notifications_python_client.errors import HTTPError
-from notifications_utils import logging, request_helper
-from notifications_utils.formatters import (
-    formatted_list,
-    get_lines_with_normalised_whitespace,
-)
-from notifications_utils.recipients import format_phone_number_human_readable
 from werkzeug.exceptions import HTTPException as WerkzeugHTTPException
 from werkzeug.exceptions import abort
 from werkzeug.local import LocalProxy
@@ -114,6 +108,12 @@
 from app.notify_client.user_api_client import user_api_client
 from app.url_converters import SimpleDateTypeConverter, TemplateTypeConverter
 from app.utils.govuk_frontend_jinja.flask_ext import init_govuk_frontend
+from notifications_utils import logging, request_helper
+from notifications_utils.formatters import (
+    formatted_list,
+    get_lines_with_normalised_whitespace,
+)
+from notifications_utils.recipients import format_phone_number_human_readable
 
 login_manager = LoginManager()
 csrf = CSRFProtect()
diff --git a/app/assets/javascripts/chartDashboard.js b/app/assets/javascripts/chartDashboard.js
new file mode 100644
index 0000000000..fc40936f89
--- /dev/null
+++ b/app/assets/javascripts/chartDashboard.js
@@ -0,0 +1,24 @@
+(function (window) {
+
+    const ctx = document.getElementById('myChart');
+
+    new Chart(ctx, {
+        type: 'bar',
+        data: {
+        labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
+        datasets: [{
+            label: '# of Votes',
+            data: [12, 19, 3, 5, 2, 3],
+            borderWidth: 1
+        }]
+        },
+        options: {
+        scales: {
+            y: {
+            beginAtZero: true
+            }
+        }
+        }
+    });
+
+})(window);
diff --git a/app/config.py b/app/config.py
index 0a05908f51..8ec4db1866 100644
--- a/app/config.py
+++ b/app/config.py
@@ -2,9 +2,9 @@
 from os import getenv
 
 import newrelic.agent
-from notifications_utils import DAILY_MESSAGE_LIMIT
 
 from app.cloudfoundry_config import cloud_config
+from notifications_utils import DAILY_MESSAGE_LIMIT
 
 
 class Config(object):
diff --git a/app/formatters.py b/app/formatters.py
index 23ef6690ad..5cb3feeaf4 100644
--- a/app/formatters.py
+++ b/app/formatters.py
@@ -16,15 +16,15 @@
 from flask import render_template_string, url_for
 from flask.helpers import get_root_path
 from markupsafe import Markup
+
+from app.utils.csv import get_user_preferred_timezone
+from app.utils.time import parse_naive_dt
 from notifications_utils.field import Field
 from notifications_utils.formatters import make_quotes_smart
 from notifications_utils.formatters import nl2br as utils_nl2br
 from notifications_utils.recipients import InvalidPhoneError, validate_phone_number
 from notifications_utils.take import Take
 
-from app.utils.csv import get_user_preferred_timezone
-from app.utils.time import parse_naive_dt
-
 
 def apply_html_class(tags, html_file):
     new_html = html_file
diff --git a/app/main/forms.py b/app/main/forms.py
index 2d1820391c..afec80f9f2 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -11,9 +11,6 @@
 from flask_wtf.file import FileField as FileField_wtf
 from flask_wtf.file import FileSize
 from markupsafe import Markup
-from notifications_utils.formatters import strip_all_whitespace
-from notifications_utils.insensitive_dict import InsensitiveDict
-from notifications_utils.recipients import InvalidPhoneError, validate_phone_number
 from werkzeug.utils import cached_property
 from wtforms import (
     BooleanField,
@@ -66,6 +63,9 @@
 from app.utils import merge_jsonlike
 from app.utils.csv import get_user_preferred_timezone
 from app.utils.user_permissions import all_ui_permissions, permission_options
+from notifications_utils.formatters import strip_all_whitespace
+from notifications_utils.insensitive_dict import InsensitiveDict
+from notifications_utils.recipients import InvalidPhoneError, validate_phone_number
 
 
 def get_time_value_and_label(future_time):
diff --git a/app/main/validators.py b/app/main/validators.py
index 8ea7934bf2..4dd04017b3 100644
--- a/app/main/validators.py
+++ b/app/main/validators.py
@@ -1,15 +1,15 @@
 import re
 from abc import ABC, abstractmethod
 
-from notifications_utils.field import Field
-from notifications_utils.formatters import formatted_list
-from notifications_utils.recipients import InvalidEmailError, validate_email_address
-from notifications_utils.sanitise_text import SanitiseSMS
 from wtforms import ValidationError
 
 from app.main._commonly_used_passwords import commonly_used_passwords
 from app.models.spreadsheet import Spreadsheet
 from app.utils.user import is_gov_user
+from notifications_utils.field import Field
+from notifications_utils.formatters import formatted_list
+from notifications_utils.recipients import InvalidEmailError, validate_email_address
+from notifications_utils.sanitise_text import SanitiseSMS
 
 
 class CommonlyUsedPassword:
diff --git a/app/main/views/conversation.py b/app/main/views/conversation.py
index 4b14ddf31e..a3ac47da75 100644
--- a/app/main/views/conversation.py
+++ b/app/main/views/conversation.py
@@ -1,14 +1,14 @@
 from flask import jsonify, redirect, render_template, session, url_for
 from flask_login import current_user
 from notifications_python_client.errors import HTTPError
-from notifications_utils.recipients import format_phone_number_human_readable
-from notifications_utils.template import SMSPreviewTemplate
 
 from app import current_service, notification_api_client, service_api_client
 from app.main import main
 from app.main.forms import SearchByNameForm
 from app.models.template_list import TemplateList
 from app.utils.user import user_has_permissions
+from notifications_utils.recipients import format_phone_number_human_readable
+from notifications_utils.template import SMSPreviewTemplate
 
 
 @main.route("/services/<uuid:service_id>/conversation/<uuid:notification_id>")
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 8453ef369e..3bbf432b31 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -6,7 +6,6 @@
 
 from flask import Response, abort, jsonify, render_template, request, session, url_for
 from flask_login import current_user
-from notifications_utils.recipients import format_phone_number_human_readable
 from werkzeug.utils import redirect
 
 from app import (
@@ -30,6 +29,7 @@
 from app.utils.pagination import generate_next_dict, generate_previous_dict
 from app.utils.time import get_current_financial_year
 from app.utils.user import user_has_permissions
+from notifications_utils.recipients import format_phone_number_human_readable
 
 
 @main.route("/services/<uuid:service_id>/dashboard")
diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index d914b10f01..010d19b264 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -15,7 +15,6 @@
 )
 from flask_login import current_user
 from markupsafe import Markup
-from notifications_utils.template import EmailPreviewTemplate, SMSBodyPreviewTemplate
 
 from app import (
     current_service,
@@ -35,6 +34,7 @@
     get_page_from_request,
 )
 from app.utils.user import user_has_permissions
+from notifications_utils.template import EmailPreviewTemplate, SMSBodyPreviewTemplate
 
 
 @main.route("/services/<uuid:service_id>/jobs")
diff --git a/app/main/views/new_password.py b/app/main/views/new_password.py
index 4bf3747178..222268c36d 100644
--- a/app/main/views/new_password.py
+++ b/app/main/views/new_password.py
@@ -10,12 +10,12 @@
     url_for,
 )
 from itsdangerous import SignatureExpired
-from notifications_utils.url_safe_token import check_token
 
 from app.main import main
 from app.main.forms import NewPasswordForm
 from app.models.user import User
 from app.utils.login import log_in_user
+from notifications_utils.url_safe_token import check_token
 
 
 @main.route("/new-password/<path:token>", methods=["GET", "POST"])
diff --git a/app/main/views/pricing.py b/app/main/views/pricing.py
index 0e5fb361db..5e60e6768a 100644
--- a/app/main/views/pricing.py
+++ b/app/main/views/pricing.py
@@ -1,11 +1,11 @@
 from flask import current_app, render_template
 from flask_login import current_user
-from notifications_utils.international_billing_rates import INTERNATIONAL_BILLING_RATES
 
 from app.main import main
 from app.main.forms import SearchByNameForm
 from app.main.views.sub_navigation_dictionaries import using_notify_nav
 from app.utils.user import user_is_logged_in
+from notifications_utils.international_billing_rates import INTERNATIONAL_BILLING_RATES
 
 CURRENT_SMS_RATE = "1.72"
 
diff --git a/app/main/views/register.py b/app/main/views/register.py
index e9e03a76a2..2829d37bb3 100644
--- a/app/main/views/register.py
+++ b/app/main/views/register.py
@@ -15,7 +15,7 @@
 )
 from flask_login import current_user
 
-from app import user_api_client
+from app import redis_client, user_api_client
 from app.main import main
 from app.main.forms import (
     RegisterUserForm,
@@ -113,74 +113,89 @@ def registration_continue():
         raise Exception("Unexpected routing in registration_continue")
 
 
-@main.route("/set-up-your-profile", methods=["GET", "POST"])
-@hide_from_search_engines
-def set_up_your_profile():
+def get_invite_data_from_redis(state):
 
-    form = SetupUserProfileForm()
+    invite_data = json.loads(redis_client.raw_get(f"invitedata-{state}"))
+    user_email = redis_client.raw_get(f"user_email-{state}").decode("utf8")
+    user_uuid = redis_client.raw_get(f"user_uuid-{state}").decode("utf8")
+    invited_user_email_address = redis_client.raw_get(
+        f"invited_user_email_address-{state}"
+    ).decode("utf8")
+    return invite_data, user_email, user_uuid, invited_user_email_address
 
-    if form.validate_on_submit():
-        # start login.gov
-        code = request.args.get("code")
-        state = request.args.get("state")
-        login_gov_error = request.args.get("error")
-        if code and state:
-            return _handle_login_dot_gov_invite(code, state, form)
-        elif login_gov_error:
-            current_app.logger.error(f"login.gov error: {login_gov_error}")
-            raise Exception(f"Could not login with login.gov {login_gov_error}")
-        # end login.gov
 
-    return render_template("views/set-up-your-profile.html", form=form)
+def put_invite_data_in_redis(
+    state, invite_data, user_email, user_uuid, invited_user_email_address
+):
+    ttl = 60 * 15  # 15 minutes
 
+    redis_client.raw_set(f"invitedata-{state}", json.dumps(invite_data), ex=ttl)
+    redis_client.raw_set(f"user_email-{state}", user_email, ex=ttl)
+    redis_client.raw_set(f"user_uuid-{state}", user_uuid, ex=ttl)
+    redis_client.raw_set(
+        f"invited_user_email_address-{state}",
+        invited_user_email_address,
+        ex=ttl,
+    )
 
-def get_invited_user_email_address(invited_user_id):
-    # InvitedUser is an unhashable type and hard to mock in tests
-    # so this convenience method is a workaround for that
-    invited_user = InvitedUser.by_id(invited_user_id)
-    return invited_user.email_address
 
+def check_invited_user_email_address_matches_expected(
+    user_email, invited_user_email_address
+):
+    if user_email.lower() != invited_user_email_address.lower():
+        debug_msg("invited user email did not match expected email, abort(403)")
+        flash("You cannot accept an invite for another person.")
+        abort(403)
 
-def invited_user_accept_invite(invited_user_id):
-    # InvitedUser is an unhashable type and hard to mock in tests
-    # so this convenience method is a workaround for that
-    invited_user = InvitedUser.by_id(invited_user_id)
-    invited_user.accept_invite()
 
+@main.route("/set-up-your-profile", methods=["GET", "POST"])
+@hide_from_search_engines
+def set_up_your_profile():
 
-def debug_msg(msg):
-    current_app.logger.debug(hilite(msg))
+    debug_msg(f"Enter set_up_your_profile with request.args {request.args}")
+    code = request.args.get("code")
+    state = request.args.get("state")
+    login_gov_error = request.args.get("error")
 
+    if redis_client.raw_get(f"invitedata-{state}") is None:
+        access_token = sign_in._get_access_token(code, state)
+        debug_msg("Got the access token for login.gov")
+        user_email, user_uuid = sign_in._get_user_email_and_uuid(access_token)
+        debug_msg(
+            f"Got the user_email {user_email} and user_uuid {user_uuid} from login.gov"
+        )
+        invite_data = state.encode("utf8")
+        invite_data = base64.b64decode(invite_data)
+        invite_data = json.loads(invite_data)
+        debug_msg(f"final state {invite_data}")
+        invited_user_id = invite_data["invited_user_id"]
+        invited_user_email_address = get_invited_user_email_address(invited_user_id)
+        debug_msg(f"email address from the invite_date is {invited_user_email_address}")
+        check_invited_user_email_address_matches_expected(
+            user_email, invited_user_email_address
+        )
 
-def _handle_login_dot_gov_invite(code, state, form):
-    debug_msg(f"enter _handle_login_dot_gov_invite with code {code} state {state}")
-    access_token = sign_in._get_access_token(code, state)
-    debug_msg("Got the access token for login.gov")
-    user_email, user_uuid = sign_in._get_user_email_and_uuid(access_token)
-    debug_msg(
-        f"Got the user_email {user_email} and user_uuid {user_uuid} from login.gov"
-    )
-    debug_msg(f"raw state {state}")
-    invite_data = state.encode("utf8")
-    debug_msg(f"utf8 encoded state {invite_data}")
-    invite_data = base64.b64decode(invite_data)
-    debug_msg(f"b64 decoded state {invite_data}")
-    invite_data = json.loads(invite_data)
-    debug_msg(f"final state {invite_data}")
-    invited_user_id = invite_data["invited_user_id"]
-    invited_user_email_address = get_invited_user_email_address(invited_user_id)
-    debug_msg(f"email address from the invite_date is {invited_user_email_address}")
-    if user_email.lower() != invited_user_email_address.lower():
-        debug_msg("invited user email did not match expected email, abort(403)")
-        flash("You cannot accept an invite for another person.")
-        session.pop("invited_user_id", None)
-        abort(403)
-    else:
         invited_user_accept_invite(invited_user_id)
         debug_msg(
-            f"invited user {invited_user_email_address} to service {invite_data['service_id']}"
+            f"accepted invite user {invited_user_email_address} to service {invite_data['service_id']}"
         )
-        debug_msg("accepted invite")
+        # We need to avoid taking a second trip through the login.gov code because we cannot pull the
+        # access token twice.  So once we retrieve these values, let's park them in redis for 15 minutes
+        put_invite_data_in_redis(
+            state, invite_data, user_email, user_uuid, invited_user_email_address
+        )
+
+    form = SetupUserProfileForm()
+
+    if (
+        form.validate_on_submit()
+        and redis_client.raw_get(f"invitedata-{state}") is not None
+    ):
+        invite_data, user_email, user_uuid, invited_user_email_address = (
+            get_invite_data_from_redis(state)
+        )
+
+        # create or update the user
         user = user_api_client.get_user_by_uuid_or_email(user_uuid, user_email)
         if user is None:
             user = User.register(
@@ -191,6 +206,9 @@ def _handle_login_dot_gov_invite(code, state, form):
                 auth_type="sms_auth",
             )
             debug_msg(f"registered user {form.name.data} with email {user_email}")
+        else:
+            user.update(mobile_number=form.mobile_number.data, name=form.name.data)
+            debug_msg(f"updated user {form.name.data}")
 
         # activate the user
         user = user_api_client.get_user_by_uuid_or_email(user_uuid, user_email)
@@ -207,3 +225,32 @@ def _handle_login_dot_gov_invite(code, state, form):
             f"Added user {usr.email_address} to service {invite_data['service_id']}"
         )
         return redirect(url_for("main.show_accounts_or_dashboard"))
+
+    elif login_gov_error:
+        current_app.logger.error(f"login.gov error: {login_gov_error}")
+        abort(403)
+
+    # we take two trips through this method, but should only hit this
+    # line on the first trip.  On the second trip, we should get redirected
+    # to the accounts page because we have successfully registered.
+    return render_template("views/set-up-your-profile.html", form=form)
+
+
+def get_invited_user_email_address(invited_user_id):
+    # InvitedUser is an unhashable type and hard to mock in tests
+    # so this convenience method is a workaround for that
+    invited_user = InvitedUser.by_id(invited_user_id)
+    return invited_user.email_address
+
+
+def invited_user_accept_invite(invited_user_id):
+    invited_user = InvitedUser.by_id(invited_user_id)
+    if invited_user.status == "expired":
+        current_app.logger.error("User invitation has expired")
+        flash("Your invitation has expired.")
+        abort(401)
+    invited_user.accept_invite()
+
+
+def debug_msg(msg):
+    current_app.logger.debug(hilite(msg))
diff --git a/app/main/views/send.py b/app/main/views/send.py
index a0ef0b9054..abf17fded8 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -7,10 +7,6 @@
 from flask_login import current_user
 from markupsafe import Markup
 from notifications_python_client.errors import HTTPError
-from notifications_utils import SMS_CHAR_COUNT_LIMIT
-from notifications_utils.insensitive_dict import InsensitiveDict
-from notifications_utils.recipients import RecipientCSV, first_column_headings
-from notifications_utils.sanitise_text import SanitiseASCII
 from xlrd.biffh import XLRDError
 from xlrd.xldate import XLDateError
 
@@ -39,6 +35,10 @@
 from app.utils.csv import Spreadsheet, get_errors_for_csv
 from app.utils.templates import get_template
 from app.utils.user import user_has_permissions
+from notifications_utils import SMS_CHAR_COUNT_LIMIT
+from notifications_utils.insensitive_dict import InsensitiveDict
+from notifications_utils.recipients import RecipientCSV, first_column_headings
+from notifications_utils.sanitise_text import SanitiseASCII
 
 
 def get_example_csv_fields(column_headers, use_example_as_example, submitted_fields):
diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 618a356542..d00d368921 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -6,7 +6,6 @@
 import requests
 from flask import Response, current_app, redirect, render_template, request, url_for
 from flask_login import current_user
-from notifications_utils.url_safe_token import generate_token
 
 from app import login_manager, user_api_client
 from app.main import main
@@ -16,6 +15,7 @@
 from app.utils import hide_from_search_engines
 from app.utils.login import is_safe_redirect_url
 from app.utils.time import is_less_than_days_ago
+from notifications_utils.url_safe_token import generate_token
 
 
 def _reformat_keystring(orig):
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index e9e5f5b613..5c59e1e7cc 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -4,7 +4,6 @@
 from flask_login import current_user
 from markupsafe import Markup
 from notifications_python_client.errors import HTTPError
-from notifications_utils import SMS_CHAR_COUNT_LIMIT
 
 from app import (
     current_service,
@@ -30,6 +29,7 @@
 from app.utils import NOTIFICATION_TYPES, should_skip_template_page
 from app.utils.templates import get_template
 from app.utils.user import user_has_permissions
+from notifications_utils import SMS_CHAR_COUNT_LIMIT
 
 form_objects = {
     "email": EmailTemplateForm,
diff --git a/app/main/views/two_factor.py b/app/main/views/two_factor.py
index 560df1fadd..093e798459 100644
--- a/app/main/views/two_factor.py
+++ b/app/main/views/two_factor.py
@@ -3,7 +3,6 @@
 from flask import current_app, redirect, render_template, request, session, url_for
 from flask_login import current_user
 from itsdangerous import SignatureExpired
-from notifications_utils.url_safe_token import check_token
 
 from app import user_api_client
 from app.main import main
@@ -15,6 +14,7 @@
     redirect_to_sign_in,
     redirect_when_logged_in,
 )
+from notifications_utils.url_safe_token import check_token
 
 
 @main.route("/two-factor-email-sent", methods=["GET"])
diff --git a/app/main/views/user_profile.py b/app/main/views/user_profile.py
index 5d10fbf75b..b718bb4845 100644
--- a/app/main/views/user_profile.py
+++ b/app/main/views/user_profile.py
@@ -11,7 +11,6 @@
     url_for,
 )
 from flask_login import current_user
-from notifications_utils.url_safe_token import check_token
 
 from app import user_api_client
 from app.event_handlers import (
@@ -31,6 +30,7 @@
 )
 from app.models.user import User
 from app.utils.user import user_is_gov_user, user_is_logged_in
+from notifications_utils.url_safe_token import check_token
 
 NEW_EMAIL = "new-email"
 NEW_MOBILE = "new-mob"
diff --git a/app/main/views/verify.py b/app/main/views/verify.py
index 114e95dddf..4b3e2aad13 100644
--- a/app/main/views/verify.py
+++ b/app/main/views/verify.py
@@ -2,13 +2,13 @@
 
 from flask import abort, current_app, flash, redirect, render_template, session, url_for
 from itsdangerous import SignatureExpired
-from notifications_utils.url_safe_token import check_token
 
 from app import user_api_client
 from app.main import main
 from app.main.forms import TwoFactorForm
 from app.models.user import User
 from app.utils.login import redirect_to_sign_in
+from notifications_utils.url_safe_token import check_token
 
 
 @main.route("/verify", methods=["GET", "POST"])
diff --git a/app/models/__init__.py b/app/models/__init__.py
index 0c36135194..e9adf75a49 100644
--- a/app/models/__init__.py
+++ b/app/models/__init__.py
@@ -1,6 +1,7 @@
 from abc import abstractmethod
 
 from flask import abort
+
 from notifications_utils.serialised_model import (
     SerialisedModel,
     SerialisedModelCollection,
diff --git a/app/models/event.py b/app/models/event.py
index 3af502ea77..b57f11e73f 100644
--- a/app/models/event.py
+++ b/app/models/event.py
@@ -1,10 +1,9 @@
 from abc import ABC, abstractmethod
 
-from notifications_utils.formatters import formatted_list
-
 from app.formatters import format_thousands
 from app.models import ModelList
 from app.notify_client.service_api_client import service_api_client
+from notifications_utils.formatters import formatted_list
 
 
 class Event(ABC):
diff --git a/app/models/service.py b/app/models/service.py
index e06a1b16d3..375047d8d4 100644
--- a/app/models/service.py
+++ b/app/models/service.py
@@ -1,5 +1,4 @@
 from flask import abort, current_app
-from notifications_utils.serialised_model import SerialisedModelCollection
 from werkzeug.utils import cached_property
 
 from app.models import JSONModel, SortByNameMixin
@@ -15,6 +14,7 @@
 from app.notify_client.service_api_client import service_api_client
 from app.notify_client.template_folder_api_client import template_folder_api_client
 from app.utils import get_default_sms_sender
+from notifications_utils.serialised_model import SerialisedModelCollection
 
 
 class Service(JSONModel, SortByNameMixin):
diff --git a/app/notify_client/__init__.py b/app/notify_client/__init__.py
index 1fc14f8119..2cad0b68ad 100644
--- a/app/notify_client/__init__.py
+++ b/app/notify_client/__init__.py
@@ -2,9 +2,9 @@
 from flask_login import current_user
 from notifications_python_client import __version__
 from notifications_python_client.base import BaseAPIClient
-from notifications_utils.clients.redis import RequestCache
 
 from app.extensions import redis_client
+from notifications_utils.clients.redis import RequestCache
 
 cache = RequestCache(redis_client)
 
diff --git a/app/s3_client/s3_csv_client.py b/app/s3_client/s3_csv_client.py
index d3be10b948..21c3298873 100644
--- a/app/s3_client/s3_csv_client.py
+++ b/app/s3_client/s3_csv_client.py
@@ -1,7 +1,6 @@
 import uuid
 
 from flask import current_app
-from notifications_utils.s3 import s3upload as utils_s3upload
 
 from app.s3_client import (
     get_s3_contents,
@@ -9,6 +8,7 @@
     get_s3_object,
     set_s3_metadata,
 )
+from notifications_utils.s3 import s3upload as utils_s3upload
 
 FILE_LOCATION_STRUCTURE = "service-{}-notify/{}.csv"
 
diff --git a/app/s3_client/s3_logo_client.py b/app/s3_client/s3_logo_client.py
index e27218fefe..5a8453ad13 100644
--- a/app/s3_client/s3_logo_client.py
+++ b/app/s3_client/s3_logo_client.py
@@ -2,9 +2,9 @@
 
 from boto3 import Session
 from flask import current_app
-from notifications_utils.s3 import s3upload as utils_s3upload
 
 from app.s3_client import get_s3_object
+from notifications_utils.s3 import s3upload as utils_s3upload
 
 TEMP_TAG = "temp-{user_id}_"
 EMAIL_LOGO_LOCATION_STRUCTURE = "{temp}{unique_id}-{filename}"
diff --git a/app/templates/new/base.html b/app/templates/base.html
similarity index 78%
rename from app/templates/new/base.html
rename to app/templates/base.html
index 95039ce4f0..8a6ba1ea8b 100644
--- a/app/templates/new/base.html
+++ b/app/templates/base.html
@@ -1,10 +1,17 @@
-{% from "../components/banner.html" import banner %}
-{% from "../components/components/skip-link/macro.njk" import usaSkipLink -%}
-
+{% from "components/banner.html" import banner %}
+{% from "components/components/skip-link/macro.njk" import usaSkipLink -%}
+{% from "components/sub-navigation.html" import sub_navigation %}
 
 <!DOCTYPE html>
 <html lang="{{ htmlLang | default('en') }}" class="{{ htmlClasses }}">
-  {% include "new/components/head.html" %}
+  <head>
+    <title>
+      {% block pageTitle %}
+        {% block per_page_title %}{% endblock %} – Notify.gov
+      {% endblock %}
+    </title>
+    {% include "new/components/head.html" %}
+  </head>
   <body class="usa-template__body {{ bodyClasses }}">
     <script nonce="{{ csp_nonce() }}">document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
     {% block bodyStart %}
@@ -23,11 +30,10 @@
       }) }}
     {% endblock %}
 
+
     {% block header %}
-      {% if current_user.is_authenticated %}
-        {% include 'new/components/usa_banner.html' %}
-        {% include 'new/components/header.html' %}
-      {% endif %}
+      {% include 'new/components/usa_banner.html' %}
+      {% include 'new/components/header.html' %}
     {% endblock %}
 
     {% block main %}
@@ -36,18 +42,17 @@
         {% block backLink %}{% endblock %}
       {% endblock %}
       {% block mainClasses %}
-      <!-- notes set mainClasses = "margin-top-5 padding-bottom-5" where withoutnav_template was used and maybe templates that are using content_template -->
+      {% set mainClasses = "margin-top-5 padding-bottom-5" %}
       <main class="{{ mainClasses }}" id="main-content" role="main">
       {% endblock %}
         {% block content %}
           {% block flash_messages %}
-            <!-- flash_message.html was from the withoutnav_template and is only included on child templates that was using withoutnav_template. Now, we can add in flash_message blocks and include 'flash_messages.html' to child templates that was using withoutnav_template. This will help to eliminate the use of a whole other parent template. -->
+            {% include 'flash_messages.html' %}
           {% endblock %}
           {% block maincolumn_content %}
-            {% block fromContentTemplatetwoColumnGrid %}
               <div class="grid-row">
                 {% if navigation_links %}
-                  <div class="tablet:grid-col-2">
+                  <div class="tablet:grid-col-2 margin-bottom-4">
                     {{ sub_navigation(navigation_links) }}
                   </div>
                   <div class="tablet:grid-col-10 padding-left-4 usa-prose site-prose">
@@ -57,8 +62,6 @@
                 {% block content_column_content %}{% endblock %}
                 </div>
               </div>
-              <!-- content_column_content block is from the content_template.html. We do not need this template. We can consolidate and move it to the base.html template. We can call on this block where child templates were using the content_template.html  -->
-            {% endblock %}
           {% endblock %}
         {% endblock %}
       </main>
diff --git a/app/templates/error/401.html b/app/templates/error/401.html
index 01cad95e31..0562598b51 100644
--- a/app/templates/error/401.html
+++ b/app/templates/error/401.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}You’re not authorised to see this page{% endblock %}
 {% block maincolumn_content %}
   <div class="grid-row">
diff --git a/app/templates/error/403.html b/app/templates/error/403.html
index be2c12acc6..4bad0f94da 100644
--- a/app/templates/error/403.html
+++ b/app/templates/error/403.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}You’re not allowed to see this page{% endblock %}
 {% block maincolumn_content %}
     <div class="grid-row">
diff --git a/app/templates/error/404.html b/app/templates/error/404.html
index bb27fc4036..f03e4d044f 100644
--- a/app/templates/error/404.html
+++ b/app/templates/error/404.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}Page not found{% endblock %}
 {% block maincolumn_content %}
     <div class="grid-row">
diff --git a/app/templates/error/410.html b/app/templates/error/410.html
index bb27fc4036..f03e4d044f 100644
--- a/app/templates/error/410.html
+++ b/app/templates/error/410.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}Page not found{% endblock %}
 {% block maincolumn_content %}
     <div class="grid-row">
diff --git a/app/templates/error/500.html b/app/templates/error/500.html
index aca8332df9..d76a8759cb 100644
--- a/app/templates/error/500.html
+++ b/app/templates/error/500.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}Sorry, there’s a problem with the service{% endblock %}
 {% block maincolumn_content %}
   <div class="grid-row">
diff --git a/app/templates/new/components/head.html b/app/templates/new/components/head.html
index 9ceb9dbc19..51f3c4da33 100644
--- a/app/templates/new/components/head.html
+++ b/app/templates/new/components/head.html
@@ -1,6 +1,4 @@
-<head>
     <meta charset="utf-8" />
-    <title>{% block pageTitle %}Notify.gov{% endblock %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="Reach people where they are with a text message platform built just for government">
     <meta name="theme-color" media="(prefers-color-scheme: light)" content="f0f0f0" />
@@ -12,7 +10,7 @@
     {# Ensure that older IE versions always render with the correct rendering engine #}
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    {% block headIcons %}
+
     <link rel="shortcut icon" href="{{ assetPath | default('/assets') }}/images/favicon.ico" />
     <link rel="icon" type="image/png" sizes="32x32" href="{{ assetPath | default('/assets') }}/images/favicon-32x32.png" />
     <link rel="icon" type="image/png" sizes="16x16" href="{{ assetPath | default('/assets') }}/images/favicon-16x16.png" />
@@ -22,25 +20,19 @@
     <meta name="msapplication-TileColor" content="#da532c">
     <link href="{{ assetPath | default('/assets') }}/images/notify-dark-favicon.png" rel="icon" media="(prefers-color-scheme: dark)">
     <meta name="theme-color" content="#ffffff">
-    {% endblock %}
+
 
     <link rel="stylesheet" media="screen" href="{{ asset_url('css/styles.css') }}" />
     {% block extra_stylesheets %}{% endblock %}
 
-    {% block meta_format_detection %}
     <meta name="format-detection" content="telephone=no">
-    {% endblock %}
-    {% block og_image %}
     <meta property="og:title" content="Notify.gov">
     <meta property="og:description" content="Reach people where they are with a text message platform built just for government">
     <meta property="og:image" content="/static/images/notify-og-image.png">
-    {% endblock %}
     {# google #}
     <script type="text/javascript" src="{{ asset_url('js/gtm_head.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename='js/chart.umd.js') }}"></script>
     <meta name="google-site-verification" content="niWnSqImOWz6mVQTYqNb5tFK8HaKSB4b3ED4Z9gtUQ0" />
     {% if g.hide_from_search_engines %}
     <meta name="robots" content="noindex" />
     {% endif %}
-
-    {% block head %}{% endblock %}
-</head>
diff --git a/app/templates/new/components/header.html b/app/templates/new/components/header.html
index e21963fed5..cbdc21cf7d 100644
--- a/app/templates/new/components/header.html
+++ b/app/templates/new/components/header.html
@@ -1,25 +1,28 @@
 {# setting navigation and secondarynavigation #}
-{% set navigation = [
-  {"href": url_for("main.show_accounts_or_dashboard"), "text": "Current service", "active": header_navigation.is_selected('accounts-or-dashboard')},
-  {"href": url_for('main.get_started'), "text": "Using Notify", "active": header_navigation.is_selected('using_notify')},
-  {"href": url_for('main.features'), "text": "Features", "active": header_navigation.is_selected('features')},
-  {"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')}
-] %}
+{% if current_user.is_authenticated %}
+  {% set navigation = [
+    {"href": url_for("main.show_accounts_or_dashboard"), "text": "Current service", "active": header_navigation.is_selected('accounts-or-dashboard')},
+    {"href": url_for('main.get_started'), "text": "Using Notify", "active": header_navigation.is_selected('using_notify')},
+    {"href": url_for('main.features'), "text": "Features", "active": header_navigation.is_selected('features')},
+    {"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')}
+  ] %}
 
-{% if current_user.platform_admin %}
-  {% set navigation = navigation + [{"href": url_for('main.platform_admin_splash_page'), "text": "Platform admin", "active": header_navigation.is_selected('platform-admin')}] %}
-{% else %}
-  {% set navigation = navigation + [{"href": url_for('main.user_profile'), "text": "User profile", "active": header_navigation.is_selected('user-profile')}] %}
-{% endif %}
+  {% if current_user.platform_admin %}
+    {% set navigation = navigation + [{"href": url_for('main.platform_admin_splash_page'), "text": "Platform admin", "active": header_navigation.is_selected('platform-admin')}] %}
+  {% else %}
+    {% set navigation = navigation + [{"href": url_for('main.user_profile'), "text": "User profile", "active": header_navigation.is_selected('user-profile')}] %}
+  {% endif %}
 
-{% if current_service %}
-  {% set secondaryNavigation = [
-      {"href": url_for('main.service_settings', service_id=current_service.id), "text": "Settings", "active": secondary_navigation.is_selected('settings')},
-      {"href": url_for('main.sign_out'), "text": "Sign out"}
-  ] %}
-{% else %}
-  {% set secondaryNavigation = [{"href": url_for('main.sign_out'), "text": "Sign out"}] %}
+  {% if current_service %}
+    {% set secondaryNavigation = [
+        {"href": url_for('main.service_settings', service_id=current_service.id), "text": "Settings", "active": secondary_navigation.is_selected('settings')},
+        {"href": url_for('main.sign_out'), "text": "Sign out"}
+    ] %}
+  {% else %}
+    {% set secondaryNavigation = [{"href": url_for('main.sign_out'), "text": "Sign out"}] %}
+  {% endif %}
 {% endif %}
+
 {# usa header #}
 <header class="usa-header usa-header--extended">
   <div class="usa-nav-container">
diff --git a/app/templates/new/templates_glossary.md b/app/templates/new/templates_glossary.md
index 1c52e75dcc..7cd51f1a93 100644
--- a/app/templates/new/templates_glossary.md
+++ b/app/templates/new/templates_glossary.md
@@ -6,10 +6,9 @@ This document serves as a glossary for the templates directory structure of the
 ## Directory Structure
 
 - `/templates`
-  - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `withoutnav_template`, `settings_templates`, and `content_template`.
+  - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `withoutnav_template`, and `content_template`.
   - **/layouts**: Contains shared layouts used across the site. Simply put, it defines the overall structure or skeleton of the application (less frequently revised).
-    - `withnav_template.html`: A variation of the base layout that includes a sidebar.
-    - `org_template.html`: A variaton of the withnav_template
+    - `withnav_template.html`: A variation of org_template and settings_template that includes a sidebar.
   - **/components**: Houses reusable UI components that can be included in multiple templates and can be tailored with different content or links depending on the context.(more frequently revised or customized)
     - `head.html`: Template for the site's <head>, included in `base.html`.
     - `header.html`: Template for the site's header, included in `base.html`.
@@ -23,20 +22,15 @@ This document serves as a glossary for the templates directory structure of the
 ### Best Practices
 
 - Use **inheritance** `{% extends %}` to build on base layouts.
-- Employ **components** `{% include %}` for reusable UI elements to keep the code DRY and facilitate easier updates.
-
-### Observation Notes
-- The macro-options.json files in the header and footer component act as structural guides. They aren't directly used as data passed to the usaFooter function/macro. Instead, these files outline the expected properties and provide a description of their purpose. The `usaFooter` macro component is currently only invoked in the `admin_template`, which will eventually serve as the `base.html` template. This will simplify the approach when we change the footer macros to componenets by eliminating the need to dynamically pass this data from the base.html template. This is also true for `usaHeader` macro component.
-
-
+- Employ **components** `{% include %}` for reusable UI elements.
 
 ### Old Layout Templates We Don't Need
-- withoutnav_template.html Delete
-- main_template.html Delete
+- withoutnav_template.html Delete, it is now apart of base.html
+- main_template.html Delete, it is now apart of base.html
 - settings_templates.html `withnav_template` can be used to replace `settings_template`.
 - settings_nav.html (move to /components/ directory)
 - main_nav.html (move to /components/ directory)
 - service_navigation.html (move to /components/ directory)
-- org_template, could be under it's own directory called /layout/organization
+- org_template, Delete, it is now apart of withnav_template.html
 - org_nav.html (move to /components/ directory)
-- content_template.html Delete
+- content_template.html Delete, it is now apart of base.html
diff --git a/app/templates/admin_template.html b/app/templates/old/admin_template.html
similarity index 99%
rename from app/templates/admin_template.html
rename to app/templates/old/admin_template.html
index 921efdc5e4..75e6505cfe 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/old/admin_template.html
@@ -291,10 +291,12 @@ <h2 class="usa-modal__heading" id="sessionTimerHeading">
 
 {% block bodyEnd %}
   {% block extra_javascripts %}
+
   {% endblock %}
   <!--[if gt IE 8]><!-->
   <script type="text/javascript" src="{{ asset_url('javascripts/all.js') }}"></script>
   <script type="text/javascript" src="{{ asset_url('js/uswds.min.js') }}"></script>
+
   <!--<![endif]-->
 
 {% endblock %}
diff --git a/app/templates/content_template.html b/app/templates/old/content_template.html
similarity index 94%
rename from app/templates/content_template.html
rename to app/templates/old/content_template.html
index 34b488bb56..5f45027b32 100644
--- a/app/templates/content_template.html
+++ b/app/templates/old/content_template.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 {% from "components/page-header.html" import page_header %}
 
diff --git a/app/templates/main_template.html b/app/templates/old/main_template.html
similarity index 100%
rename from app/templates/main_template.html
rename to app/templates/old/main_template.html
diff --git a/app/templates/withoutnav_template.html b/app/templates/old/withoutnav_template.html
similarity index 94%
rename from app/templates/withoutnav_template.html
rename to app/templates/old/withoutnav_template.html
index d315890861..b6b77088ee 100644
--- a/app/templates/withoutnav_template.html
+++ b/app/templates/old/withoutnav_template.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
 
 {% set mainClasses = "margin-top-5 padding-bottom-5" %}
 
diff --git a/app/templates/org_template.html b/app/templates/org_template.html
index dd3fbee20f..5e04003fd4 100644
--- a/app/templates/org_template.html
+++ b/app/templates/org_template.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   {% block org_page_title %}{% endblock %} – {{ current_org.name }}
diff --git a/app/templates/settings_template.html b/app/templates/settings_template.html
index 8b086e9f7f..a42f043b00 100644
--- a/app/templates/settings_template.html
+++ b/app/templates/settings_template.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   {% block service_page_title %}{% endblock %} – {{ current_service.name }}
diff --git a/app/templates/views/accessibility_statement.html b/app/templates/views/accessibility_statement.html
index cbca9e59a4..4a82fa9ed4 100644
--- a/app/templates/views/accessibility_statement.html
+++ b/app/templates/views/accessibility_statement.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/service-link.html" import service_link %}
 {% from "components/content-metadata.html" import content_metadata %}
 
@@ -168,7 +168,7 @@ <h3 class="font-body-lg" id="status-page">
 
   <p>
     The following content on the <a class="usa-link" href="https://status.notifications.service.gov.uk/">Notify status page</a> is not compliant with the WCAG version 2.1 AA standard:
-  </p> 
+  </p>
 
   <ul class="usa-list">
     <li>an incorrect heading hierarchy which fails <a class="usa-link" href="https://www.w3.org/TR/WCAG21/#info-and-relationships">success criterion 1.3.1: info and relationships</a></li>
diff --git a/app/templates/views/add-service-local.html b/app/templates/views/add-service-local.html
index 8020378bea..aea83bb5bd 100644
--- a/app/templates/views/add-service-local.html
+++ b/app/templates/views/add-service-local.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html
index 340012dc9b..d0f4f98d9d 100644
--- a/app/templates/views/add-service.html
+++ b/app/templates/views/add-service.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
diff --git a/app/templates/views/cancelled-invitation.html b/app/templates/views/cancelled-invitation.html
index c6d2d50bba..92a01d7f93 100644
--- a/app/templates/views/cancelled-invitation.html
+++ b/app/templates/views/cancelled-invitation.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}The invitation you were sent has been cancelled{% endblock %}
 {% block maincolumn_content %}
     <div class="grid-row">
diff --git a/app/templates/views/change-email-continue.html b/app/templates/views/change-email-continue.html
index 353503e79c..31ff5c4b14 100644
--- a/app/templates/views/change-email-continue.html
+++ b/app/templates/views/change-email-continue.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Check your email
diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html
index 3351880531..0ac05ec153 100644
--- a/app/templates/views/choose-account.html
+++ b/app/templates/views/choose-account.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/components/button/macro.njk" import usaButton %}
 
 {% macro service_list(
diff --git a/app/templates/views/documentation.html b/app/templates/views/documentation.html
index f9afb3ee1d..a695b223ae 100644
--- a/app/templates/views/documentation.html
+++ b/app/templates/views/documentation.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Documentation
diff --git a/app/templates/views/email-link-interstitial.html b/app/templates/views/email-link-interstitial.html
index 1bf2f1a67d..900199fd82 100644
--- a/app/templates/views/email-link-interstitial.html
+++ b/app/templates/views/email-link-interstitial.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 
diff --git a/app/templates/views/email-link-invalid.html b/app/templates/views/email-link-invalid.html
index 45c140c501..b3afa1d028 100644
--- a/app/templates/views/email-link-invalid.html
+++ b/app/templates/views/email-link-invalid.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/email-not-received.html b/app/templates/views/email-not-received.html
index 998393de3b..8ad94d0432 100644
--- a/app/templates/views/email-not-received.html
+++ b/app/templates/views/email-not-received.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/components/button/macro.njk" import usaButton %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index a981b86e0a..bcf0609334 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 {% from "components/service-link.html" import service_link %}
diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 4050fe5a27..0acad292a0 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/service-link.html" import service_link %}
 
diff --git a/app/templates/views/forgot-password.html b/app/templates/views/forgot-password.html
index 61753041e4..52b8f317fa 100644
--- a/app/templates/views/forgot-password.html
+++ b/app/templates/views/forgot-password.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index e1da9961e9..b2a9fce86e 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 {% from "components/components/details/macro.njk" import usaDetails %}
diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/guidance/create-and-send-messages.html
index 68ecae86da..3e89ffc509 100644
--- a/app/templates/views/guidance/create-and-send-messages.html
+++ b/app/templates/views/guidance/create-and-send-messages.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/service-link.html" import service_link %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 5c03d2f8e3..7b1cab01c9 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/service-link.html" import service_link %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 5a4238fea5..e212adfe5a 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 {% from "components/service-link.html" import service_link %}
diff --git a/app/templates/views/guidance/send-files-by-email.html b/app/templates/views/guidance/send-files-by-email.html
index 432ef74bfb..2bac769d82 100644
--- a/app/templates/views/guidance/send-files-by-email.html
+++ b/app/templates/views/guidance/send-files-by-email.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Send files by email
diff --git a/app/templates/views/integration-testing.html b/app/templates/views/integration-testing.html
index 209becda1f..cae2447513 100644
--- a/app/templates/views/integration-testing.html
+++ b/app/templates/views/integration-testing.html
@@ -1,5 +1,5 @@
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Integration testing
diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index 79ea960feb..089a29f491 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/new-password.html b/app/templates/views/new-password.html
index d4ba9c9967..89c66fdff3 100644
--- a/app/templates/views/new-password.html
+++ b/app/templates/views/new-password.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/organizations/add-organization.html b/app/templates/views/organizations/add-organization.html
index 9c8d19030e..aca6d15cc1 100644
--- a/app/templates/views/organizations/add-organization.html
+++ b/app/templates/views/organizations/add-organization.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
diff --git a/app/templates/views/password-reset-sent.html b/app/templates/views/password-reset-sent.html
index bc7fbb481f..9ae970b9a4 100644
--- a/app/templates/views/password-reset-sent.html
+++ b/app/templates/views/password-reset-sent.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
 Check your email
diff --git a/app/templates/views/performance.html b/app/templates/views/performance.html
index 0385524f66..f57d98311e 100644
--- a/app/templates/views/performance.html
+++ b/app/templates/views/performance.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/big-number.html" import big_number %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/table.html" import field, list_table %}
diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html
index 99d788dda9..4812655c0d 100644
--- a/app/templates/views/platform-admin/_base_template.html
+++ b/app/templates/views/platform-admin/_base_template.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block main %}
diff --git a/app/templates/views/pricing/billing-details-signed-out.html b/app/templates/views/pricing/billing-details-signed-out.html
index 018e91d3d9..a76a0fded5 100644
--- a/app/templates/views/pricing/billing-details-signed-out.html
+++ b/app/templates/views/pricing/billing-details-signed-out.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/pricing/billing-details.html b/app/templates/views/pricing/billing-details.html
index d5eb2a6d7c..330a6adabe 100644
--- a/app/templates/views/pricing/billing-details.html
+++ b/app/templates/views/pricing/billing-details.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 
 {% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
diff --git a/app/templates/views/pricing/how-to-pay.html b/app/templates/views/pricing/how-to-pay.html
index 6e62647bf2..4cc5d3746a 100644
--- a/app/templates/views/pricing/how-to-pay.html
+++ b/app/templates/views/pricing/how-to-pay.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html
index 7f1e073493..f53a43eeb9 100644
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -3,7 +3,7 @@
 {% from "components/live-search.html" import live_search %}
 {% from "components/components/details/macro.njk" import usaDetails %}
 
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
 Message parts
diff --git a/app/templates/views/privacy.html b/app/templates/views/privacy.html
index b1692aef32..21d9a2343c 100644
--- a/app/templates/views/privacy.html
+++ b/app/templates/views/privacy.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/content-metadata.html" import content_metadata %}
 
 {% block per_page_title %}
@@ -61,7 +61,7 @@ <h2 class="font-body-lg" id="where-your-data-is-processed">Where your data is pr
       processed and when it’s stored.</p>
 
     <!-- <p>Your personal data will be processed both in the UK and the European Economic Area (EEA). Your data receives the same level of protection in the EEA as it does in the UK through the safeguard of <a class="usa-link" href="https://ico.org.uk/for-organizations/dp-at-the-end-of-the-transition-period/data-protection-and-the-eu-in-detail/adequacy/">Adequacy Decisions</a>.</p> -->
-   
+
     <h2 class="font-body-lg" id="how-we-protect-your-data">How we protect your data and keep it secure</h2>
 
     <p>We are committed to doing all that we can to keep your data secure. To prevent unauthorized access or disclosure we have put in place technical and organizational procedures to secure the data we collect about you – for example, we protect your
@@ -70,7 +70,7 @@ <h2 class="font-body-lg" id="how-we-protect-your-data">How we protect your data
 
     <!-- <h2 class="font-body-lg" id="childrens-privacy-protection">Children’s privacy protection</h2>
 
-    <p>We understand the importance of protecting children’s privacy online. Our services are not designed for, or intentionally targeted at, children 13 years of age or younger. It is not our policy to intentionally collect or maintain data about anyone under the age of 13.</p> 
+    <p>We understand the importance of protecting children’s privacy online. Our services are not designed for, or intentionally targeted at, children 13 years of age or younger. It is not our policy to intentionally collect or maintain data about anyone under the age of 13.</p>
 
     <h2 class="font-body-lg" id="your-rights">What are your rights</h2>
 
diff --git a/app/templates/views/re-validate-email-sent.html b/app/templates/views/re-validate-email-sent.html
index d4007f5332..e5456653f0 100644
--- a/app/templates/views/re-validate-email-sent.html
+++ b/app/templates/views/re-validate-email-sent.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html
index 589d30b947..bc2c78c9a0 100644
--- a/app/templates/views/register-from-invite.html
+++ b/app/templates/views/register-from-invite.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/register-from-org-invite.html b/app/templates/views/register-from-org-invite.html
index eaf60e77cd..8960bb275f 100644
--- a/app/templates/views/register-from-org-invite.html
+++ b/app/templates/views/register-from-org-invite.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/register.html b/app/templates/views/register.html
index a7d36fa634..09356cbfe8 100644
--- a/app/templates/views/register.html
+++ b/app/templates/views/register.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/registration-continue.html b/app/templates/views/registration-continue.html
index fb381508c6..a51d61f8c5 100644
--- a/app/templates/views/registration-continue.html
+++ b/app/templates/views/registration-continue.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Check your email
diff --git a/app/templates/views/resend-email-verification.html b/app/templates/views/resend-email-verification.html
index e9b905dd44..0d1803b6c4 100644
--- a/app/templates/views/resend-email-verification.html
+++ b/app/templates/views/resend-email-verification.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html
index 58c9ad4d1d..97f982e12f 100644
--- a/app/templates/views/roadmap.html
+++ b/app/templates/views/roadmap.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/content-metadata.html" import content_metadata %}
 
diff --git a/app/templates/views/security.html b/app/templates/views/security.html
index eeb13bf517..e6a436228a 100644
--- a/app/templates/views/security.html
+++ b/app/templates/views/security.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/set-up-your-profile.html b/app/templates/views/set-up-your-profile.html
index e774a921f4..e131aff2fc 100644
--- a/app/templates/views/set-up-your-profile.html
+++ b/app/templates/views/set-up-your-profile.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/select/macro.njk" import usaSelect -%}
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 96ecb526d6..a2aa554f0a 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
 {% from "components/components/button/macro.njk" import usaButton %}
 
 {% block meta %}
diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html
index cfd26cfa1e..f3b3006d7c 100644
--- a/app/templates/views/signin.html
+++ b/app/templates/views/signin.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html
index dd5ad9c104..7dc86adeb0 100644
--- a/app/templates/views/support/index.html
+++ b/app/templates/views/support/index.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html
index 1f0a54c52d..899edc013c 100644
--- a/app/templates/views/terms-of-use.html
+++ b/app/templates/views/terms-of-use.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/banner.html" import banner_wrapper %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/text-not-received.html b/app/templates/views/text-not-received.html
index 3032bfe59f..0e239323eb 100644
--- a/app/templates/views/text-not-received.html
+++ b/app/templates/views/text-not-received.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html
index e1f377c6f3..7ca6d2b973 100644
--- a/app/templates/views/trial-mode.html
+++ b/app/templates/views/trial-mode.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Trial mode
diff --git a/app/templates/views/two-factor-email.html b/app/templates/views/two-factor-email.html
index 459351f4bf..b8b3027af1 100644
--- a/app/templates/views/two-factor-email.html
+++ b/app/templates/views/two-factor-email.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/two-factor-sms.html b/app/templates/views/two-factor-sms.html
index 034c666168..6ce94cbf80 100644
--- a/app/templates/views/two-factor-sms.html
+++ b/app/templates/views/two-factor-sms.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
diff --git a/app/templates/views/two-factor-webauthn.html b/app/templates/views/two-factor-webauthn.html
index 541b6cceef..09b64bf8d1 100644
--- a/app/templates/views/two-factor-webauthn.html
+++ b/app/templates/views/two-factor-webauthn.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/components/button/macro.njk" import usaButton %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
diff --git a/app/templates/views/user-profile/authenticate.html b/app/templates/views/user-profile/authenticate.html
index b8dbbce0f6..c0b2ba7e97 100644
--- a/app/templates/views/user-profile/authenticate.html
+++ b/app/templates/views/user-profile/authenticate.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
diff --git a/app/templates/views/user-profile/change-password.html b/app/templates/views/user-profile/change-password.html
index 2efb70f739..8e1851dcd3 100644
--- a/app/templates/views/user-profile/change-password.html
+++ b/app/templates/views/user-profile/change-password.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
diff --git a/app/templates/views/user-profile/change.html b/app/templates/views/user-profile/change.html
index d9dce7cbce..eec0ee2b8e 100644
--- a/app/templates/views/user-profile/change.html
+++ b/app/templates/views/user-profile/change.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
diff --git a/app/templates/views/user-profile/confirm.html b/app/templates/views/user-profile/confirm.html
index 16fbfbd388..d63ab78035 100644
--- a/app/templates/views/user-profile/confirm.html
+++ b/app/templates/views/user-profile/confirm.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
diff --git a/app/templates/views/user-profile/disable-platform-admin-view.html b/app/templates/views/user-profile/disable-platform-admin-view.html
index ff66589ea6..f9038461db 100644
--- a/app/templates/views/user-profile/disable-platform-admin-view.html
+++ b/app/templates/views/user-profile/disable-platform-admin-view.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
diff --git a/app/templates/views/user-profile/manage-security-key.html b/app/templates/views/user-profile/manage-security-key.html
index 41e3ba8d59..5026ce4513 100644
--- a/app/templates/views/user-profile/manage-security-key.html
+++ b/app/templates/views/user-profile/manage-security-key.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
diff --git a/app/templates/views/user-profile/security-keys.html b/app/templates/views/user-profile/security-keys.html
index a2afd135a0..873ec681f0 100644
--- a/app/templates/views/user-profile/security-keys.html
+++ b/app/templates/views/user-profile/security-keys.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/components/button/macro.njk" import usaButton %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html
index 3b11fa2710..0679229e78 100644
--- a/app/templates/views/using-notify.html
+++ b/app/templates/views/using-notify.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
diff --git a/app/templates/views/verification-not-received.html b/app/templates/views/verification-not-received.html
index 906ee4dab0..b0e01cbe5d 100644
--- a/app/templates/views/verification-not-received.html
+++ b/app/templates/views/verification-not-received.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/components/button/macro.njk" import usaButton %}
 
 {% block per_page_title %}
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index 40d2e10f16..3b6ebfbf28 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -1,4 +1,4 @@
-{% extends "admin_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   {% block service_page_title %}{% endblock %} – {{ current_service.name }}
diff --git a/app/utils/__init__.py b/app/utils/__init__.py
index cb0da0723a..6e9c8aa889 100644
--- a/app/utils/__init__.py
+++ b/app/utils/__init__.py
@@ -3,11 +3,12 @@
 
 from flask import abort, g, make_response, request
 from flask_login import current_user
-from notifications_utils.field import Field
 from ordered_set import OrderedSet
 from werkzeug.datastructures import MultiDict
 from werkzeug.routing import RequestRedirect
 
+from notifications_utils.field import Field
+
 SENDING_STATUSES = ["created", "pending", "sending"]
 DELIVERED_STATUSES = ["delivered", "sent"]
 FAILURE_STATUSES = [
diff --git a/app/utils/csv.py b/app/utils/csv.py
index e6119b073a..c3c27ec18f 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -2,10 +2,10 @@
 
 import pytz
 from flask_login import current_user
-from notifications_utils.recipients import RecipientCSV
 
 from app.models.spreadsheet import Spreadsheet
 from app.utils.templates import get_sample_template
+from notifications_utils.recipients import RecipientCSV
 
 
 def get_errors_for_csv(recipients, template_type):
diff --git a/deploy-config/demo.yml b/deploy-config/demo.yml
index 1b53947f7b..a003a32ea5 100644
--- a/deploy-config/demo.yml
+++ b/deploy-config/demo.yml
@@ -2,6 +2,7 @@ env: demo
 instances: 1
 memory: 1G
 public_admin_route: notify-demo.app.cloud.gov
+cloud_dot_gov_route: notify-demo.app.cloud.gov
 redis_enabled: 1
 nr_agent_id: "1134302465"
 nr_app_id: "1083160688"
diff --git a/deploy-config/production.yml b/deploy-config/production.yml
index 943d01c0b8..18b5cfdcc6 100644
--- a/deploy-config/production.yml
+++ b/deploy-config/production.yml
@@ -1,7 +1,8 @@
 env: production
 instances: 2
 memory: 1G
-public_admin_route: notify.app.cloud.gov
+public_admin_route: beta.notify.gov
+cloud_dot_gov_route: notify.app.cloud.gov
 redis_enabled: 1
 nr_agent_id: "1050708682"
 nr_app_id: "1050708682"
diff --git a/deploy-config/sandbox.yml b/deploy-config/sandbox.yml
index c405633b70..71b51dbd68 100644
--- a/deploy-config/sandbox.yml
+++ b/deploy-config/sandbox.yml
@@ -2,6 +2,7 @@ env: sandbox
 instances: 1
 memory: 1G
 public_admin_route: notify-sandbox.app.cloud.gov
+cloud_dot_gov_route: notify-sandbox.app.cloud.gov
 redis_enabled: 1
 ADMIN_CLIENT_USERNAME: notify-admin
 ADMIN_CLIENT_SECRET: sandbox-notify-secret-key
diff --git a/deploy-config/staging.yml b/deploy-config/staging.yml
index 2426d4930e..f16669da21 100644
--- a/deploy-config/staging.yml
+++ b/deploy-config/staging.yml
@@ -2,6 +2,7 @@ env: staging
 instances: 1
 memory: 1G
 public_admin_route: notify-staging.app.cloud.gov
+cloud_dot_gov_route: notify-staging.app.cloud.gov
 redis_enabled: 1
 nr_agent_id: "1134291385"
 nr_app_id: "1031640326"
diff --git a/docs/api-research-allowance-count-down.md b/docs/api-research-allowance-count-down.md
new file mode 100644
index 0000000000..ae8e95752a
--- /dev/null
+++ b/docs/api-research-allowance-count-down.md
@@ -0,0 +1,28 @@
+# What's currently available in the API?
+
+* Models
+  * `AnnualBilling` has `free_sms_fragment_limit`
+  * `FactBilling` has `billable_units`, `rate`, `rate_multiplier`
+  * `FactNotificationStatus` has `notification_count`
+  * `Service` has `message_limit`, `total_message_limit`, `volume_sms`
+  * `FactProcessingTime` has `messages_total`, `messages_within_10_secs`
+* Routes
+  * The billing `monthly-usage` and `yearly_usage_summary` routes have some pieces of data, from the above models: `chargable_units`, `notifications_sent`, `rate`, `cost`, `free_allowance_used`, and `charged_units`
+  * The performance dashboard has `total_notifications`, `sms_notifications`, `notifications_by_type`, and `live_service_count`
+  * The platform statistics `volumes-by-service` has `sms_notifications`, `free_allowance`, `sms_chargeable_units`
+
+# What might we be able to consolidate or clean up?
+
+Without knowing exactly what we are actually using in the system, I am not certain. From my reading of everything, it looks relatively good as it stands - Other than the obvious eventual removal of email statistics from the system.
+
+# What might we need to do/create?
+
+I believe a new endpoint for the allowance countdown makes the most sense. Something that can provide the data needed for the component. It looks like we might have the information we need contained in the models I have identified above, but it might need some aggregation of data to get the numbers we need.
+
+# What work might already be in flight and incomplete/not reviewed yet?
+
+There doesn't appear to be any other work in flight for this project.
+
+# What is an estimated level of effort for each feature based on previous questions?
+
+The main thing would be making the new endpoint. I believe there already is the data needed for it, just it might need some determination as to how to approach the math to get the numbers we need exactly from the models we already have. But, this seems fairly straight-forward, and I believe would be probably a fib. scale of 3, based on what I've seen.
diff --git a/gulpfile.js b/gulpfile.js
index 79f9760352..98afbbacf5 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -125,6 +125,7 @@ const javascripts = () => {
     paths.src + 'javascripts/date.js',
     paths.src + 'javascripts/loginAlert.js',
     paths.src + 'javascripts/main.js',
+    paths.src + 'javascripts/chartDashboard.js',
   ])
     .pipe(plugins.prettyerror())
     .pipe(plugins.babel({
diff --git a/manifest.yml b/manifest.yml
index f3dcced9ed..ed596ffeb7 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -9,7 +9,7 @@ applications:
     health-check-type: port
     health-check-invocation-timeout: 10
     routes:
-      - route: ((public_admin_route))
+      - route: ((cloud_dot_gov_route))
 
     services:
       - notify-admin-redis-((env))
diff --git a/notifications_utils/__init__.py b/notifications_utils/__init__.py
new file mode 100644
index 0000000000..84a55d644e
--- /dev/null
+++ b/notifications_utils/__init__.py
@@ -0,0 +1,25 @@
+import re
+
+SMS_CHAR_COUNT_LIMIT = 918  # 153 * 6, no network issues but check with providers before upping this further
+LETTER_MAX_PAGE_COUNT = 10
+DAILY_MESSAGE_LIMIT = 10000
+
+# regexes for use in recipients.validate_email_address.
+# Valid characters taken from https://en.wikipedia.org/wiki/Email_address#Local-part
+# Note: Normal apostrophe eg `Firstname-o'surname@domain.com` is allowed.
+# hostname_part regex: xn in regex signifies possible punycode conversions, which would start `xn--`;
+# the hyphens are matched for later in the regex.
+hostname_part = re.compile(r"^(xn|[a-z0-9]+)(-?-[a-z0-9]+)*$", re.IGNORECASE)
+tld_part = re.compile(r"^([a-z]{2,63}|xn--([a-z0-9]+-)*[a-z0-9]+)$", re.IGNORECASE)
+VALID_LOCAL_CHARS = r"a-zA-Z0-9.!#$%&'*+/=?^_`{|}~\-"
+EMAIL_REGEX_PATTERN = r"^[{}]+@([^.@][^@\s]+)$".format(VALID_LOCAL_CHARS)
+email_with_smart_quotes_regex = re.compile(
+    # matches wider than an email - everything between an at sign and the nearest whitespace
+    r"(^|\s)\S+@\S+(\s|$)",
+    flags=re.MULTILINE,
+)
+
+# The magic sequence is a ‘unique’ series of characters which we temporarily insert
+# and then later remove when performing tricky formatting operations
+MAGIC_SEQUENCE = "🇬🇧🐦✉️"
+magic_sequence_regex = re.compile(MAGIC_SEQUENCE)
diff --git a/notifications_utils/base64_uuid.py b/notifications_utils/base64_uuid.py
new file mode 100644
index 0000000000..9721bf2ec2
--- /dev/null
+++ b/notifications_utils/base64_uuid.py
@@ -0,0 +1,22 @@
+from base64 import urlsafe_b64decode, urlsafe_b64encode
+from uuid import UUID
+
+
+def base64_to_bytes(key):
+    return urlsafe_b64decode(key + "==")
+
+
+def bytes_to_base64(bytes):
+    # remove trailing = to save precious bytes
+    return urlsafe_b64encode(bytes).decode("ascii").rstrip("=")
+
+
+def base64_to_uuid(value):
+    # uuids are 16 bytes, and will always have two ==s of padding
+    return UUID(bytes=urlsafe_b64decode(value.encode("ascii") + b"=="))
+
+
+def uuid_to_base64(value):
+    if not isinstance(value, UUID):
+        value = UUID(value)
+    return bytes_to_base64(value.bytes)
diff --git a/notifications_utils/clients/__init__.py b/notifications_utils/clients/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/notifications_utils/clients/antivirus/__init__.py b/notifications_utils/clients/antivirus/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/notifications_utils/clients/antivirus/antivirus_client.py b/notifications_utils/clients/antivirus/antivirus_client.py
new file mode 100644
index 0000000000..affe8f27ed
--- /dev/null
+++ b/notifications_utils/clients/antivirus/antivirus_client.py
@@ -0,0 +1,55 @@
+import requests
+from flask import current_app
+
+
+class AntivirusError(Exception):
+    def __init__(self, message=None, status_code=None):
+        self.message = message
+        self.status_code = status_code
+
+    @classmethod
+    def from_exception(cls, e):
+        try:
+            message = e.response.json()["error"]
+            status_code = e.response.status_code
+        except (TypeError, ValueError, AttributeError, KeyError):
+            message = "connection error"
+            status_code = 503
+
+        return cls(message, status_code)
+
+
+class AntivirusClient:
+    def __init__(self, api_host=None, auth_token=None):
+        self.api_host = api_host
+        self.auth_token = auth_token
+
+    def init_app(self, app):
+        self.api_host = app.config["ANTIVIRUS_API_HOST"]
+        self.auth_token = app.config["ANTIVIRUS_API_KEY"]
+
+    def scan(self, document_stream):
+        try:
+            response = requests.post(
+                "{}/scan".format(self.api_host),
+                headers={
+                    "Authorization": "Bearer {}".format(self.auth_token),
+                },
+                files={"document": document_stream},
+            )
+
+            response.raise_for_status()
+
+        except requests.RequestException as e:
+            error = AntivirusError.from_exception(e)
+            current_app.logger.warning(
+                "Notify Antivirus API request failed with error: {}".format(
+                    error.message
+                )
+            )
+
+            raise error
+        finally:
+            document_stream.seek(0)
+
+        return response.json()["ok"]
diff --git a/notifications_utils/clients/encryption/__init__.py b/notifications_utils/clients/encryption/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/notifications_utils/clients/encryption/encryption_client.py b/notifications_utils/clients/encryption/encryption_client.py
new file mode 100644
index 0000000000..cf52832084
--- /dev/null
+++ b/notifications_utils/clients/encryption/encryption_client.py
@@ -0,0 +1,86 @@
+from base64 import urlsafe_b64encode
+from json import dumps, loads
+
+from cryptography.fernet import Fernet, InvalidToken
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
+from itsdangerous import BadSignature, URLSafeSerializer
+
+
+class EncryptionError(Exception):
+    pass
+
+
+class SaltLengthError(Exception):
+    pass
+
+
+class Encryption:
+    def init_app(self, app):
+        self._serializer = URLSafeSerializer(app.config.get("SECRET_KEY"))
+        self._salt = app.config.get("DANGEROUS_SALT")
+        self._password = app.config.get("SECRET_KEY").encode()
+
+        try:
+            self._shared_encryptor = Fernet(self._derive_key(self._salt))
+        except SaltLengthError as reason:
+            raise EncryptionError(
+                "DANGEROUS_SALT must be at least 16 bytes"
+            ) from reason
+
+    def encrypt(self, thing_to_encrypt, salt=None):
+        """Encrypt a string or object
+
+        thing_to_encrypt must be serializable as JSON
+        Returns a UTF-8 string
+        """
+        serialized_bytes = dumps(thing_to_encrypt).encode("utf-8")
+        encrypted_bytes = self._encryptor(salt).encrypt(serialized_bytes)
+        return encrypted_bytes.decode("utf-8")
+
+    def decrypt(self, thing_to_decrypt, salt=None):
+        """Decrypt a UTF-8 string or bytes.
+
+        Once decrypted, thing_to_decrypt must be deserializable from JSON.
+        """
+        try:
+            return loads(self._encryptor(salt).decrypt(thing_to_decrypt))
+        except InvalidToken as reason:
+            raise EncryptionError from reason
+
+    def sign(self, thing_to_sign, salt=None):
+        return self._serializer.dumps(thing_to_sign, salt=(salt or self._salt))
+
+    def verify_signature(self, thing_to_verify, salt=None):
+        try:
+            return self._serializer.loads(thing_to_verify, salt=(salt or self._salt))
+        except BadSignature as reason:
+            raise EncryptionError from reason
+
+    def _encryptor(self, salt=None):
+        if salt is None:
+            return self._shared_encryptor
+        else:
+            try:
+                return Fernet(self._derive_key(salt))
+            except SaltLengthError as reason:
+                raise EncryptionError(
+                    "Custom salt value must be at least 16 bytes"
+                ) from reason
+
+    def _derive_key(self, salt):
+        """Derive a key suitable for use within Fernet from the SECRET_KEY and salt
+
+        * For the salt to be secure, it must be 16 bytes or longer and randomly generated.
+        * 600_000 was chosen for the iterations because it is what OWASP recommends as
+        *  of [February 2023](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#pbkdf2)
+        * For more information, see https://cryptography.io/en/latest/hazmat/primitives/key-derivation-functions/#pbkdf2
+        * and https://cryptography.io/en/latest/fernet/#using-passwords-with-fernet
+        """
+        salt_bytes = salt.encode()
+        if len(salt_bytes) < 16:
+            raise SaltLengthError
+        kdf = PBKDF2HMAC(
+            algorithm=hashes.SHA256(), length=32, salt=salt_bytes, iterations=600_000
+        )
+        return urlsafe_b64encode(kdf.derive(self._password))
diff --git a/notifications_utils/clients/redis/__init__.py b/notifications_utils/clients/redis/__init__.py
new file mode 100644
index 0000000000..93a77d561f
--- /dev/null
+++ b/notifications_utils/clients/redis/__init__.py
@@ -0,0 +1,13 @@
+from datetime import datetime
+
+from .request_cache import RequestCache  # noqa: F401 (unused import)
+
+
+def total_limit_cache_key(service_id):
+    return "{}-{}-{}".format(
+        str(service_id), datetime.utcnow().strftime("%Y-%m-%d"), "total-count"
+    )
+
+
+def rate_limit_cache_key(service_id, api_key_type):
+    return "{}-{}".format(str(service_id), api_key_type)
diff --git a/notifications_utils/clients/redis/redis_client.py b/notifications_utils/clients/redis/redis_client.py
new file mode 100644
index 0000000000..6e81d85bfb
--- /dev/null
+++ b/notifications_utils/clients/redis/redis_client.py
@@ -0,0 +1,184 @@
+import numbers
+import uuid
+from time import time
+
+from flask import current_app
+from flask_redis import FlaskRedis
+
+
+def prepare_value(val):
+    """
+    Only bytes, strings and numbers (ints, longs and floats) are acceptable
+    for keys and values. Previously redis-py attempted to cast other types
+    to str() and store the result. This caused must confusion and frustration
+    when passing boolean values (cast to 'True' and 'False') or None values
+    (cast to 'None'). It is now the user's responsibility to cast all
+    key names and values to bytes, strings or numbers before passing the
+    value to redis-py.
+    """
+    # things redis-py natively supports
+    if isinstance(
+        val,
+        (
+            bytes,
+            str,
+            numbers.Number,
+        ),
+    ):
+        return val
+    # things we know we can safely cast to string
+    elif isinstance(val, (uuid.UUID,)):
+        return str(val)
+    else:
+        raise ValueError("cannot cast {} to a string".format(type(val)))
+
+
+class RedisClient:
+    redis_store = FlaskRedis()
+    active = False
+    scripts = {}
+
+    def init_app(self, app):
+        self.active = app.config.get("REDIS_ENABLED")
+        if self.active:
+            self.redis_store.init_app(app)
+
+            self.register_scripts()
+
+    def register_scripts(self):
+        # delete keys matching a pattern supplied as a parameter. Does so in batches of 5000 to prevent unpack from
+        # exceeding lua's stack limit, and also to prevent errors if no keys match the pattern.
+        # Inspired by https://gist.github.com/ddre54/0a4751676272e0da8186
+        self.scripts["delete-keys-by-pattern"] = self.redis_store.register_script(
+            """
+            local keys = redis.call('keys', ARGV[1])
+            local deleted = 0
+            for i=1, #keys, 5000 do
+                deleted = deleted + redis.call('del', unpack(keys, i, math.min(i + 4999, #keys)))
+            end
+            return deleted
+            """
+        )
+
+    def delete_by_pattern(self, pattern, raise_exception=False):
+        r"""
+        Deletes all keys matching a given pattern, and returns how many keys were deleted.
+        Pattern is defined as in the KEYS command: https://redis.io/commands/keys
+
+        * h?llo matches hello, hallo and hxllo
+        * h*llo matches hllo and heeeello
+        * h[ae]llo matches hello and hallo, but not hillo
+        * h[^e]llo matches hallo, hbllo, ... but not hello
+        * h[a-b]llo matches hallo and hbllo
+
+        Use \ to escape special characters if you want to match them verbatim
+        """
+        if self.active:
+            try:
+                return self.scripts["delete-keys-by-pattern"](args=[pattern])
+            except Exception as e:
+                self.__handle_exception(
+                    e, raise_exception, "delete-by-pattern", pattern
+                )
+
+        return 0
+
+    def exceeded_rate_limit(self, cache_key, limit, interval, raise_exception=False):
+        """
+        Rate limiting.
+        - Uses Redis sorted sets
+        - Also uses redis "multi" which is abstracted into pipeline() by FlaskRedis/PyRedis
+        - Sends all commands to redis as a group to be executed atomically
+
+        Method:
+        (1) Add event, scored by timestamp (zadd). The score determines order in set.
+        (2) Use zremrangebyscore to delete all set members with a score between
+            - Earliest entry (lowest score == earliest timestamp) - represented as '-inf'
+                and
+            - Current timestamp minus the interval
+            - Leaves only relevant entries in the set (those between now and now - interval)
+        (3) Count the set
+        (4) If count > limit fail request
+        (5) Ensure we expire the set key to preserve space
+
+        Notes:
+        - Failed requests count. If over the limit and keep making requests you'll stay over the limit.
+        - The actual value in the set is just the timestamp, the same as the score. We don't store any requets details.
+        - return value of pipe.execute() is an array containing the outcome of each call.
+            - result[2] == outcome of pipe.zcard()
+        - If redis is inactive, or we get an exception, allow the request
+
+        :param cache_key:
+        :param limit: Number of requests permitted within interval
+        :param interval: Interval we measure requests in
+        :param raise_exception: Should throw exception
+        :return:
+        """
+        cache_key = prepare_value(cache_key)
+        if self.active:
+            try:
+                pipe = self.redis_store.pipeline()
+                when = time()
+                pipe.zadd(cache_key, {when: when})
+                pipe.zremrangebyscore(cache_key, "-inf", when - interval)
+                pipe.zcard(cache_key)
+                pipe.expire(cache_key, interval)
+                result = pipe.execute()
+                return result[2] > limit
+            except Exception as e:
+                self.__handle_exception(
+                    e, raise_exception, "rate-limit-pipeline", cache_key
+                )
+                return False
+        else:
+            return False
+
+    def raw_set(self, key, value, ex=None, px=None, nx=False, xx=False):
+        self.redis_store.set(key, value, ex, px, nx, xx)
+
+    def set(
+        self, key, value, ex=None, px=None, nx=False, xx=False, raise_exception=False
+    ):
+        key = prepare_value(key)
+        value = prepare_value(value)
+        if self.active:
+            try:
+                self.redis_store.set(key, value, ex, px, nx, xx)
+            except Exception as e:
+                self.__handle_exception(e, raise_exception, "set", key)
+
+    def incr(self, key, raise_exception=False):
+        key = prepare_value(key)
+        if self.active:
+            try:
+                return self.redis_store.incr(key)
+            except Exception as e:
+                self.__handle_exception(e, raise_exception, "incr", key)
+
+    def raw_get(self, key):
+        return self.redis_store.get(key)
+
+    def get(self, key, raise_exception=False):
+        key = prepare_value(key)
+        if self.active:
+            try:
+                return self.redis_store.get(key)
+            except Exception as e:
+                self.__handle_exception(e, raise_exception, "get", key)
+
+        return None
+
+    def delete(self, *keys, raise_exception=False):
+        keys = [prepare_value(k) for k in keys]
+        if self.active:
+            try:
+                self.redis_store.delete(*keys)
+            except Exception as e:
+                self.__handle_exception(e, raise_exception, "delete", ", ".join(keys))
+
+    def __handle_exception(self, e, raise_exception, operation, key_name):
+        current_app.logger.exception(
+            "Redis error performing {} on {}".format(operation, key_name)
+        )
+        if raise_exception:
+            raise e
diff --git a/notifications_utils/clients/redis/request_cache.py b/notifications_utils/clients/redis/request_cache.py
new file mode 100644
index 0000000000..edb45c98e2
--- /dev/null
+++ b/notifications_utils/clients/redis/request_cache.py
@@ -0,0 +1,95 @@
+import json
+from contextlib import suppress
+from datetime import timedelta
+from functools import wraps
+from inspect import signature
+
+
+class RequestCache:
+    DEFAULT_TTL = int(timedelta(days=7).total_seconds())
+
+    def __init__(self, redis_client):
+        self.redis_client = redis_client
+
+    @staticmethod
+    def _get_argument(argument_name, client_method, args, kwargs):
+        with suppress(KeyError):
+            return kwargs[argument_name]
+
+        with suppress(ValueError, IndexError):
+            argument_index = list(signature(client_method).parameters).index(
+                argument_name
+            )
+            return args[argument_index]
+
+        with suppress(KeyError):
+            return signature(client_method).parameters[argument_name].default
+
+        raise TypeError(
+            "{}() takes no argument called '{}'".format(
+                client_method.__name__, argument_name
+            )
+        )
+
+    @staticmethod
+    def _make_key(key_format, client_method, args, kwargs):
+        return key_format.format(
+            **{
+                argument_name: RequestCache._get_argument(
+                    argument_name, client_method, args, kwargs
+                )
+                for argument_name in list(signature(client_method).parameters)
+            }
+        )
+
+    def set(self, key_format, *, ttl_in_seconds=DEFAULT_TTL):
+        def _set(client_method):
+            @wraps(client_method)
+            def new_client_method(*args, **kwargs):
+                redis_key = RequestCache._make_key(
+                    key_format, client_method, args, kwargs
+                )
+                cached = self.redis_client.get(redis_key)
+                if cached:
+                    return json.loads(cached.decode("utf-8"))
+                api_response = client_method(*args, **kwargs)
+                self.redis_client.set(
+                    redis_key,
+                    json.dumps(api_response),
+                    ex=int(ttl_in_seconds),
+                )
+                return api_response
+
+            return new_client_method
+
+        return _set
+
+    def delete(self, key_format):
+        def _delete(client_method):
+            @wraps(client_method)
+            def new_client_method(*args, **kwargs):
+                try:
+                    api_response = client_method(*args, **kwargs)
+                finally:
+                    redis_key = self._make_key(key_format, client_method, args, kwargs)
+                    self.redis_client.delete(redis_key)
+                return api_response
+
+            return new_client_method
+
+        return _delete
+
+    def delete_by_pattern(self, key_format):
+        def _delete(client_method):
+            @wraps(client_method)
+            def new_client_method(*args, **kwargs):
+                try:
+                    api_response = client_method(*args, **kwargs)
+                finally:
+                    redis_key = self._make_key(key_format, client_method, args, kwargs)
+                    self.redis_client.delete_by_pattern(redis_key)
+                return api_response
+
+            return new_client_method
+
+        return _delete
diff --git a/notifications_utils/clients/zendesk/__init__.py b/notifications_utils/clients/zendesk/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/notifications_utils/clients/zendesk/zendesk_client.py b/notifications_utils/clients/zendesk/zendesk_client.py
new file mode 100644
index 0000000000..c5c2c5d029
--- /dev/null
+++ b/notifications_utils/clients/zendesk/zendesk_client.py
@@ -0,0 +1,150 @@
+import requests
+from flask import current_app
+
+
+class ZendeskError(Exception):
+    def __init__(self, response):
+        self.response = response
+
+
+class ZendeskClient:
+    # the account used to authenticate with. If no requester is provided, the ticket will come from this account.
+    NOTIFY_ZENDESK_EMAIL = "zd-api-notify@digital.cabinet-office.gov.uk"
+
+    ZENDESK_TICKET_URL = "https://govuk.zendesk.com/api/v2/tickets.json"
+
+    def __init__(self):
+        self.api_key = None
+
+    def init_app(self, app, *args, **kwargs):
+        self.api_key = app.config.get("ZENDESK_API_KEY")
+
+    def send_ticket_to_zendesk(self, ticket):
+        response = requests.post(
+            self.ZENDESK_TICKET_URL,
+            json=ticket.request_data,
+            auth=(f"{self.NOTIFY_ZENDESK_EMAIL}/token", self.api_key),
+        )
+
+        if response.status_code != 201:
+            current_app.logger.error(
+                f"Zendesk create ticket request failed with {response.status_code} '{response.json()}'"
+            )
+            raise ZendeskError(response)
+
+        ticket_id = response.json()["ticket"]["id"]
+
+        current_app.logger.info(f"Zendesk create ticket {ticket_id} succeeded")
+
+
+class NotifySupportTicket:
+    PRIORITY_URGENT = "urgent"
+    PRIORITY_HIGH = "high"
+    PRIORITY_NORMAL = "normal"
+    PRIORITY_LOW = "low"
+
+    TAGS_P2 = "govuk_notify_support"
+    TAGS_P1 = "govuk_notify_emergency"
+
+    TYPE_PROBLEM = "problem"
+    TYPE_INCIDENT = "incident"
+    TYPE_QUESTION = "question"
+    TYPE_TASK = "task"
+
+    # Group: 3rd Line--Notify Support
+    NOTIFY_GROUP_ID = 360000036529
+    # Organization: GDS
+    NOTIFY_ORG_ID = 21891972
+    NOTIFY_TICKET_FORM_ID = 1900000284794
+
+    def __init__(
+        self,
+        subject,
+        message,
+        ticket_type,
+        p1=False,
+        user_name=None,
+        user_email=None,
+        requester_sees_message_content=True,
+        technical_ticket=False,
+        ticket_categories=None,
+        org_id=None,
+        org_type=None,
+        service_id=None,
+        email_ccs=None,
+    ):
+        self.subject = subject
+        self.message = message
+        self.ticket_type = ticket_type
+        self.p1 = p1
+        self.user_name = user_name
+        self.user_email = user_email
+        self.requester_sees_message_content = requester_sees_message_content
+        self.technical_ticket = technical_ticket
+        self.ticket_categories = ticket_categories or []
+        self.org_id = org_id
+        self.org_type = org_type
+        self.service_id = service_id
+        self.email_ccs = email_ccs
+
+    @property
+    def request_data(self):
+        data = {
+            "ticket": {
+                "subject": self.subject,
+                "comment": {
+                    "body": self.message,
+                    "public": self.requester_sees_message_content,
+                },
+                "group_id": self.NOTIFY_GROUP_ID,
+                "organization_id": self.NOTIFY_ORG_ID,
+                "ticket_form_id": self.NOTIFY_TICKET_FORM_ID,
+                "priority": self.PRIORITY_URGENT if self.p1 else self.PRIORITY_NORMAL,
+                "tags": [self.TAGS_P1 if self.p1 else self.TAGS_P2],
+                "type": self.ticket_type,
+                "custom_fields": self._get_custom_fields(),
+            }
+        }
+
+        if self.email_ccs:
+            data["ticket"]["email_ccs"] = [
+                {"user_email": email, "action": "put"} for email in self.email_ccs
+            ]
+
+        # if no requester provided, then the call came from within Notify 👻
+        if self.user_email:
+            data["ticket"]["requester"] = {
+                "email": self.user_email,
+                "name": self.user_name or "(no name supplied)",
+            }
+
+        return data
+
+    def _get_custom_fields(self):
+        technical_ticket_tag = (
+            f'notify_ticket_type_{"" if self.technical_ticket else "non_"}technical'
+        )
+        org_type_tag = f"notify_org_type_{self.org_type}" if self.org_type else None
+
+        return [
+            {
+                "id": "1900000744994",
+                "value": technical_ticket_tag,
+            },  # Notify Ticket type field
+            {
+                "id": "360022836500",
+                "value": self.ticket_categories,
+            },  # Notify Ticket category field
+            {
+                "id": "360022943959",
+                "value": self.org_id,
+            },  # Notify Organisation ID field
+            {
+                "id": "360022943979",
+                "value": org_type_tag,
+            },  # Notify Organisation type field
+            {
+                "id": "1900000745014",
+                "value": self.service_id,
+            },  # Notify Service ID field
+        ]
diff --git a/notifications_utils/countries/__init__.py b/notifications_utils/countries/__init__.py
new file mode 100644
index 0000000000..ccd4a4e30e
--- /dev/null
+++ b/notifications_utils/countries/__init__.py
@@ -0,0 +1,81 @@
+from functools import lru_cache
+
+from notifications_utils.insensitive_dict import InsensitiveDict
+from notifications_utils.sanitise_text import SanitiseASCII
+
+from .data import (
+    ADDITIONAL_SYNONYMS,
+    COUNTRIES_AND_TERRITORIES,
+    EUROPEAN_ISLANDS,
+    ROYAL_MAIL_EUROPEAN,
+    UK,
+    UK_ISLANDS,
+    WELSH_NAMES,
+    Postage,
+)
+
+
+class CountryMapping(InsensitiveDict):
+    @staticmethod
+    @lru_cache(maxsize=2048, typed=False)
+    def make_key(original_key):
+        original_key = original_key.replace("&", "and")
+        original_key = original_key.replace("+", "and")
+
+        normalised = "".join(
+            character.lower()
+            for character in original_key
+            if character not in " _-'’,.()"
+        )
+
+        if "?" in SanitiseASCII.encode(normalised):
+            return normalised
+
+        return SanitiseASCII.encode(normalised)
+
+    def __contains__(self, key):
+        if any(c.isdigit() for c in key):
+            # A string with a digit can’t be a country and is probably a
+            # postcode, so let’s do a little optimisation, skip the
+            # expensive string manipulation to normalise the key and say
+            # that there’s no matching country
+            return False
+        return super().__contains__(key)
+
+    def __getitem__(self, key):
+        for key_ in (key, f"the {key}", f"yr {key}", f"y {key}"):
+            if key_ in self:
+                return super().__getitem__(key_)
+
+        raise CountryNotFoundError(f"Not a known country or territory ({key})")
+
+
+countries = CountryMapping(
+    dict(
+        COUNTRIES_AND_TERRITORIES
+        + UK_ISLANDS
+        + EUROPEAN_ISLANDS
+        + WELSH_NAMES
+        + ADDITIONAL_SYNONYMS
+    )
+)
+
+
+class Country:
+    def __init__(self, given_name):
+        self.canonical_name = countries[given_name]
+
+    def __eq__(self, other):
+        return self.canonical_name == other.canonical_name
+
+    @property
+    def postage_zone(self):
+        if self.canonical_name == UK:
+            return Postage.UK
+        if self.canonical_name in ROYAL_MAIL_EUROPEAN:
+            return Postage.EUROPE
+        return Postage.REST_OF_WORLD
+
+
+class CountryNotFoundError(KeyError):
+    pass
diff --git a/notifications_utils/countries/_data/ended-countries.json b/notifications_utils/countries/_data/ended-countries.json
new file mode 100644
index 0000000000..2d60111756
--- /dev/null
+++ b/notifications_utils/countries/_data/ended-countries.json
@@ -0,0 +1,6 @@
+{
+  "Yugoslavia": null,
+  "USSR": null,
+  "East Germany": "Germany",
+  "Czechoslovakia": "Czechia"
+}
diff --git a/notifications_utils/countries/_data/europe.txt b/notifications_utils/countries/_data/europe.txt
new file mode 100644
index 0000000000..05e17e24f0
--- /dev/null
+++ b/notifications_utils/countries/_data/europe.txt
@@ -0,0 +1,62 @@
+Albania
+Andorra
+Armenia
+Austria
+Azerbaijan
+Azores
+Balearic Islands
+Belarus
+Belgium
+Bosnia and Herzegovina
+Bulgaria
+Canary Islands
+Corsica
+Croatia
+Cyprus
+Czechia
+Denmark
+Estonia
+Faroe Islands
+Finland
+France
+Georgia
+Germany
+Gibraltar
+Greece
+Greenland
+Hungary
+Iceland
+Ireland
+Italy
+Kazakhstan
+Kosovo
+Kyrgyzstan
+Latvia
+Liechtenstein
+Lithuania
+Luxembourg
+North Macedonia
+Madeira
+Malta
+Moldova
+Monaco
+Montenegro
+Netherlands
+Norway
+Poland
+Portugal
+Romania
+Russia
+San Marino
+Serbia
+Slovakia
+Slovenia
+Spain
+Sweden
+Switzerland
+Tajikistan
+Turkey
+Turkmenistan
+Ukraine
+Uzbekistan
+Vatican City
diff --git a/notifications_utils/countries/_data/european-islands.txt b/notifications_utils/countries/_data/european-islands.txt
new file mode 100644
index 0000000000..4899f327bc
--- /dev/null
+++ b/notifications_utils/countries/_data/european-islands.txt
@@ -0,0 +1,5 @@
+Azores
+Balearic Islands
+Canary Islands
+Corsica
+Madeira
diff --git a/notifications_utils/countries/_data/location-autocomplete-graph.json b/notifications_utils/countries/_data/location-autocomplete-graph.json
new file mode 100644
index 0000000000..4313664d94
--- /dev/null
+++ b/notifications_utils/countries/_data/location-autocomplete-graph.json
@@ -0,0 +1,28607 @@
+{
+  "country:AD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Andorra"
+    }
+  },
+  "country:AE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Arab Emirates"
+    }
+  },
+  "country:AF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Afghanistan"
+    }
+  },
+  "country:AG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Antigua and Barbuda"
+    }
+  },
+  "country:AL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Albania"
+    }
+  },
+  "country:AM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Armenia"
+    }
+  },
+  "country:AO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Angola"
+    }
+  },
+  "country:AR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Argentina"
+    }
+  },
+  "country:AT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Austria"
+    }
+  },
+  "country:AU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Australia"
+    }
+  },
+  "country:AZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Azerbaijan"
+    }
+  },
+  "country:BA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bosnia and Herzegovina"
+    }
+  },
+  "country:BB": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Barbados"
+    }
+  },
+  "country:BD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bangladesh"
+    }
+  },
+  "country:BE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belgium"
+    }
+  },
+  "country:BF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Burkina Faso"
+    }
+  },
+  "country:BG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bulgaria"
+    }
+  },
+  "country:BH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bahrain"
+    }
+  },
+  "country:BI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Burundi"
+    }
+  },
+  "country:BJ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Benin"
+    }
+  },
+  "country:BN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Brunei"
+    }
+  },
+  "country:BO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bolivia"
+    }
+  },
+  "country:BR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Brazil"
+    }
+  },
+  "country:BS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Bahamas"
+    }
+  },
+  "country:BT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bhutan"
+    }
+  },
+  "country:BW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Botswana"
+    }
+  },
+  "country:BY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belarus"
+    }
+  },
+  "country:BZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belize"
+    }
+  },
+  "country:CA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Canada"
+    }
+  },
+  "country:CD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Congo (Democratic Republic)"
+    }
+  },
+  "country:CF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Central African Republic"
+    }
+  },
+  "country:CG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Congo"
+    }
+  },
+  "country:CH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Switzerland"
+    }
+  },
+  "country:CI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ivory Coast"
+    }
+  },
+  "country:CL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Chile"
+    }
+  },
+  "country:CM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cameroon"
+    }
+  },
+  "country:CN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "China"
+    }
+  },
+  "country:CO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Colombia"
+    }
+  },
+  "country:CR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Costa Rica"
+    }
+  },
+  "country:CS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Czechoslovakia"
+    }
+  },
+  "country:CU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cuba"
+    }
+  },
+  "country:CV": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cape Verde"
+    }
+  },
+  "country:CY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cyprus"
+    }
+  },
+  "country:CZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Czechia"
+    }
+  },
+  "country:DD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "East Germany"
+    }
+  },
+  "country:DE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Germany"
+    }
+  },
+  "country:DJ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Djibouti"
+    }
+  },
+  "country:DK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Denmark"
+    }
+  },
+  "country:DM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dominica"
+    }
+  },
+  "country:DO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dominican Republic"
+    }
+  },
+  "country:DZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Algeria"
+    }
+  },
+  "country:EC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ecuador"
+    }
+  },
+  "country:EE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Estonia"
+    }
+  },
+  "country:EG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Egypt"
+    }
+  },
+  "country:ER": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Eritrea"
+    }
+  },
+  "country:ES": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Spain"
+    }
+  },
+  "country:ET": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ethiopia"
+    }
+  },
+  "country:FI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Finland"
+    }
+  },
+  "country:FJ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Fiji"
+    }
+  },
+  "country:FM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Micronesia"
+    }
+  },
+  "country:FR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "France"
+    }
+  },
+  "country:GA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gabon"
+    }
+  },
+  "country:GB": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Kingdom"
+    }
+  },
+  "country:GD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Grenada"
+    }
+  },
+  "country:GE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Georgia"
+    }
+  },
+  "country:GH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ghana"
+    }
+  },
+  "country:GM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Gambia"
+    }
+  },
+  "country:GN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guinea"
+    }
+  },
+  "country:GQ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Equatorial Guinea"
+    }
+  },
+  "country:GR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Greece"
+    }
+  },
+  "country:GT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guatemala"
+    }
+  },
+  "country:GW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guinea-Bissau"
+    }
+  },
+  "country:GY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guyana"
+    }
+  },
+  "country:HN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Honduras"
+    }
+  },
+  "country:HR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Croatia"
+    }
+  },
+  "country:HT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Haiti"
+    }
+  },
+  "country:HU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hungary"
+    }
+  },
+  "country:ID": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Indonesia"
+    }
+  },
+  "country:IE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ireland"
+    }
+  },
+  "country:IL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Israel"
+    }
+  },
+  "country:IN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "India"
+    }
+  },
+  "country:IQ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Iraq"
+    }
+  },
+  "country:IR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Iran"
+    }
+  },
+  "country:IS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Iceland"
+    }
+  },
+  "country:IT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Italy"
+    }
+  },
+  "country:JM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jamaica"
+    }
+  },
+  "country:JO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jordan"
+    }
+  },
+  "country:JP": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Japan"
+    }
+  },
+  "country:KE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kenya"
+    }
+  },
+  "country:KG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kyrgyzstan"
+    }
+  },
+  "country:KH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cambodia"
+    }
+  },
+  "country:KI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kiribati"
+    }
+  },
+  "country:KM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Comoros"
+    }
+  },
+  "country:KN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St Kitts and Nevis"
+    }
+  },
+  "country:KP": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "North Korea"
+    }
+  },
+  "country:KR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "South Korea"
+    }
+  },
+  "country:KW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kuwait"
+    }
+  },
+  "country:KZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kazakhstan"
+    }
+  },
+  "country:LA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Laos"
+    }
+  },
+  "country:LB": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lebanon"
+    }
+  },
+  "country:LC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St Lucia"
+    }
+  },
+  "country:LI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Liechtenstein"
+    }
+  },
+  "country:LK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sri Lanka"
+    }
+  },
+  "country:LR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Liberia"
+    }
+  },
+  "country:LS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lesotho"
+    }
+  },
+  "country:LT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lithuania"
+    }
+  },
+  "country:LU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Luxembourg"
+    }
+  },
+  "country:LV": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Latvia"
+    }
+  },
+  "country:LY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Libya"
+    }
+  },
+  "country:MA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Morocco"
+    }
+  },
+  "country:MC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Monaco"
+    }
+  },
+  "country:MD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Moldova"
+    }
+  },
+  "country:ME": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Montenegro"
+    }
+  },
+  "country:MG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Madagascar"
+    }
+  },
+  "country:MH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Marshall Islands"
+    }
+  },
+  "country:MK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "North Macedonia"
+    }
+  },
+  "country:ML": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mali"
+    }
+  },
+  "country:MM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Myanmar (Burma)"
+    }
+  },
+  "country:MN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mongolia"
+    }
+  },
+  "country:MR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mauritania"
+    }
+  },
+  "country:MT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Malta"
+    }
+  },
+  "country:MU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mauritius"
+    }
+  },
+  "country:MV": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Maldives"
+    }
+  },
+  "country:MW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Malawi"
+    }
+  },
+  "country:MX": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mexico"
+    }
+  },
+  "country:MY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Malaysia"
+    }
+  },
+  "country:MZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mozambique"
+    }
+  },
+  "country:NA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Namibia"
+    }
+  },
+  "country:NE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Niger"
+    }
+  },
+  "country:NG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nigeria"
+    }
+  },
+  "country:NI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nicaragua"
+    }
+  },
+  "country:NL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Netherlands"
+    }
+  },
+  "country:NO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Norway"
+    }
+  },
+  "country:NP": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nepal"
+    }
+  },
+  "country:NR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nauru"
+    }
+  },
+  "country:NZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "New Zealand"
+    }
+  },
+  "country:OM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Oman"
+    }
+  },
+  "country:PA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Panama"
+    }
+  },
+  "country:PE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Peru"
+    }
+  },
+  "country:PG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Papua New Guinea"
+    }
+  },
+  "country:PH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Philippines"
+    }
+  },
+  "country:PK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Pakistan"
+    }
+  },
+  "country:PL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Poland"
+    }
+  },
+  "country:PT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Portugal"
+    }
+  },
+  "country:PW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Palau"
+    }
+  },
+  "country:PY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Paraguay"
+    }
+  },
+  "country:QA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Qatar"
+    }
+  },
+  "country:RO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Romania"
+    }
+  },
+  "country:RS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Serbia"
+    }
+  },
+  "country:RU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Russia"
+    }
+  },
+  "country:RW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rwanda"
+    }
+  },
+  "country:SA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saudi Arabia"
+    }
+  },
+  "country:SB": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Solomon Islands"
+    }
+  },
+  "country:SC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Seychelles"
+    }
+  },
+  "country:SD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sudan"
+    }
+  },
+  "country:SE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sweden"
+    }
+  },
+  "country:SG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Singapore"
+    }
+  },
+  "country:SI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Slovenia"
+    }
+  },
+  "country:SK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Slovakia"
+    }
+  },
+  "country:SL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sierra Leone"
+    }
+  },
+  "country:SM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "San Marino"
+    }
+  },
+  "country:SN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Senegal"
+    }
+  },
+  "country:SO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Somalia"
+    }
+  },
+  "country:SR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Suriname"
+    }
+  },
+  "country:SS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "South Sudan"
+    }
+  },
+  "country:ST": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sao Tome and Principe"
+    }
+  },
+  "country:SU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "USSR"
+    }
+  },
+  "country:SV": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "El Salvador"
+    }
+  },
+  "country:SY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Syria"
+    }
+  },
+  "country:SZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Eswatini"
+    }
+  },
+  "country:TD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Chad"
+    }
+  },
+  "country:TG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Togo"
+    }
+  },
+  "country:TH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Thailand"
+    }
+  },
+  "country:TJ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tajikistan"
+    }
+  },
+  "country:TL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "East Timor"
+    }
+  },
+  "country:TM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turkmenistan"
+    }
+  },
+  "country:TN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tunisia"
+    }
+  },
+  "country:TO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tonga"
+    }
+  },
+  "country:TR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turkey"
+    }
+  },
+  "country:TT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Trinidad and Tobago"
+    }
+  },
+  "country:TV": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tuvalu"
+    }
+  },
+  "country:TZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tanzania"
+    }
+  },
+  "country:UA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ukraine"
+    }
+  },
+  "country:UG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Uganda"
+    }
+  },
+  "country:US": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United States"
+    }
+  },
+  "country:UY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Uruguay"
+    }
+  },
+  "country:UZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Uzbekistan"
+    }
+  },
+  "country:VA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Vatican City"
+    }
+  },
+  "country:VC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St Vincent"
+    }
+  },
+  "country:VE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Venezuela"
+    }
+  },
+  "country:VN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Vietnam"
+    }
+  },
+  "country:VU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Vanuatu"
+    }
+  },
+  "country:WS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Samoa"
+    }
+  },
+  "country:XK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kosovo"
+    }
+  },
+  "country:YE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Yemen"
+    }
+  },
+  "country:YU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Yugoslavia"
+    }
+  },
+  "country:ZA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "South Africa"
+    }
+  },
+  "country:ZM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zambia"
+    }
+  },
+  "country:ZW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zimbabwe"
+    }
+  },
+  "nym:AD": {
+    "edges": {
+      "from": [
+        "country:AD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AD"
+    }
+  },
+  "nym:AE": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AE"
+    }
+  },
+  "nym:AE-AJ": {
+    "edges": {
+      "from": [
+        "territory:AE-AJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AE-AJ"
+    }
+  },
+  "nym:AE-AZ": {
+    "edges": {
+      "from": [
+        "territory:AE-AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AE-AZ"
+    }
+  },
+  "nym:AE-DU": {
+    "edges": {
+      "from": [
+        "territory:AE-DU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AE-DU"
+    }
+  },
+  "nym:AE-FU": {
+    "edges": {
+      "from": [
+        "territory:AE-FU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AE-FU"
+    }
+  },
+  "nym:AE-RK": {
+    "edges": {
+      "from": [
+        "territory:AE-RK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AE-RK"
+    }
+  },
+  "nym:AE-SH": {
+    "edges": {
+      "from": [
+        "territory:AE-SH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AE-SH"
+    }
+  },
+  "nym:AE-UQ": {
+    "edges": {
+      "from": [
+        "territory:AE-UQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AE-UQ"
+    }
+  },
+  "nym:AF": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AF"
+    }
+  },
+  "nym:AG": {
+    "edges": {
+      "from": [
+        "country:AG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AG"
+    }
+  },
+  "nym:AI": {
+    "edges": {
+      "from": [
+        "territory:AI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AI"
+    }
+  },
+  "nym:AL": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AL"
+    }
+  },
+  "nym:AM": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AM"
+    }
+  },
+  "nym:AO": {
+    "edges": {
+      "from": [
+        "country:AO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AO"
+    }
+  },
+  "nym:AQ": {
+    "edges": {
+      "from": [
+        "territory:AQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AQ"
+    }
+  },
+  "nym:AR": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AR"
+    }
+  },
+  "nym:AS": {
+    "edges": {
+      "from": [
+        "territory:AS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AS"
+    }
+  },
+  "nym:AT": {
+    "edges": {
+      "from": [
+        "country:AT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AT"
+    }
+  },
+  "nym:AU": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AU"
+    }
+  },
+  "nym:AW": {
+    "edges": {
+      "from": [
+        "territory:AW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AW"
+    }
+  },
+  "nym:AX": {
+    "edges": {
+      "from": [
+        "territory:AX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AX"
+    }
+  },
+  "nym:AZ": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "AZ"
+    }
+  },
+  "nym:Aaland": {
+    "edges": {
+      "from": [
+        "territory:AX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Aaland"
+    }
+  },
+  "nym:Abyssinia": {
+    "edges": {
+      "from": [
+        "country:ET"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Abyssinia"
+    }
+  },
+  "nym:Aeroes": {
+    "edges": {
+      "from": [
+        "territory:FO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Aeroes"
+    }
+  },
+  "nym:Afghanestan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Afghanestan"
+    }
+  },
+  "nym:Aforika Borwa": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Aforika Borwa"
+    }
+  },
+  "nym:Afrika Borwa": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Afrika Borwa"
+    }
+  },
+  "nym:Afrika Dzonga": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Afrika Dzonga"
+    }
+  },
+  "nym:Afrika-Borwa": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Afrika-Borwa"
+    }
+  },
+  "nym:Afurika Tshipembe": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Afurika Tshipembe"
+    }
+  },
+  "nym:Agawec": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Agawec"
+    }
+  },
+  "nym:Ahvenanmaa": {
+    "edges": {
+      "from": [
+        "territory:AX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ahvenanmaa"
+    }
+  },
+  "nym:Al itihaad al islamiya": {
+    "edges": {
+      "from": [
+        "country:SO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al itihaad al islamiya"
+    }
+  },
+  "nym:Al-'Iraq": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-'Iraq"
+    }
+  },
+  "nym:Al-Baḥrayn": {
+    "edges": {
+      "from": [
+        "country:BH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-Baḥrayn"
+    }
+  },
+  "nym:Al-Iraq": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-Iraq"
+    }
+  },
+  "nym:Al-Jazā'ir": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-Jazā'ir"
+    }
+  },
+  "nym:Al-Mamlaka Al-‘Arabiyyah as Sa‘ūdiyyah": {
+    "edges": {
+      "from": [
+        "country:SA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-Mamlaka Al-‘Arabiyyah as Sa‘ūdiyyah"
+    }
+  },
+  "nym:Al-Yaman": {
+    "edges": {
+      "from": [
+        "country:YE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-Yaman"
+    }
+  },
+  "nym:Al-itihaad al-islamiya": {
+    "edges": {
+      "from": [
+        "country:SO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-itihaad al-islamiya"
+    }
+  },
+  "nym:Al-maɣréb": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-maɣréb"
+    }
+  },
+  "nym:Al-’Imārat Al-‘Arabiyyah Al-Muttaḥidah": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-’Imārat Al-‘Arabiyyah Al-Muttaḥidah"
+    }
+  },
+  "nym:Al-’Urdun": {
+    "edges": {
+      "from": [
+        "country:JO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Al-’Urdun"
+    }
+  },
+  "nym:Aland": {
+    "edges": {
+      "from": [
+        "territory:AX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Aland"
+    }
+  },
+  "nym:Ameeri": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ameeri"
+    }
+  },
+  "nym:Ameica": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ameica"
+    }
+  },
+  "nym:Amelika-hui-pu-'ia": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Amelika-hui-pu-'ia"
+    }
+  },
+  "nym:Amerca": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Amerca"
+    }
+  },
+  "nym:Amercia": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Amercia"
+    }
+  },
+  "nym:Ameria": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ameria"
+    }
+  },
+  "nym:American Virgin Islands": {
+    "edges": {
+      "from": [
+        "territory:VI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "American Virgin Islands"
+    }
+  },
+  "nym:Amerika Sāmoa": {
+    "edges": {
+      "from": [
+        "country:WS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Amerika Sāmoa"
+    }
+  },
+  "nym:Amerruk": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Amerruk"
+    }
+  },
+  "nym:Amrica": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Amrica"
+    }
+  },
+  "nym:An Rywvaneth Unys": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "An Rywvaneth Unys"
+    }
+  },
+  "nym:Anguilla": {
+    "edges": {
+      "from": [
+        "territory:AI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Anguilla"
+    }
+  },
+  "nym:Anmerica": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Anmerica"
+    }
+  },
+  "nym:Annam": {
+    "edges": {
+      "from": [
+        "country:VN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Annam"
+    }
+  },
+  "nym:Antarctica": {
+    "edges": {
+      "from": [
+        "territory:AQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Antarctica"
+    }
+  },
+  "nym:Antigua and Barbuda": {
+    "edges": {
+      "from": [
+        "country:AG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Antigua and Barbuda"
+    }
+  },
+  "nym:Aorōkin M̧ajeļ": {
+    "edges": {
+      "from": [
+        "country:MH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Aorōkin M̧ajeļ"
+    }
+  },
+  "nym:Aotearoa": {
+    "edges": {
+      "from": [
+        "country:NZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Aotearoa"
+    }
+  },
+  "nym:Arab Republic of Egypt": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Arab Republic of Egypt"
+    }
+  },
+  "nym:Argenina": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Argenina"
+    }
+  },
+  "nym:Argentine Republic": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Argentine Republic"
+    }
+  },
+  "nym:Argentinia": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Argentinia"
+    }
+  },
+  "nym:Aruba": {
+    "edges": {
+      "from": [
+        "territory:AW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Aruba"
+    }
+  },
+  "nym:As-Sudan": {
+    "edges": {
+      "from": [
+        "country:SD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "As-Sudan"
+    }
+  },
+  "nym:Ascension Island": {
+    "edges": {
+      "from": [
+        "territory:SH-AC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ascension Island"
+    }
+  },
+  "nym:Ayiti": {
+    "edges": {
+      "from": [
+        "country:HT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ayiti"
+    }
+  },
+  "nym:Azerbaijani Republic": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Azerbaijani Republic"
+    }
+  },
+  "nym:Azerbajdzhan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Azerbajdzhan"
+    }
+  },
+  "nym:Azerbajdzhan Republic": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Azerbajdzhan Republic"
+    }
+  },
+  "nym:Azərbaycan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Azərbaycan"
+    }
+  },
+  "nym:B.V.I.": {
+    "edges": {
+      "from": [
+        "territory:VG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "B.V.I."
+    }
+  },
+  "nym:BA": {
+    "edges": {
+      "from": [
+        "country:BA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BA"
+    }
+  },
+  "nym:BAT": {
+    "edges": {
+      "from": [
+        "territory:BAT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BAT"
+    }
+  },
+  "nym:BB": {
+    "edges": {
+      "from": [
+        "country:BB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BB"
+    }
+  },
+  "nym:BD": {
+    "edges": {
+      "from": [
+        "country:BD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BD"
+    }
+  },
+  "nym:BE": {
+    "edges": {
+      "from": [
+        "country:BE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BE"
+    }
+  },
+  "nym:BF": {
+    "edges": {
+      "from": [
+        "country:BF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BF"
+    }
+  },
+  "nym:BG": {
+    "edges": {
+      "from": [
+        "country:BG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BG"
+    }
+  },
+  "nym:BH": {
+    "edges": {
+      "from": [
+        "country:BH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BH"
+    }
+  },
+  "nym:BI": {
+    "edges": {
+      "from": [
+        "country:BI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BI"
+    }
+  },
+  "nym:BJ": {
+    "edges": {
+      "from": [
+        "country:BJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BJ"
+    }
+  },
+  "nym:BL": {
+    "edges": {
+      "from": [
+        "territory:BL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BL"
+    }
+  },
+  "nym:BM": {
+    "edges": {
+      "from": [
+        "territory:BM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BM"
+    }
+  },
+  "nym:BN": {
+    "edges": {
+      "from": [
+        "country:BN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BN"
+    }
+  },
+  "nym:BO": {
+    "edges": {
+      "from": [
+        "country:BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BO"
+    }
+  },
+  "nym:BQ-BO": {
+    "edges": {
+      "from": [
+        "territory:BQ-BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BQ-BO"
+    }
+  },
+  "nym:BQ-SA": {
+    "edges": {
+      "from": [
+        "territory:BQ-SA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BQ-SA"
+    }
+  },
+  "nym:BQ-SE": {
+    "edges": {
+      "from": [
+        "territory:BQ-SE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BQ-SE"
+    }
+  },
+  "nym:BR": {
+    "edges": {
+      "from": [
+        "country:BR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BR"
+    }
+  },
+  "nym:BS": {
+    "edges": {
+      "from": [
+        "country:BS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BS"
+    }
+  },
+  "nym:BT": {
+    "edges": {
+      "from": [
+        "country:BT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BT"
+    }
+  },
+  "nym:BV": {
+    "edges": {
+      "from": [
+        "territory:BV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BV"
+    }
+  },
+  "nym:BVI": {
+    "edges": {
+      "from": [
+        "territory:VG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BVI"
+    }
+  },
+  "nym:BW": {
+    "edges": {
+      "from": [
+        "country:BW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BW"
+    }
+  },
+  "nym:BY": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BY"
+    }
+  },
+  "nym:BZ": {
+    "edges": {
+      "from": [
+        "country:BZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BZ"
+    }
+  },
+  "nym:Bailiwick of Guernsey": {
+    "edges": {
+      "from": [
+        "territory:GG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bailiwick of Guernsey"
+    }
+  },
+  "nym:Bailiwick of Jersey": {
+    "edges": {
+      "from": [
+        "territory:JE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bailiwick of Jersey"
+    }
+  },
+  "nym:Baker Island": {
+    "edges": {
+      "from": [
+        "territory:UM-81"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Baker Island"
+    }
+  },
+  "nym:Bangla Desh": {
+    "edges": {
+      "from": [
+        "country:BD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bangla Desh"
+    }
+  },
+  "nym:Barbados": {
+    "edges": {
+      "from": [
+        "country:BB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Barbados"
+    }
+  },
+  "nym:Basutoland": {
+    "edges": {
+      "from": [
+        "country:LS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Basutoland"
+    }
+  },
+  "nym:Belarus": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belarus"
+    }
+  },
+  "nym:Belau": {
+    "edges": {
+      "from": [
+        "country:PW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belau"
+    }
+  },
+  "nym:Belgie": {
+    "edges": {
+      "from": [
+        "country:BE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belgie"
+    }
+  },
+  "nym:Belgien": {
+    "edges": {
+      "from": [
+        "country:BE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belgien"
+    }
+  },
+  "nym:Belgique": {
+    "edges": {
+      "from": [
+        "country:BE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belgique"
+    }
+  },
+  "nym:België": {
+    "edges": {
+      "from": [
+        "country:BE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "België"
+    }
+  },
+  "nym:Belguim": {
+    "edges": {
+      "from": [
+        "country:BE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belguim"
+    }
+  },
+  "nym:Belize": {
+    "edges": {
+      "from": [
+        "country:BZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Belize"
+    }
+  },
+  "nym:Bermuda": {
+    "edges": {
+      "from": [
+        "territory:BM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bermuda"
+    }
+  },
+  "nym:Bermudas": {
+    "edges": {
+      "from": [
+        "territory:BM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bermudas"
+    }
+  },
+  "nym:Bharat": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bharat"
+    }
+  },
+  "nym:Bharôt": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bharôt"
+    }
+  },
+  "nym:Bharôtô": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bharôtô"
+    }
+  },
+  "nym:Bhārat": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bhārat"
+    }
+  },
+  "nym:Bhārata": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bhārata"
+    }
+  },
+  "nym:Bhāratadēsam": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bhāratadēsam"
+    }
+  },
+  "nym:Bhāratam": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bhāratam"
+    }
+  },
+  "nym:BiH": {
+    "edges": {
+      "from": [
+        "country:BA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "BiH"
+    }
+  },
+  "nym:Bielaruś": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bielaruś"
+    }
+  },
+  "nym:Bitain": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bitain"
+    }
+  },
+  "nym:Bolivarian Republic of Venezuela": {
+    "edges": {
+      "from": [
+        "country:VE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bolivarian Republic of Venezuela"
+    }
+  },
+  "nym:Bolivia": {
+    "edges": {
+      "from": [
+        "country:BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bolivia"
+    }
+  },
+  "nym:Bonaire": {
+    "edges": {
+      "from": [
+        "territory:BQ-BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bonaire"
+    }
+  },
+  "nym:Bosna i Hercegovina": {
+    "edges": {
+      "from": [
+        "country:BA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bosna i Hercegovina"
+    }
+  },
+  "nym:Bosnia and Herzegovina": {
+    "edges": {
+      "from": [
+        "country:BA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bosnia and Herzegovina"
+    }
+  },
+  "nym:Bosnia-Herzegovina": {
+    "edges": {
+      "from": [
+        "country:BA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bosnia-Herzegovina"
+    }
+  },
+  "nym:Bouvet Island": {
+    "edges": {
+      "from": [
+        "territory:BV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bouvet Island"
+    }
+  },
+  "nym:Brasil": {
+    "edges": {
+      "from": [
+        "country:BR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Brasil"
+    }
+  },
+  "nym:Brazzaville": {
+    "edges": {
+      "from": [
+        "country:CG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Brazzaville"
+    }
+  },
+  "nym:Briain": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Briain"
+    }
+  },
+  "nym:Britain": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Britain"
+    }
+  },
+  "nym:Britiain": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Britiain"
+    }
+  },
+  "nym:British Antarctic Territory": {
+    "edges": {
+      "from": [
+        "territory:BAT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "British Antarctic Territory"
+    }
+  },
+  "nym:British Guiana": {
+    "edges": {
+      "from": [
+        "country:GY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "British Guiana"
+    }
+  },
+  "nym:British Honduras": {
+    "edges": {
+      "from": [
+        "country:BZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "British Honduras"
+    }
+  },
+  "nym:Brtain": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Brtain"
+    }
+  },
+  "nym:Brunei Darussalam": {
+    "edges": {
+      "from": [
+        "country:BN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Brunei Darussalam"
+    }
+  },
+  "nym:Bugaria": {
+    "edges": {
+      "from": [
+        "country:BG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bugaria"
+    }
+  },
+  "nym:Bukchosŏn": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bukchosŏn"
+    }
+  },
+  "nym:Bulagar": {
+    "edges": {
+      "from": [
+        "country:BG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bulagar"
+    }
+  },
+  "nym:Bulgariya": {
+    "edges": {
+      "from": [
+        "country:BG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bulgariya"
+    }
+  },
+  "nym:Buliwya": {
+    "edges": {
+      "from": [
+        "country:BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Buliwya"
+    }
+  },
+  "nym:Bundesrepublik": {
+    "edges": {
+      "from": [
+        "country:DE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bundesrepublik"
+    }
+  },
+  "nym:Burkina Faso": {
+    "edges": {
+      "from": [
+        "country:BF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Burkina Faso"
+    }
+  },
+  "nym:Burkina Fasoupper": {
+    "edges": {
+      "from": [
+        "country:BF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Burkina Fasoupper"
+    }
+  },
+  "nym:Byelarus": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Byelarus"
+    }
+  },
+  "nym:Byelorussia": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Byelorussia"
+    }
+  },
+  "nym:Bārata": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bārata"
+    }
+  },
+  "nym:Bălgarija": {
+    "edges": {
+      "from": [
+        "country:BG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bălgarija"
+    }
+  },
+  "nym:CA": {
+    "edges": {
+      "from": [
+        "country:CA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CA"
+    }
+  },
+  "nym:CAR": {
+    "edges": {
+      "from": [
+        "country:CF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CAR"
+    }
+  },
+  "nym:CC": {
+    "edges": {
+      "from": [
+        "territory:CC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CC"
+    }
+  },
+  "nym:CD": {
+    "edges": {
+      "from": [
+        "country:CD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CD"
+    }
+  },
+  "nym:CF": {
+    "edges": {
+      "from": [
+        "country:CF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CF"
+    }
+  },
+  "nym:CG": {
+    "edges": {
+      "from": [
+        "country:CG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CG"
+    }
+  },
+  "nym:CH": {
+    "edges": {
+      "from": [
+        "country:CH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CH"
+    }
+  },
+  "nym:CI": {
+    "edges": {
+      "from": [
+        "country:CI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CI"
+    }
+  },
+  "nym:CK": {
+    "edges": {
+      "from": [
+        "territory:CK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CK"
+    }
+  },
+  "nym:CL": {
+    "edges": {
+      "from": [
+        "country:CL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CL"
+    }
+  },
+  "nym:CM": {
+    "edges": {
+      "from": [
+        "country:CM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CM"
+    }
+  },
+  "nym:CN": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CN"
+    }
+  },
+  "nym:CO": {
+    "edges": {
+      "from": [
+        "country:CO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CO"
+    }
+  },
+  "nym:CR": {
+    "edges": {
+      "from": [
+        "country:CR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CR"
+    }
+  },
+  "nym:CS": {
+    "edges": {
+      "from": [
+        "country:CS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CS"
+    }
+  },
+  "nym:CU": {
+    "edges": {
+      "from": [
+        "country:CU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CU"
+    }
+  },
+  "nym:CV": {
+    "edges": {
+      "from": [
+        "country:CV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CV"
+    }
+  },
+  "nym:CW": {
+    "edges": {
+      "from": [
+        "territory:CW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CW"
+    }
+  },
+  "nym:CX": {
+    "edges": {
+      "from": [
+        "territory:CX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CX"
+    }
+  },
+  "nym:CY": {
+    "edges": {
+      "from": [
+        "country:CY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CY"
+    }
+  },
+  "nym:CZ": {
+    "edges": {
+      "from": [
+        "country:CZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "CZ"
+    }
+  },
+  "nym:Cabo": {
+    "edges": {
+      "from": [
+        "country:CV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cabo"
+    }
+  },
+  "nym:Cabo Verde": {
+    "edges": {
+      "from": [
+        "country:CV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cabo Verde"
+    }
+  },
+  "nym:Cameroon": {
+    "edges": {
+      "from": [
+        "country:CM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cameroon"
+    }
+  },
+  "nym:Cameroun": {
+    "edges": {
+      "from": [
+        "country:CM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cameroun"
+    }
+  },
+  "nym:Canada": {
+    "edges": {
+      "from": [
+        "country:CA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Canada"
+    }
+  },
+  "nym:Canadaigua": {
+    "edges": {
+      "from": [
+        "country:CA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Canadaigua"
+    }
+  },
+  "nym:Candada": {
+    "edges": {
+      "from": [
+        "country:CA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Candada"
+    }
+  },
+  "nym:Cathay": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cathay"
+    }
+  },
+  "nym:Cayman Islands": {
+    "edges": {
+      "from": [
+        "territory:KY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cayman Islands"
+    }
+  },
+  "nym:Central Africa": {
+    "edges": {
+      "from": [
+        "country:CF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Central Africa"
+    }
+  },
+  "nym:Central African Republic": {
+    "edges": {
+      "from": [
+        "country:CF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Central African Republic"
+    }
+  },
+  "nym:Ceska": {
+    "edges": {
+      "from": [
+        "country:CZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ceska"
+    }
+  },
+  "nym:Ceuta": {
+    "edges": {
+      "from": [
+        "territory:ES-CE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ceuta"
+    }
+  },
+  "nym:Ceylon": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ceylon"
+    }
+  },
+  "nym:Chinese Taipei": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Chinese Taipei"
+    }
+  },
+  "nym:Citta del Vaticano": {
+    "edges": {
+      "from": [
+        "country:VA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Citta del Vaticano"
+    }
+  },
+  "nym:Co-operative Republic of Guyana": {
+    "edges": {
+      "from": [
+        "country:GY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Co-operative Republic of Guyana"
+    }
+  },
+  "nym:Coasta Rica": {
+    "edges": {
+      "from": [
+        "country:CR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Coasta Rica"
+    }
+  },
+  "nym:Collectivity of Saint Martin": {
+    "edges": {
+      "from": [
+        "territory:MF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Collectivity of Saint Martin"
+    }
+  },
+  "nym:Commonwealth of Australia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Commonwealth of Australia"
+    }
+  },
+  "nym:Commonwealth of Bahamas": {
+    "edges": {
+      "from": [
+        "country:BS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Commonwealth of Bahamas"
+    }
+  },
+  "nym:Commonwealth of Dominica": {
+    "edges": {
+      "from": [
+        "country:DM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Commonwealth of Dominica"
+    }
+  },
+  "nym:Commonwealth of Puerto Rico": {
+    "edges": {
+      "from": [
+        "territory:PR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Commonwealth of Puerto Rico"
+    }
+  },
+  "nym:Commonwealth of the Northern Mariana Islands": {
+    "edges": {
+      "from": [
+        "territory:MP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Commonwealth of the Northern Mariana Islands"
+    }
+  },
+  "nym:Comores": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Comores"
+    }
+  },
+  "nym:Congo-Brazzaville": {
+    "edges": {
+      "from": [
+        "country:CD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Congo-Brazzaville"
+    }
+  },
+  "nym:Cook Islands": {
+    "edges": {
+      "from": [
+        "territory:CK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cook Islands"
+    }
+  },
+  "nym:Costa Rico": {
+    "edges": {
+      "from": [
+        "country:CR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Costa Rico"
+    }
+  },
+  "nym:Cote D'Ivoire": {
+    "edges": {
+      "from": [
+        "country:CI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cote D'Ivoire"
+    }
+  },
+  "nym:Cote dIvoire": {
+    "edges": {
+      "from": [
+        "country:CI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cote dIvoire"
+    }
+  },
+  "nym:Country of Curaçao": {
+    "edges": {
+      "from": [
+        "territory:CW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Country of Curaçao"
+    }
+  },
+  "nym:Crna Gora": {
+    "edges": {
+      "from": [
+        "country:ME"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Crna Gora"
+    }
+  },
+  "nym:Curacao": {
+    "edges": {
+      "from": [
+        "territory:CW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Curacao"
+    }
+  },
+  "nym:Curaçao": {
+    "edges": {
+      "from": [
+        "territory:CW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Curaçao"
+    }
+  },
+  "nym:Czech Republic": {
+    "edges": {
+      "from": [
+        "country:CZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Czech Republic"
+    }
+  },
+  "nym:Czechoslav": {
+    "edges": {
+      "from": [
+        "country:CZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Czechoslav"
+    }
+  },
+  "nym:Czechoslovak Republic": {
+    "edges": {
+      "from": [
+        "country:CS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Czechoslovak Republic"
+    }
+  },
+  "nym:DD": {
+    "edges": {
+      "from": [
+        "country:DD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "DD"
+    }
+  },
+  "nym:DE": {
+    "edges": {
+      "from": [
+        "country:DE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "DE"
+    }
+  },
+  "nym:DJ": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "DJ"
+    }
+  },
+  "nym:DK": {
+    "edges": {
+      "from": [
+        "country:DK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "DK"
+    }
+  },
+  "nym:DM": {
+    "edges": {
+      "from": [
+        "country:DM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "DM"
+    }
+  },
+  "nym:DO": {
+    "edges": {
+      "from": [
+        "country:DO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "DO"
+    }
+  },
+  "nym:DPRK": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "DPRK"
+    }
+  },
+  "nym:DZ": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "DZ"
+    }
+  },
+  "nym:Dahomey": {
+    "edges": {
+      "from": [
+        "country:BJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dahomey"
+    }
+  },
+  "nym:Danmark": {
+    "edges": {
+      "from": [
+        "country:DK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Danmark"
+    }
+  },
+  "nym:Dawlat ul-Kuwayt": {
+    "edges": {
+      "from": [
+        "country:KW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dawlat ul-Kuwayt"
+    }
+  },
+  "nym:Democratic People's Republic of Koread": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Democratic People's Republic of Koread"
+    }
+  },
+  "nym:Democratic Republic of Sao Tome and Principe": {
+    "edges": {
+      "from": [
+        "country:ST"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Democratic Republic of Sao Tome and Principe"
+    }
+  },
+  "nym:Democratic Republic of Timor-Lestetimor": {
+    "edges": {
+      "from": [
+        "country:TL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Democratic Republic of Timor-Lestetimor"
+    }
+  },
+  "nym:Democratic Republic of the Congo": {
+    "edges": {
+      "from": [
+        "country:CD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Democratic Republic of the Congo"
+    }
+  },
+  "nym:Democratic Socialist Republic of Sri Lanka": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Democratic Socialist Republic of Sri Lanka"
+    }
+  },
+  "nym:Deutschland": {
+    "edges": {
+      "from": [
+        "country:DE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Deutschland"
+    }
+  },
+  "nym:Dhivehi Raajje": {
+    "edges": {
+      "from": [
+        "country:MV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dhivehi Raajje"
+    }
+  },
+  "nym:Djibouti": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Djibouti"
+    }
+  },
+  "nym:Dominican Republic": {
+    "edges": {
+      "from": [
+        "country:DO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dominican Republic"
+    }
+  },
+  "nym:Dominique": {
+    "edges": {
+      "from": [
+        "country:DM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dominique"
+    }
+  },
+  "nym:Druk Yul": {
+    "edges": {
+      "from": [
+        "country:BT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Druk Yul"
+    }
+  },
+  "nym:Ducie and Oeno Islands": {
+    "edges": {
+      "from": [
+        "territory:PN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ducie and Oeno Islands"
+    }
+  },
+  "nym:Dutch East Indies": {
+    "edges": {
+      "from": [
+        "country:ID"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dutch East Indies"
+    }
+  },
+  "nym:Dzayer": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dzayer"
+    }
+  },
+  "nym:E Civitate Vaticana": {
+    "edges": {
+      "from": [
+        "country:VA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "E Civitate Vaticana"
+    }
+  },
+  "nym:EC": {
+    "edges": {
+      "from": [
+        "country:EC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "EC"
+    }
+  },
+  "nym:EE": {
+    "edges": {
+      "from": [
+        "country:EE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "EE"
+    }
+  },
+  "nym:EG": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "EG"
+    }
+  },
+  "nym:EH": {
+    "edges": {
+      "from": [
+        "territory:EH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "EH"
+    }
+  },
+  "nym:ENG": {
+    "edges": {
+      "from": [
+        "uk:ENG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ENG"
+    }
+  },
+  "nym:ER": {
+    "edges": {
+      "from": [
+        "country:ER"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ER"
+    }
+  },
+  "nym:ES": {
+    "edges": {
+      "from": [
+        "country:ES"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ES"
+    }
+  },
+  "nym:ES-CE": {
+    "edges": {
+      "from": [
+        "territory:ES-CE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ES-CE"
+    }
+  },
+  "nym:ES-ML": {
+    "edges": {
+      "from": [
+        "territory:ES-ML"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ES-ML"
+    }
+  },
+  "nym:ET": {
+    "edges": {
+      "from": [
+        "country:ET"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ET"
+    }
+  },
+  "nym:East Pakistan": {
+    "edges": {
+      "from": [
+        "country:BD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "East Pakistan"
+    }
+  },
+  "nym:Eastern Samoa": {
+    "edges": {
+      "from": [
+        "territory:AS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Eastern Samoa"
+    }
+  },
+  "nym:Eesti": {
+    "edges": {
+      "from": [
+        "country:EE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Eesti"
+    }
+  },
+  "nym:Egpyt": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Egpyt"
+    }
+  },
+  "nym:Egyot": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Egyot"
+    }
+  },
+  "nym:Egyt": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Egyt"
+    }
+  },
+  "nym:Eire": {
+    "edges": {
+      "from": [
+        "country:IE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Eire"
+    }
+  },
+  "nym:Ellada": {
+    "edges": {
+      "from": [
+        "country:GR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ellada"
+    }
+  },
+  "nym:Ellan Vannin": {
+    "edges": {
+      "from": [
+        "territory:IM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ellan Vannin"
+    }
+  },
+  "nym:Ellas": {
+    "edges": {
+      "from": [
+        "country:GR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ellas"
+    }
+  },
+  "nym:Ellice Islands": {
+    "edges": {
+      "from": [
+        "country:TV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ellice Islands"
+    }
+  },
+  "nym:Elmeɣrib": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Elmeɣrib"
+    }
+  },
+  "nym:Emirate of Abu Dhabi": {
+    "edges": {
+      "from": [
+        "territory:AE-AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Emirate of Abu Dhabi"
+    }
+  },
+  "nym:Emirate of Ajman": {
+    "edges": {
+      "from": [
+        "territory:AE-AJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Emirate of Ajman"
+    }
+  },
+  "nym:Emirate of Dubai": {
+    "edges": {
+      "from": [
+        "territory:AE-DU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Emirate of Dubai"
+    }
+  },
+  "nym:Emirate of Fujairah": {
+    "edges": {
+      "from": [
+        "territory:AE-FU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Emirate of Fujairah"
+    }
+  },
+  "nym:Emirate of Ras al-Khaimah": {
+    "edges": {
+      "from": [
+        "territory:AE-RK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Emirate of Ras al-Khaimah"
+    }
+  },
+  "nym:Emirate of Sharjah": {
+    "edges": {
+      "from": [
+        "territory:AE-SH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Emirate of Sharjah"
+    }
+  },
+  "nym:Emirate of Umm al-Quwain": {
+    "edges": {
+      "from": [
+        "territory:AE-UQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Emirate of Umm al-Quwain"
+    }
+  },
+  "nym:England": {
+    "edges": {
+      "from": [
+        "uk:ENG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "England"
+    }
+  },
+  "nym:Englsnd": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Englsnd"
+    }
+  },
+  "nym:Ertra": {
+    "edges": {
+      "from": [
+        "country:ER"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ertra"
+    }
+  },
+  "nym:Espainia": {
+    "edges": {
+      "from": [
+        "country:ES"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Espainia"
+    }
+  },
+  "nym:Espanha": {
+    "edges": {
+      "from": [
+        "country:ES"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Espanha"
+    }
+  },
+  "nym:Espanya": {
+    "edges": {
+      "from": [
+        "country:ES"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Espanya"
+    }
+  },
+  "nym:España": {
+    "edges": {
+      "from": [
+        "country:ES"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "España"
+    }
+  },
+  "nym:Estados Unidos": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Estados Unidos"
+    }
+  },
+  "nym:Esthonia": {
+    "edges": {
+      "from": [
+        "country:EE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Esthonia"
+    }
+  },
+  "nym:Eswatini": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Eswatini"
+    }
+  },
+  "nym:Ethopi": {
+    "edges": {
+      "from": [
+        "country:ET"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ethopi"
+    }
+  },
+  "nym:FI": {
+    "edges": {
+      "from": [
+        "country:FI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "FI"
+    }
+  },
+  "nym:FJ": {
+    "edges": {
+      "from": [
+        "country:FJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "FJ"
+    }
+  },
+  "nym:FK": {
+    "edges": {
+      "from": [
+        "territory:FK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "FK"
+    }
+  },
+  "nym:FM": {
+    "edges": {
+      "from": [
+        "country:FM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "FM"
+    }
+  },
+  "nym:FO": {
+    "edges": {
+      "from": [
+        "territory:FO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "FO"
+    }
+  },
+  "nym:FR": {
+    "edges": {
+      "from": [
+        "country:FR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "FR"
+    }
+  },
+  "nym:FRG": {
+    "edges": {
+      "from": [
+        "country:DE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "FRG"
+    }
+  },
+  "nym:Falkland Islands": {
+    "edges": {
+      "from": [
+        "territory:FK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Falkland Islands"
+    }
+  },
+  "nym:Faroe Islands": {
+    "edges": {
+      "from": [
+        "territory:FO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Faroe Islands"
+    }
+  },
+  "nym:Faroes": {
+    "edges": {
+      "from": [
+        "territory:FO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Faroes"
+    }
+  },
+  "nym:Federal Democratic Republic of Ethiopia": {
+    "edges": {
+      "from": [
+        "country:ET"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federal Democratic Republic of Ethiopia"
+    }
+  },
+  "nym:Federal Democratic Republic of Nepal": {
+    "edges": {
+      "from": [
+        "country:NP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federal Democratic Republic of Nepal"
+    }
+  },
+  "nym:Federal Islamic Republic of the Comoros": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federal Islamic Republic of the Comoros"
+    }
+  },
+  "nym:Federal Republic of Germany": {
+    "edges": {
+      "from": [
+        "country:DE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federal Republic of Germany"
+    }
+  },
+  "nym:Federal Republic of Nigeria": {
+    "edges": {
+      "from": [
+        "country:NG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federal Republic of Nigeria"
+    }
+  },
+  "nym:Federal Republic of Somalia": {
+    "edges": {
+      "from": [
+        "country:SO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federal Republic of Somalia"
+    }
+  },
+  "nym:Federal Republic of Somaliaaiai": {
+    "edges": {
+      "from": [
+        "country:SO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federal Republic of Somaliaaiai"
+    }
+  },
+  "nym:Federated States of Micronesia": {
+    "edges": {
+      "from": [
+        "country:FM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federated States of Micronesia"
+    }
+  },
+  "nym:Federation of Malaysia": {
+    "edges": {
+      "from": [
+        "country:MY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federation of Malaysia"
+    }
+  },
+  "nym:Federation of Saint Christopher and Nevis": {
+    "edges": {
+      "from": [
+        "country:KN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federation of Saint Christopher and Nevis"
+    }
+  },
+  "nym:Federative Republic of Brazil": {
+    "edges": {
+      "from": [
+        "country:BR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Federative Republic of Brazil"
+    }
+  },
+  "nym:Fiji": {
+    "edges": {
+      "from": [
+        "country:FJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Fiji"
+    }
+  },
+  "nym:French Congo": {
+    "edges": {
+      "from": [
+        "country:CG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Congo"
+    }
+  },
+  "nym:French Guiana": {
+    "edges": {
+      "from": [
+        "territory:GF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Guiana"
+    }
+  },
+  "nym:French Guinea": {
+    "edges": {
+      "from": [
+        "country:GN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Guinea"
+    }
+  },
+  "nym:French Oceania": {
+    "edges": {
+      "from": [
+        "territory:PF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Oceania"
+    }
+  },
+  "nym:French Polynesia": {
+    "edges": {
+      "from": [
+        "territory:PF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Polynesia"
+    }
+  },
+  "nym:French Republic": {
+    "edges": {
+      "from": [
+        "country:FR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Republic"
+    }
+  },
+  "nym:French Southern Territories": {
+    "edges": {
+      "from": [
+        "territory:TF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Southern Territories"
+    }
+  },
+  "nym:French Sudan": {
+    "edges": {
+      "from": [
+        "country:ML"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Sudan"
+    }
+  },
+  "nym:Friendly islands": {
+    "edges": {
+      "from": [
+        "country:TO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Friendly islands"
+    }
+  },
+  "nym:Færøerne": {
+    "edges": {
+      "from": [
+        "territory:FO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Færøerne"
+    }
+  },
+  "nym:Føroyar": {
+    "edges": {
+      "from": [
+        "territory:FO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Føroyar"
+    }
+  },
+  "nym:GA": {
+    "edges": {
+      "from": [
+        "country:GA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GA"
+    }
+  },
+  "nym:GB": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GB"
+    }
+  },
+  "nym:GBN": {
+    "edges": {
+      "from": [
+        "uk:GBN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GBN"
+    }
+  },
+  "nym:GD": {
+    "edges": {
+      "from": [
+        "country:GD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GD"
+    }
+  },
+  "nym:GE": {
+    "edges": {
+      "from": [
+        "country:GE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GE"
+    }
+  },
+  "nym:GF": {
+    "edges": {
+      "from": [
+        "territory:GF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GF"
+    }
+  },
+  "nym:GG": {
+    "edges": {
+      "from": [
+        "territory:GG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GG"
+    }
+  },
+  "nym:GH": {
+    "edges": {
+      "from": [
+        "country:GH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GH"
+    }
+  },
+  "nym:GI": {
+    "edges": {
+      "from": [
+        "territory:GI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GI"
+    }
+  },
+  "nym:GL": {
+    "edges": {
+      "from": [
+        "territory:GL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GL"
+    }
+  },
+  "nym:GM": {
+    "edges": {
+      "from": [
+        "country:GM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GM"
+    }
+  },
+  "nym:GN": {
+    "edges": {
+      "from": [
+        "country:GN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GN"
+    }
+  },
+  "nym:GP": {
+    "edges": {
+      "from": [
+        "territory:GP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GP"
+    }
+  },
+  "nym:GQ": {
+    "edges": {
+      "from": [
+        "country:GQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GQ"
+    }
+  },
+  "nym:GR": {
+    "edges": {
+      "from": [
+        "country:GR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GR"
+    }
+  },
+  "nym:GS": {
+    "edges": {
+      "from": [
+        "territory:GS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GS"
+    }
+  },
+  "nym:GT": {
+    "edges": {
+      "from": [
+        "country:GT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GT"
+    }
+  },
+  "nym:GU": {
+    "edges": {
+      "from": [
+        "territory:GU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GU"
+    }
+  },
+  "nym:GW": {
+    "edges": {
+      "from": [
+        "country:GW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GW"
+    }
+  },
+  "nym:GY": {
+    "edges": {
+      "from": [
+        "country:GY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "GY"
+    }
+  },
+  "nym:Gabonese Republic": {
+    "edges": {
+      "from": [
+        "country:GA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gabonese Republic"
+    }
+  },
+  "nym:Gabun": {
+    "edges": {
+      "from": [
+        "country:GA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gabun"
+    }
+  },
+  "nym:Gabuuti": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gabuuti"
+    }
+  },
+  "nym:Genus Argentina": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Genus Argentina"
+    }
+  },
+  "nym:Georgia": {
+    "edges": {
+      "from": [
+        "country:GE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Georgia"
+    }
+  },
+  "nym:Germany Democratic Republic": {
+    "edges": {
+      "from": [
+        "country:DD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Germany Democratic Republic"
+    }
+  },
+  "nym:Gibraltar": {
+    "edges": {
+      "from": [
+        "territory:GI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gibraltar"
+    }
+  },
+  "nym:Gine": {
+    "edges": {
+      "from": [
+        "country:GN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gine"
+    }
+  },
+  "nym:Gold Coast": {
+    "edges": {
+      "from": [
+        "country:GH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gold Coast"
+    }
+  },
+  "nym:Grand Duchy of Luxembourg": {
+    "edges": {
+      "from": [
+        "country:LU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Grand Duchy of Luxembourg"
+    }
+  },
+  "nym:Grat Britain": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Grat Britain"
+    }
+  },
+  "nym:Great Britain": {
+    "edges": {
+      "from": [
+        "uk:GBN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Great Britain"
+    }
+  },
+  "nym:Great Britan": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Great Britan"
+    }
+  },
+  "nym:Greenland": {
+    "edges": {
+      "from": [
+        "territory:GL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Greenland"
+    }
+  },
+  "nym:Grenada": {
+    "edges": {
+      "from": [
+        "country:GD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Grenada"
+    }
+  },
+  "nym:Gret Britain": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gret Britain"
+    }
+  },
+  "nym:Gronland": {
+    "edges": {
+      "from": [
+        "territory:GL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gronland"
+    }
+  },
+  "nym:Grønland": {
+    "edges": {
+      "from": [
+        "territory:GL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Grønland"
+    }
+  },
+  "nym:Guadeloupe": {
+    "edges": {
+      "from": [
+        "territory:GP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guadeloupe"
+    }
+  },
+  "nym:Guinea Ecuatorial": {
+    "edges": {
+      "from": [
+        "country:GQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guinea Ecuatorial"
+    }
+  },
+  "nym:Guinée": {
+    "edges": {
+      "from": [
+        "country:GN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guinée"
+    }
+  },
+  "nym:Guyane": {
+    "edges": {
+      "from": [
+        "territory:GF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guyane"
+    }
+  },
+  "nym:Guåhån": {
+    "edges": {
+      "from": [
+        "territory:GU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guåhån"
+    }
+  },
+  "nym:HK": {
+    "edges": {
+      "from": [
+        "territory:HK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "HK"
+    }
+  },
+  "nym:HM": {
+    "edges": {
+      "from": [
+        "territory:HM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "HM"
+    }
+  },
+  "nym:HN": {
+    "edges": {
+      "from": [
+        "country:HN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "HN"
+    }
+  },
+  "nym:HR": {
+    "edges": {
+      "from": [
+        "country:HR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "HR"
+    }
+  },
+  "nym:HT": {
+    "edges": {
+      "from": [
+        "country:HT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "HT"
+    }
+  },
+  "nym:HU": {
+    "edges": {
+      "from": [
+        "country:HU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "HU"
+    }
+  },
+  "nym:Hanguk": {
+    "edges": {
+      "from": [
+        "country:KR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hanguk"
+    }
+  },
+  "nym:Hashemite Kingdom of Jordan": {
+    "edges": {
+      "from": [
+        "country:JO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hashemite Kingdom of Jordan"
+    }
+  },
+  "nym:Hayastan": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hayastan"
+    }
+  },
+  "nym:Hayastán": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hayastán"
+    }
+  },
+  "nym:Haïti": {
+    "edges": {
+      "from": [
+        "country:HT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Haïti"
+    }
+  },
+  "nym:Hellas": {
+    "edges": {
+      "from": [
+        "country:GR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hellas"
+    }
+  },
+  "nym:Hellenic Republic": {
+    "edges": {
+      "from": [
+        "country:GR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hellenic Republic"
+    }
+  },
+  "nym:Henderson": {
+    "edges": {
+      "from": [
+        "territory:PN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Henderson"
+    }
+  },
+  "nym:Heung Gong": {
+    "edges": {
+      "from": [
+        "territory:HK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Heung Gong"
+    }
+  },
+  "nym:Hindustan": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hindustan"
+    }
+  },
+  "nym:Holland": {
+    "edges": {
+      "from": [
+        "country:NL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Holland"
+    }
+  },
+  "nym:Holy See": {
+    "edges": {
+      "from": [
+        "country:VA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Holy See"
+    }
+  },
+  "nym:Hong Kong Special Administrative Region": {
+    "edges": {
+      "from": [
+        "territory:HK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hong Kong Special Administrative Region"
+    }
+  },
+  "nym:Howland Island": {
+    "edges": {
+      "from": [
+        "territory:UM-84"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Howland Island"
+    }
+  },
+  "nym:Hrvatska": {
+    "edges": {
+      "from": [
+        "country:HR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hrvatska"
+    }
+  },
+  "nym:Hungary": {
+    "edges": {
+      "from": [
+        "country:HU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hungary"
+    }
+  },
+  "nym:I.O.T.": {
+    "edges": {
+      "from": [
+        "territory:IO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "I.O.T."
+    }
+  },
+  "nym:ID": {
+    "edges": {
+      "from": [
+        "country:ID"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ID"
+    }
+  },
+  "nym:IE": {
+    "edges": {
+      "from": [
+        "country:IE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IE"
+    }
+  },
+  "nym:IL": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IL"
+    }
+  },
+  "nym:IM": {
+    "edges": {
+      "from": [
+        "territory:IM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IM"
+    }
+  },
+  "nym:IN": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IN"
+    }
+  },
+  "nym:IO": {
+    "edges": {
+      "from": [
+        "territory:IO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IO"
+    }
+  },
+  "nym:IOT": {
+    "edges": {
+      "from": [
+        "territory:IO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IOT"
+    }
+  },
+  "nym:IQ": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IQ"
+    }
+  },
+  "nym:IR": {
+    "edges": {
+      "from": [
+        "country:IR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IR"
+    }
+  },
+  "nym:IS": {
+    "edges": {
+      "from": [
+        "country:IS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IS"
+    }
+  },
+  "nym:IT": {
+    "edges": {
+      "from": [
+        "country:IT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "IT"
+    }
+  },
+  "nym:Independent State of Papua New Guinea": {
+    "edges": {
+      "from": [
+        "country:PG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Independent State of Papua New Guinea"
+    }
+  },
+  "nym:Independent State of Samoa": {
+    "edges": {
+      "from": [
+        "country:WS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Independent State of Samoa"
+    }
+  },
+  "nym:Irak": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Irak"
+    }
+  },
+  "nym:Ireland": {
+    "edges": {
+      "from": [
+        "country:IE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ireland"
+    }
+  },
+  "nym:Irelend": {
+    "edges": {
+      "from": [
+        "country:IE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Irelend"
+    }
+  },
+  "nym:Irish Republic": {
+    "edges": {
+      "from": [
+        "country:IE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Irish Republic"
+    }
+  },
+  "nym:Iritriya": {
+    "edges": {
+      "from": [
+        "country:ER"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Iritriya"
+    }
+  },
+  "nym:Islamic Republic of Afghanistan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Islamic Republic of Afghanistan"
+    }
+  },
+  "nym:Islamic Republic of Gambia": {
+    "edges": {
+      "from": [
+        "country:GM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Islamic Republic of Gambia"
+    }
+  },
+  "nym:Islamic Republic of Iran": {
+    "edges": {
+      "from": [
+        "country:IR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Islamic Republic of Iran"
+    }
+  },
+  "nym:Islamic Republic of Mauritania": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Islamic Republic of Mauritania"
+    }
+  },
+  "nym:Islamic Republic of Pakistan": {
+    "edges": {
+      "from": [
+        "country:PK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Islamic Republic of Pakistan"
+    }
+  },
+  "nym:Island": {
+    "edges": {
+      "from": [
+        "country:IS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Island"
+    }
+  },
+  "nym:Island of Guernsey": {
+    "edges": {
+      "from": [
+        "territory:GG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Island of Guernsey"
+    }
+  },
+  "nym:Island of Jersey": {
+    "edges": {
+      "from": [
+        "territory:JE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Island of Jersey"
+    }
+  },
+  "nym:Isle of Man": {
+    "edges": {
+      "from": [
+        "territory:IM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Isle of Man"
+    }
+  },
+  "nym:Israʼiyl": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Israʼiyl"
+    }
+  },
+  "nym:Isreal": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Isreal"
+    }
+  },
+  "nym:Italia": {
+    "edges": {
+      "from": [
+        "country:IT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Italia"
+    }
+  },
+  "nym:Italian Republic": {
+    "edges": {
+      "from": [
+        "country:IT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Italian Republic"
+    }
+  },
+  "nym:Itlay": {
+    "edges": {
+      "from": [
+        "country:IT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Itlay"
+    }
+  },
+  "nym:Ityop'ia": {
+    "edges": {
+      "from": [
+        "country:ET"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ityop'ia"
+    }
+  },
+  "nym:JE": {
+    "edges": {
+      "from": [
+        "territory:JE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "JE"
+    }
+  },
+  "nym:JM": {
+    "edges": {
+      "from": [
+        "country:JM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "JM"
+    }
+  },
+  "nym:JO": {
+    "edges": {
+      "from": [
+        "country:JO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "JO"
+    }
+  },
+  "nym:JP": {
+    "edges": {
+      "from": [
+        "country:JP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "JP"
+    }
+  },
+  "nym:Jabuuti": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jabuuti"
+    }
+  },
+  "nym:Jamaca": {
+    "edges": {
+      "from": [
+        "country:JM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jamaca"
+    }
+  },
+  "nym:Jamacia": {
+    "edges": {
+      "from": [
+        "country:JM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jamacia"
+    }
+  },
+  "nym:Jamahiriya": {
+    "edges": {
+      "from": [
+        "country:LY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jamahiriya"
+    }
+  },
+  "nym:Jamaica": {
+    "edges": {
+      "from": [
+        "country:JM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jamaica"
+    }
+  },
+  "nym:Japan": {
+    "edges": {
+      "from": [
+        "country:JP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Japan"
+    }
+  },
+  "nym:Jarvis Island": {
+    "edges": {
+      "from": [
+        "territory:UM-86"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jarvis Island"
+    }
+  },
+  "nym:Johnston Atoll": {
+    "edges": {
+      "from": [
+        "territory:UM-67"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Johnston Atoll"
+    }
+  },
+  "nym:Jugoslavija": {
+    "edges": {
+      "from": [
+        "country:YU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jugoslavija"
+    }
+  },
+  "nym:Juzur al-Qamar": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Juzur al-Qamar"
+    }
+  },
+  "nym:Jèrri": {
+    "edges": {
+      "from": [
+        "country:TV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jèrri"
+    }
+  },
+  "nym:Jībūtī": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jībūtī"
+    }
+  },
+  "nym:KE": {
+    "edges": {
+      "from": [
+        "country:KE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KE"
+    }
+  },
+  "nym:KG": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KG"
+    }
+  },
+  "nym:KH": {
+    "edges": {
+      "from": [
+        "country:KH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KH"
+    }
+  },
+  "nym:KI": {
+    "edges": {
+      "from": [
+        "country:KI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KI"
+    }
+  },
+  "nym:KM": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KM"
+    }
+  },
+  "nym:KN": {
+    "edges": {
+      "from": [
+        "country:KN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KN"
+    }
+  },
+  "nym:KP": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KP"
+    }
+  },
+  "nym:KR": {
+    "edges": {
+      "from": [
+        "country:KR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KR"
+    }
+  },
+  "nym:KW": {
+    "edges": {
+      "from": [
+        "country:KW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KW"
+    }
+  },
+  "nym:KY": {
+    "edges": {
+      "from": [
+        "territory:KY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KY"
+    }
+  },
+  "nym:KZ": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "KZ"
+    }
+  },
+  "nym:Kalaallit Nunaat": {
+    "edges": {
+      "from": [
+        "territory:GL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kalaallit Nunaat"
+    }
+  },
+  "nym:Kampuchea": {
+    "edges": {
+      "from": [
+        "country:KH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kampuchea"
+    }
+  },
+  "nym:Katar": {
+    "edges": {
+      "from": [
+        "country:QA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Katar"
+    }
+  },
+  "nym:Kazakh": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kazakh"
+    }
+  },
+  "nym:Kazakhstán": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kazakhstán"
+    }
+  },
+  "nym:Kazakstan": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kazakstan"
+    }
+  },
+  "nym:Kingdom of Bahrain": {
+    "edges": {
+      "from": [
+        "country:BH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Bahrain"
+    }
+  },
+  "nym:Kingdom of Belgium": {
+    "edges": {
+      "from": [
+        "country:BE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Belgium"
+    }
+  },
+  "nym:Kingdom of Bhutan": {
+    "edges": {
+      "from": [
+        "country:BT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Bhutan"
+    }
+  },
+  "nym:Kingdom of Cambodia": {
+    "edges": {
+      "from": [
+        "country:KH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Cambodia"
+    }
+  },
+  "nym:Kingdom of Denmark": {
+    "edges": {
+      "from": [
+        "country:DK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Denmark"
+    }
+  },
+  "nym:Kingdom of Eswatini": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Eswatini"
+    }
+  },
+  "nym:Kingdom of Lesotho": {
+    "edges": {
+      "from": [
+        "country:LS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Lesotho"
+    }
+  },
+  "nym:Kingdom of Moroccoal-Magrib": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Moroccoal-Magrib"
+    }
+  },
+  "nym:Kingdom of Norway": {
+    "edges": {
+      "from": [
+        "country:NO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Norway"
+    }
+  },
+  "nym:Kingdom of Saudi Arabia": {
+    "edges": {
+      "from": [
+        "country:SA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Saudi Arabia"
+    }
+  },
+  "nym:Kingdom of Spain": {
+    "edges": {
+      "from": [
+        "country:ES"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Spain"
+    }
+  },
+  "nym:Kingdom of Swaziland": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Swaziland"
+    }
+  },
+  "nym:Kingdom of Sweden": {
+    "edges": {
+      "from": [
+        "country:SE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Sweden"
+    }
+  },
+  "nym:Kingdom of Thailand": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Thailand"
+    }
+  },
+  "nym:Kingdom of Tonga": {
+    "edges": {
+      "from": [
+        "country:TO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of Tonga"
+    }
+  },
+  "nym:Kingdom of the Netherlands": {
+    "edges": {
+      "from": [
+        "country:NL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingdom of the Netherlands"
+    }
+  },
+  "nym:Kingman Reef": {
+    "edges": {
+      "from": [
+        "territory:UM-89"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingman Reef"
+    }
+  },
+  "nym:Kirghizia": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kirghizia"
+    }
+  },
+  "nym:Kirghizstan": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kirghizstan"
+    }
+  },
+  "nym:Kirgiz": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kirgiz"
+    }
+  },
+  "nym:Kirgizia": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kirgizia"
+    }
+  },
+  "nym:Kirgizija": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kirgizija"
+    }
+  },
+  "nym:Kirgizstan": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kirgizstan"
+    }
+  },
+  "nym:Komori": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Komori"
+    }
+  },
+  "nym:Kosova": {
+    "edges": {
+      "from": [
+        "country:XK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kosova"
+    }
+  },
+  "nym:Koweit": {
+    "edges": {
+      "from": [
+        "country:KW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Koweit"
+    }
+  },
+  "nym:Kypros": {
+    "edges": {
+      "from": [
+        "country:CY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kypros"
+    }
+  },
+  "nym:Kyrgyz Republic": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kyrgyz Republic"
+    }
+  },
+  "nym:Kyrgyz Republickirghiz": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kyrgyz Republickirghiz"
+    }
+  },
+  "nym:Kyrgyzstan": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kyrgyzstan"
+    }
+  },
+  "nym:Kòrsou": {
+    "edges": {
+      "from": [
+        "territory:CW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kòrsou"
+    }
+  },
+  "nym:Ködörösêse tî Bêafrîka": {
+    "edges": {
+      "from": [
+        "country:CF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ködörösêse tî Bêafrîka"
+    }
+  },
+  "nym:Kýpros": {
+    "edges": {
+      "from": [
+        "country:CY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kýpros"
+    }
+  },
+  "nym:Kıbrıs": {
+    "edges": {
+      "from": [
+        "country:CY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kıbrıs"
+    }
+  },
+  "nym:LA": {
+    "edges": {
+      "from": [
+        "country:LA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LA"
+    }
+  },
+  "nym:LB": {
+    "edges": {
+      "from": [
+        "country:LB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LB"
+    }
+  },
+  "nym:LC": {
+    "edges": {
+      "from": [
+        "country:LC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LC"
+    }
+  },
+  "nym:LI": {
+    "edges": {
+      "from": [
+        "country:LI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LI"
+    }
+  },
+  "nym:LK": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LK"
+    }
+  },
+  "nym:LR": {
+    "edges": {
+      "from": [
+        "country:LR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LR"
+    }
+  },
+  "nym:LS": {
+    "edges": {
+      "from": [
+        "country:LS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LS"
+    }
+  },
+  "nym:LT": {
+    "edges": {
+      "from": [
+        "country:LT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LT"
+    }
+  },
+  "nym:LU": {
+    "edges": {
+      "from": [
+        "country:LU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LU"
+    }
+  },
+  "nym:LV": {
+    "edges": {
+      "from": [
+        "country:LV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LV"
+    }
+  },
+  "nym:LY": {
+    "edges": {
+      "from": [
+        "country:LY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "LY"
+    }
+  },
+  "nym:Lao": {
+    "edges": {
+      "from": [
+        "country:LA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lao"
+    }
+  },
+  "nym:Lao People's Democratic Republic": {
+    "edges": {
+      "from": [
+        "country:LA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lao People's Democratic Republic"
+    }
+  },
+  "nym:Las Malvinas": {
+    "edges": {
+      "from": [
+        "territory:FK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Las Malvinas"
+    }
+  },
+  "nym:Latvija": {
+    "edges": {
+      "from": [
+        "country:LV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Latvija"
+    }
+  },
+  "nym:Latvijaz": {
+    "edges": {
+      "from": [
+        "country:LV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Latvijaz"
+    }
+  },
+  "nym:Lebanese Republic": {
+    "edges": {
+      "from": [
+        "country:LB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lebanese Republic"
+    }
+  },
+  "nym:Libya": {
+    "edges": {
+      "from": [
+        "country:LY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Libya"
+    }
+  },
+  "nym:Lietuva": {
+    "edges": {
+      "from": [
+        "country:LT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lietuva"
+    }
+  },
+  "nym:Lubnān": {
+    "edges": {
+      "from": [
+        "country:LB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lubnān"
+    }
+  },
+  "nym:Luxemborg": {
+    "edges": {
+      "from": [
+        "country:LU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Luxemborg"
+    }
+  },
+  "nym:Luxemburg": {
+    "edges": {
+      "from": [
+        "country:LU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Luxemburg"
+    }
+  },
+  "nym:Lëtzebuerg": {
+    "edges": {
+      "from": [
+        "country:LU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lëtzebuerg"
+    }
+  },
+  "nym:Lībiyā": {
+    "edges": {
+      "from": [
+        "country:LY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Lībiyā"
+    }
+  },
+  "nym:MA": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MA"
+    }
+  },
+  "nym:MC": {
+    "edges": {
+      "from": [
+        "country:MC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MC"
+    }
+  },
+  "nym:MD": {
+    "edges": {
+      "from": [
+        "country:MD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MD"
+    }
+  },
+  "nym:ME": {
+    "edges": {
+      "from": [
+        "country:ME"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ME"
+    }
+  },
+  "nym:MF": {
+    "edges": {
+      "from": [
+        "territory:MF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MF"
+    }
+  },
+  "nym:MG": {
+    "edges": {
+      "from": [
+        "country:MG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MG"
+    }
+  },
+  "nym:MH": {
+    "edges": {
+      "from": [
+        "country:MH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MH"
+    }
+  },
+  "nym:MK": {
+    "edges": {
+      "from": [
+        "country:MK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MK"
+    }
+  },
+  "nym:ML": {
+    "edges": {
+      "from": [
+        "country:ML"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ML"
+    }
+  },
+  "nym:MM": {
+    "edges": {
+      "from": [
+        "country:MM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MM"
+    }
+  },
+  "nym:MN": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MN"
+    }
+  },
+  "nym:MO": {
+    "edges": {
+      "from": [
+        "territory:MO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MO"
+    }
+  },
+  "nym:MP": {
+    "edges": {
+      "from": [
+        "territory:MP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MP"
+    }
+  },
+  "nym:MQ": {
+    "edges": {
+      "from": [
+        "territory:MQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MQ"
+    }
+  },
+  "nym:MR": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MR"
+    }
+  },
+  "nym:MS": {
+    "edges": {
+      "from": [
+        "territory:MS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MS"
+    }
+  },
+  "nym:MT": {
+    "edges": {
+      "from": [
+        "country:MT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MT"
+    }
+  },
+  "nym:MU": {
+    "edges": {
+      "from": [
+        "country:MU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MU"
+    }
+  },
+  "nym:MV": {
+    "edges": {
+      "from": [
+        "country:MV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MV"
+    }
+  },
+  "nym:MW": {
+    "edges": {
+      "from": [
+        "country:MW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MW"
+    }
+  },
+  "nym:MX": {
+    "edges": {
+      "from": [
+        "country:MX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MX"
+    }
+  },
+  "nym:MY": {
+    "edges": {
+      "from": [
+        "country:MY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MY"
+    }
+  },
+  "nym:MZ": {
+    "edges": {
+      "from": [
+        "country:MZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "MZ"
+    }
+  },
+  "nym:Macao Special Administrative Region": {
+    "edges": {
+      "from": [
+        "territory:MO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Macao Special Administrative Region"
+    }
+  },
+  "nym:Macedon": {
+    "edges": {
+      "from": [
+        "country:MK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Macedon"
+    }
+  },
+  "nym:Madagascar": {
+    "edges": {
+      "from": [
+        "country:MG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Madagascar"
+    }
+  },
+  "nym:Madagasikara": {
+    "edges": {
+      "from": [
+        "country:MG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Madagasikara"
+    }
+  },
+  "nym:Magyarorszag": {
+    "edges": {
+      "from": [
+        "country:HU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Magyarorszag"
+    }
+  },
+  "nym:Magyarország": {
+    "edges": {
+      "from": [
+        "country:HU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Magyarország"
+    }
+  },
+  "nym:Mainland china": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mainland china"
+    }
+  },
+  "nym:Makedonija": {
+    "edges": {
+      "from": [
+        "country:MK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Makedonija"
+    }
+  },
+  "nym:Malagasy Republic": {
+    "edges": {
+      "from": [
+        "country:MG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Malagasy Republic"
+    }
+  },
+  "nym:Malaysia": {
+    "edges": {
+      "from": [
+        "country:MY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Malaysia"
+    }
+  },
+  "nym:Malyasi": {
+    "edges": {
+      "from": [
+        "country:MY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Malyasi"
+    }
+  },
+  "nym:Malēṣiyā": {
+    "edges": {
+      "from": [
+        "country:MY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Malēṣiyā"
+    }
+  },
+  "nym:Maroc": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Maroc"
+    }
+  },
+  "nym:Marruecos": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Marruecos"
+    }
+  },
+  "nym:Martinique": {
+    "edges": {
+      "from": [
+        "territory:MQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Martinique"
+    }
+  },
+  "nym:Masr": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Masr"
+    }
+  },
+  "nym:Maurice": {
+    "edges": {
+      "from": [
+        "country:MU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Maurice"
+    }
+  },
+  "nym:Mauritanie": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mauritanie"
+    }
+  },
+  "nym:Mauritius": {
+    "edges": {
+      "from": [
+        "country:MU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mauritius"
+    }
+  },
+  "nym:Mayotte": {
+    "edges": {
+      "from": [
+        "territory:YT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mayotte"
+    }
+  },
+  "nym:Melilla": {
+    "edges": {
+      "from": [
+        "territory:ES-ML"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Melilla"
+    }
+  },
+  "nym:Mexcio": {
+    "edges": {
+      "from": [
+        "country:MX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mexcio"
+    }
+  },
+  "nym:Mexicanos": {
+    "edges": {
+      "from": [
+        "country:MX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mexicanos"
+    }
+  },
+  "nym:Mexixo": {
+    "edges": {
+      "from": [
+        "country:MX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mexixo"
+    }
+  },
+  "nym:Midway Islands": {
+    "edges": {
+      "from": [
+        "territory:UM-71"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Midway Islands"
+    }
+  },
+  "nym:Misr": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Misr"
+    }
+  },
+  "nym:Mocambique": {
+    "edges": {
+      "from": [
+        "country:MZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mocambique"
+    }
+  },
+  "nym:Moldavia": {
+    "edges": {
+      "from": [
+        "country:MD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Moldavia"
+    }
+  },
+  "nym:Mongol Uls": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mongol Uls"
+    }
+  },
+  "nym:Mongolia": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mongolia"
+    }
+  },
+  "nym:Mongγol Ulus": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mongγol Ulus"
+    }
+  },
+  "nym:Mongγol ulus": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mongγol ulus"
+    }
+  },
+  "nym:Montenegro": {
+    "edges": {
+      "from": [
+        "country:ME"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Montenegro"
+    }
+  },
+  "nym:Montserrat": {
+    "edges": {
+      "from": [
+        "territory:MS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Montserrat"
+    }
+  },
+  "nym:Moris": {
+    "edges": {
+      "from": [
+        "country:MU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Moris"
+    }
+  },
+  "nym:Moçambique": {
+    "edges": {
+      "from": [
+        "country:MZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Moçambique"
+    }
+  },
+  "nym:Mueang Thai": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mueang Thai"
+    }
+  },
+  "nym:Muritan": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Muritan"
+    }
+  },
+  "nym:Muritaniya": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Muritaniya"
+    }
+  },
+  "nym:Muscat and Oman": {
+    "edges": {
+      "from": [
+        "country:OM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Muscat and Oman"
+    }
+  },
+  "nym:Myanma": {
+    "edges": {
+      "from": [
+        "country:MM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Myanma"
+    }
+  },
+  "nym:México": {
+    "edges": {
+      "from": [
+        "country:MX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "México"
+    }
+  },
+  "nym:Mēxihco": {
+    "edges": {
+      "from": [
+        "country:MX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mēxihco"
+    }
+  },
+  "nym:Mūrītānyā": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mūrītānyā"
+    }
+  },
+  "nym:Mǎláixīyà": {
+    "edges": {
+      "from": [
+        "country:MY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mǎláixīyà"
+    }
+  },
+  "nym:NA": {
+    "edges": {
+      "from": [
+        "country:NA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NA"
+    }
+  },
+  "nym:NC": {
+    "edges": {
+      "from": [
+        "territory:NC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NC"
+    }
+  },
+  "nym:NE": {
+    "edges": {
+      "from": [
+        "country:NE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NE"
+    }
+  },
+  "nym:NF": {
+    "edges": {
+      "from": [
+        "territory:NF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NF"
+    }
+  },
+  "nym:NG": {
+    "edges": {
+      "from": [
+        "country:NG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NG"
+    }
+  },
+  "nym:NI": {
+    "edges": {
+      "from": [
+        "country:NI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NI"
+    }
+  },
+  "nym:NIR": {
+    "edges": {
+      "from": [
+        "uk:NIR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NIR"
+    }
+  },
+  "nym:NL": {
+    "edges": {
+      "from": [
+        "country:NL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NL"
+    }
+  },
+  "nym:NO": {
+    "edges": {
+      "from": [
+        "country:NO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NO"
+    }
+  },
+  "nym:NP": {
+    "edges": {
+      "from": [
+        "country:NP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NP"
+    }
+  },
+  "nym:NR": {
+    "edges": {
+      "from": [
+        "country:NR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NR"
+    }
+  },
+  "nym:NU": {
+    "edges": {
+      "from": [
+        "territory:NU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NU"
+    }
+  },
+  "nym:NZ": {
+    "edges": {
+      "from": [
+        "country:NZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "NZ"
+    }
+  },
+  "nym:Namhan": {
+    "edges": {
+      "from": [
+        "country:KR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Namhan"
+    }
+  },
+  "nym:Namibië": {
+    "edges": {
+      "from": [
+        "country:NA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Namibië"
+    }
+  },
+  "nym:Naoero": {
+    "edges": {
+      "from": [
+        "country:NR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Naoero"
+    }
+  },
+  "nym:Navassa Island": {
+    "edges": {
+      "from": [
+        "territory:UM-76"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Navassa Island"
+    }
+  },
+  "nym:Naíjíríà": {
+    "edges": {
+      "from": [
+        "country:NG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Naíjíríà"
+    }
+  },
+  "nym:Nederland": {
+    "edges": {
+      "from": [
+        "country:NL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nederland"
+    }
+  },
+  "nym:Nederlân": {
+    "edges": {
+      "from": [
+        "country:NL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nederlân"
+    }
+  },
+  "nym:Nepāl": {
+    "edges": {
+      "from": [
+        "country:NP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nepāl"
+    }
+  },
+  "nym:New Caledonia": {
+    "edges": {
+      "from": [
+        "territory:NC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "New Caledonia"
+    }
+  },
+  "nym:New Hebrides": {
+    "edges": {
+      "from": [
+        "country:VU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "New Hebrides"
+    }
+  },
+  "nym:New Zealand": {
+    "edges": {
+      "from": [
+        "country:NZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "New Zealand"
+    }
+  },
+  "nym:Ngwane": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ngwane"
+    }
+  },
+  "nym:Nihon": {
+    "edges": {
+      "from": [
+        "country:JP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nihon"
+    }
+  },
+  "nym:Nijar": {
+    "edges": {
+      "from": [
+        "country:NE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nijar"
+    }
+  },
+  "nym:Nijeriya": {
+    "edges": {
+      "from": [
+        "country:NG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nijeriya"
+    }
+  },
+  "nym:Nippon": {
+    "edges": {
+      "from": [
+        "country:JP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nippon"
+    }
+  },
+  "nym:Niue": {
+    "edges": {
+      "from": [
+        "territory:NU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Niue"
+    }
+  },
+  "nym:Niuē": {
+    "edges": {
+      "from": [
+        "territory:NU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Niuē"
+    }
+  },
+  "nym:Noreg": {
+    "edges": {
+      "from": [
+        "country:NO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Noreg"
+    }
+  },
+  "nym:Norge": {
+    "edges": {
+      "from": [
+        "country:NO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Norge"
+    }
+  },
+  "nym:North Korea": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "North Korea"
+    }
+  },
+  "nym:Northern Ireland": {
+    "edges": {
+      "from": [
+        "uk:NIR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Northern Ireland"
+    }
+  },
+  "nym:Northern Marianas": {
+    "edges": {
+      "from": [
+        "territory:MP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Northern Marianas"
+    }
+  },
+  "nym:Northern Rhodesia": {
+    "edges": {
+      "from": [
+        "country:ZM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Northern Rhodesia"
+    }
+  },
+  "nym:Nouvelle-Calédonie": {
+    "edges": {
+      "from": [
+        "territory:NC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nouvelle-Calédonie"
+    }
+  },
+  "nym:Nyasaland": {
+    "edges": {
+      "from": [
+        "country:MW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Nyasaland"
+    }
+  },
+  "nym:O'zbekstan": {
+    "edges": {
+      "from": [
+        "country:UZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "O'zbekstan"
+    }
+  },
+  "nym:OM": {
+    "edges": {
+      "from": [
+        "country:OM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "OM"
+    }
+  },
+  "nym:Occupied Palestinian Territories": {
+    "edges": {
+      "from": [
+        "territory:PS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Occupied Palestinian Territories"
+    }
+  },
+  "nym:Oesterreich": {
+    "edges": {
+      "from": [
+        "country:AT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Oesterreich"
+    }
+  },
+  "nym:Oriental Republic of Uruguay": {
+    "edges": {
+      "from": [
+        "country:UY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Oriental Republic of Uruguay"
+    }
+  },
+  "nym:Osterreich": {
+    "edges": {
+      "from": [
+        "country:AT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Osterreich"
+    }
+  },
+  "nym:Outer Mongolia": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Outer Mongolia"
+    }
+  },
+  "nym:O‘zbekiston": {
+    "edges": {
+      "from": [
+        "country:UZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "O‘zbekiston"
+    }
+  },
+  "nym:O’zbekstan": {
+    "edges": {
+      "from": [
+        "country:UZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "O’zbekstan"
+    }
+  },
+  "nym:PA": {
+    "edges": {
+      "from": [
+        "country:PA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PA"
+    }
+  },
+  "nym:PE": {
+    "edges": {
+      "from": [
+        "country:PE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PE"
+    }
+  },
+  "nym:PF": {
+    "edges": {
+      "from": [
+        "territory:PF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PF"
+    }
+  },
+  "nym:PG": {
+    "edges": {
+      "from": [
+        "country:PG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PG"
+    }
+  },
+  "nym:PH": {
+    "edges": {
+      "from": [
+        "country:PH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PH"
+    }
+  },
+  "nym:PK": {
+    "edges": {
+      "from": [
+        "country:PK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PK"
+    }
+  },
+  "nym:PL": {
+    "edges": {
+      "from": [
+        "country:PL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PL"
+    }
+  },
+  "nym:PM": {
+    "edges": {
+      "from": [
+        "territory:PM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PM"
+    }
+  },
+  "nym:PN": {
+    "edges": {
+      "from": [
+        "territory:PN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PN"
+    }
+  },
+  "nym:PNG": {
+    "edges": {
+      "from": [
+        "country:PG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PNG"
+    }
+  },
+  "nym:PR": {
+    "edges": {
+      "from": [
+        "territory:PR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PR"
+    }
+  },
+  "nym:PRC": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PRC"
+    }
+  },
+  "nym:PRK": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PRK"
+    }
+  },
+  "nym:PS": {
+    "edges": {
+      "from": [
+        "territory:PS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PS"
+    }
+  },
+  "nym:PT": {
+    "edges": {
+      "from": [
+        "country:PT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PT"
+    }
+  },
+  "nym:PW": {
+    "edges": {
+      "from": [
+        "country:PW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PW"
+    }
+  },
+  "nym:PY": {
+    "edges": {
+      "from": [
+        "country:PY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "PY"
+    }
+  },
+  "nym:Palmyra Atoll": {
+    "edges": {
+      "from": [
+        "territory:UM-95"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Palmyra Atoll"
+    }
+  },
+  "nym:Panamá": {
+    "edges": {
+      "from": [
+        "country:PA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Panamá"
+    }
+  },
+  "nym:Papua Niugini": {
+    "edges": {
+      "from": [
+        "country:PG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Papua Niugini"
+    }
+  },
+  "nym:Paraguái": {
+    "edges": {
+      "from": [
+        "country:PY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Paraguái"
+    }
+  },
+  "nym:Pelew": {
+    "edges": {
+      "from": [
+        "country:PW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Pelew"
+    }
+  },
+  "nym:People's Democratic Republic of Algeriaalgerie": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "People's Democratic Republic of Algeriaalgerie"
+    }
+  },
+  "nym:People's Republic of Bangladesh": {
+    "edges": {
+      "from": [
+        "country:BD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "People's Republic of Bangladesh"
+    }
+  },
+  "nym:People's Republic of China": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "People's Republic of China"
+    }
+  },
+  "nym:Peoples Republic": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Peoples Republic"
+    }
+  },
+  "nym:Persia": {
+    "edges": {
+      "from": [
+        "country:IR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Persia"
+    }
+  },
+  "nym:Perú": {
+    "edges": {
+      "from": [
+        "country:PE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Perú"
+    }
+  },
+  "nym:Philippine Islands": {
+    "edges": {
+      "from": [
+        "country:PH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Philippine Islands"
+    }
+  },
+  "nym:Phillippine": {
+    "edges": {
+      "from": [
+        "country:PH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Phillippine"
+    }
+  },
+  "nym:Pilipinas": {
+    "edges": {
+      "from": [
+        "country:PH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Pilipinas"
+    }
+  },
+  "nym:Pinas": {
+    "edges": {
+      "from": [
+        "country:PH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Pinas"
+    }
+  },
+  "nym:Piruw": {
+    "edges": {
+      "from": [
+        "country:PE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Piruw"
+    }
+  },
+  "nym:Pitcairn": {
+    "edges": {
+      "from": [
+        "territory:PN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Pitcairn"
+    }
+  },
+  "nym:Pitcairn, Henderson, Ducie and Oeno Islands": {
+    "edges": {
+      "from": [
+        "territory:PN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Pitcairn, Henderson, Ducie and Oeno Islands"
+    }
+  },
+  "nym:Plurinational State of Bolivia": {
+    "edges": {
+      "from": [
+        "country:BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Plurinational State of Bolivia"
+    }
+  },
+  "nym:Polska": {
+    "edges": {
+      "from": [
+        "country:PL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Polska"
+    }
+  },
+  "nym:Polynésie Française": {
+    "edges": {
+      "from": [
+        "territory:PF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Polynésie Française"
+    }
+  },
+  "nym:Polynésie française": {
+    "edges": {
+      "from": [
+        "territory:PF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Polynésie française"
+    }
+  },
+  "nym:Porto Rico": {
+    "edges": {
+      "from": [
+        "territory:PR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Porto Rico"
+    }
+  },
+  "nym:Portuguesa": {
+    "edges": {
+      "from": [
+        "country:PT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Portuguesa"
+    }
+  },
+  "nym:Portuguese Guinea": {
+    "edges": {
+      "from": [
+        "country:GW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Portuguese Guinea"
+    }
+  },
+  "nym:Portuguese Republic": {
+    "edges": {
+      "from": [
+        "country:PT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Portuguese Republic"
+    }
+  },
+  "nym:Prathet Thai": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Prathet Thai"
+    }
+  },
+  "nym:Principality of Andorra": {
+    "edges": {
+      "from": [
+        "country:AD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Principality of Andorra"
+    }
+  },
+  "nym:Principality of Liechtenstein": {
+    "edges": {
+      "from": [
+        "country:LI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Principality of Liechtenstein"
+    }
+  },
+  "nym:Principality of Monaco": {
+    "edges": {
+      "from": [
+        "country:MC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Principality of Monaco"
+    }
+  },
+  "nym:Puarto Rico": {
+    "edges": {
+      "from": [
+        "territory:PR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Puarto Rico"
+    }
+  },
+  "nym:QA": {
+    "edges": {
+      "from": [
+        "country:QA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "QA"
+    }
+  },
+  "nym:Qazaqstan": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Qazaqstan"
+    }
+  },
+  "nym:RE": {
+    "edges": {
+      "from": [
+        "territory:RE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "RE"
+    }
+  },
+  "nym:RO": {
+    "edges": {
+      "from": [
+        "country:RO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "RO"
+    }
+  },
+  "nym:RS": {
+    "edges": {
+      "from": [
+        "country:RS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "RS"
+    }
+  },
+  "nym:RSA": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "RSA"
+    }
+  },
+  "nym:RSM": {
+    "edges": {
+      "from": [
+        "country:SM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "RSM"
+    }
+  },
+  "nym:RU": {
+    "edges": {
+      "from": [
+        "country:RU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "RU"
+    }
+  },
+  "nym:RW": {
+    "edges": {
+      "from": [
+        "country:RW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "RW"
+    }
+  },
+  "nym:Rastafari": {
+    "edges": {
+      "from": [
+        "country:JM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rastafari"
+    }
+  },
+  "nym:Rastas": {
+    "edges": {
+      "from": [
+        "country:JM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rastas"
+    }
+  },
+  "nym:Ratcha-anachak Thai": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ratcha-anachak Thai"
+    }
+  },
+  "nym:Repubblica": {
+    "edges": {
+      "from": [
+        "country:SM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Repubblica"
+    }
+  },
+  "nym:Repubilika ya Kongo": {
+    "edges": {
+      "from": [
+        "country:CD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Repubilika ya Kongo"
+    }
+  },
+  "nym:Republic of Albania": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Albania"
+    }
+  },
+  "nym:Republic of Angola": {
+    "edges": {
+      "from": [
+        "country:AO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Angola"
+    }
+  },
+  "nym:Republic of Armenia": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Armenia"
+    }
+  },
+  "nym:Republic of Austria": {
+    "edges": {
+      "from": [
+        "country:AT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Austria"
+    }
+  },
+  "nym:Republic of Azerbaijan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Azerbaijan"
+    }
+  },
+  "nym:Republic of Belarusbelorussia": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Belarusbelorussia"
+    }
+  },
+  "nym:Republic of Benin": {
+    "edges": {
+      "from": [
+        "country:BJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Benin"
+    }
+  },
+  "nym:Republic of Bosnia and Herzegovina": {
+    "edges": {
+      "from": [
+        "country:BA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Bosnia and Herzegovina"
+    }
+  },
+  "nym:Republic of Botswana": {
+    "edges": {
+      "from": [
+        "country:BW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Botswana"
+    }
+  },
+  "nym:Republic of Bulgaria": {
+    "edges": {
+      "from": [
+        "country:BG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Bulgaria"
+    }
+  },
+  "nym:Republic of Burundi": {
+    "edges": {
+      "from": [
+        "country:BI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Burundi"
+    }
+  },
+  "nym:Republic of Cabo Verde": {
+    "edges": {
+      "from": [
+        "country:CV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Cabo Verde"
+    }
+  },
+  "nym:Republic of Cameroon": {
+    "edges": {
+      "from": [
+        "country:CM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Cameroon"
+    }
+  },
+  "nym:Republic of Chad": {
+    "edges": {
+      "from": [
+        "country:TD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Chad"
+    }
+  },
+  "nym:Republic of Chile": {
+    "edges": {
+      "from": [
+        "country:CL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Chile"
+    }
+  },
+  "nym:Republic of Colombia": {
+    "edges": {
+      "from": [
+        "country:CO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Colombia"
+    }
+  },
+  "nym:Republic of Costa Rica": {
+    "edges": {
+      "from": [
+        "country:CR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Costa Rica"
+    }
+  },
+  "nym:Republic of Cote D'Ivoire": {
+    "edges": {
+      "from": [
+        "country:CI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Cote D'Ivoire"
+    }
+  },
+  "nym:Republic of Croatia": {
+    "edges": {
+      "from": [
+        "country:HR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Croatia"
+    }
+  },
+  "nym:Republic of Cuba": {
+    "edges": {
+      "from": [
+        "country:CU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Cuba"
+    }
+  },
+  "nym:Republic of Cyprus": {
+    "edges": {
+      "from": [
+        "country:CY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Cyprus"
+    }
+  },
+  "nym:Republic of Djibouti": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Djibouti"
+    }
+  },
+  "nym:Republic of Ecuador": {
+    "edges": {
+      "from": [
+        "country:EC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Ecuador"
+    }
+  },
+  "nym:Republic of El Salvador": {
+    "edges": {
+      "from": [
+        "country:SV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of El Salvador"
+    }
+  },
+  "nym:Republic of Equatorial Guinea": {
+    "edges": {
+      "from": [
+        "country:GQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Equatorial Guinea"
+    }
+  },
+  "nym:Republic of Estonia": {
+    "edges": {
+      "from": [
+        "country:EE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Estonia"
+    }
+  },
+  "nym:Republic of Fiji": {
+    "edges": {
+      "from": [
+        "country:FJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Fiji"
+    }
+  },
+  "nym:Republic of Finland": {
+    "edges": {
+      "from": [
+        "country:FI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Finland"
+    }
+  },
+  "nym:Republic of Ghana": {
+    "edges": {
+      "from": [
+        "country:GH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Ghana"
+    }
+  },
+  "nym:Republic of Guatemala": {
+    "edges": {
+      "from": [
+        "country:GT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Guatemala"
+    }
+  },
+  "nym:Republic of Guinea": {
+    "edges": {
+      "from": [
+        "country:GN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Guinea"
+    }
+  },
+  "nym:Republic of Guinea-Bissau": {
+    "edges": {
+      "from": [
+        "country:GW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Guinea-Bissau"
+    }
+  },
+  "nym:Republic of Haiti": {
+    "edges": {
+      "from": [
+        "country:HT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Haiti"
+    }
+  },
+  "nym:Republic of Honduras": {
+    "edges": {
+      "from": [
+        "country:HN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Honduras"
+    }
+  },
+  "nym:Republic of Iceland": {
+    "edges": {
+      "from": [
+        "country:IS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Iceland"
+    }
+  },
+  "nym:Republic of India": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of India"
+    }
+  },
+  "nym:Republic of Indonesia": {
+    "edges": {
+      "from": [
+        "country:ID"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Indonesia"
+    }
+  },
+  "nym:Republic of Iraq": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Iraq"
+    }
+  },
+  "nym:Republic of Ireland": {
+    "edges": {
+      "from": [
+        "country:IE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Ireland"
+    }
+  },
+  "nym:Republic of Kazakhstankazak": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Kazakhstankazak"
+    }
+  },
+  "nym:Republic of Kenya": {
+    "edges": {
+      "from": [
+        "country:KE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Kenya"
+    }
+  },
+  "nym:Republic of Kiribati": {
+    "edges": {
+      "from": [
+        "country:KI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Kiribati"
+    }
+  },
+  "nym:Republic of Korea": {
+    "edges": {
+      "from": [
+        "country:KR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Korea"
+    }
+  },
+  "nym:Republic of Kosovo": {
+    "edges": {
+      "from": [
+        "country:XK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Kosovo"
+    }
+  },
+  "nym:Republic of Latvia": {
+    "edges": {
+      "from": [
+        "country:LV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Latvia"
+    }
+  },
+  "nym:Republic of Liberia": {
+    "edges": {
+      "from": [
+        "country:LR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Liberia"
+    }
+  },
+  "nym:Republic of Lithuanialietuva": {
+    "edges": {
+      "from": [
+        "country:LT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Lithuanialietuva"
+    }
+  },
+  "nym:Republic of Macedonia": {
+    "edges": {
+      "from": [
+        "country:MK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Macedonia"
+    }
+  },
+  "nym:Republic of Madagascar": {
+    "edges": {
+      "from": [
+        "country:MG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Madagascar"
+    }
+  },
+  "nym:Republic of Malawi": {
+    "edges": {
+      "from": [
+        "country:MW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Malawi"
+    }
+  },
+  "nym:Republic of Maldives": {
+    "edges": {
+      "from": [
+        "country:MV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Maldives"
+    }
+  },
+  "nym:Republic of Mali": {
+    "edges": {
+      "from": [
+        "country:ML"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Mali"
+    }
+  },
+  "nym:Republic of Malta": {
+    "edges": {
+      "from": [
+        "country:MT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Malta"
+    }
+  },
+  "nym:Republic of Mauritius": {
+    "edges": {
+      "from": [
+        "country:MU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Mauritius"
+    }
+  },
+  "nym:Republic of Moldova": {
+    "edges": {
+      "from": [
+        "country:MD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Moldova"
+    }
+  },
+  "nym:Republic of Mozambique": {
+    "edges": {
+      "from": [
+        "country:MZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Mozambique"
+    }
+  },
+  "nym:Republic of Namibia": {
+    "edges": {
+      "from": [
+        "country:NA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Namibia"
+    }
+  },
+  "nym:Republic of Nauru": {
+    "edges": {
+      "from": [
+        "country:NR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Nauru"
+    }
+  },
+  "nym:Republic of Nicaragua": {
+    "edges": {
+      "from": [
+        "country:NI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Nicaragua"
+    }
+  },
+  "nym:Republic of Niger": {
+    "edges": {
+      "from": [
+        "country:NE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Niger"
+    }
+  },
+  "nym:Republic of Palau": {
+    "edges": {
+      "from": [
+        "country:PW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Palau"
+    }
+  },
+  "nym:Republic of Panama": {
+    "edges": {
+      "from": [
+        "country:PA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Panama"
+    }
+  },
+  "nym:Republic of Paraguay": {
+    "edges": {
+      "from": [
+        "country:PY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Paraguay"
+    }
+  },
+  "nym:Republic of Peru": {
+    "edges": {
+      "from": [
+        "country:PE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Peru"
+    }
+  },
+  "nym:Republic of Poland": {
+    "edges": {
+      "from": [
+        "country:PL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Poland"
+    }
+  },
+  "nym:Republic of Rwandaruanda": {
+    "edges": {
+      "from": [
+        "country:RW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Rwandaruanda"
+    }
+  },
+  "nym:Republic of San Marino": {
+    "edges": {
+      "from": [
+        "country:SM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of San Marino"
+    }
+  },
+  "nym:Republic of Senegal": {
+    "edges": {
+      "from": [
+        "country:SN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Senegal"
+    }
+  },
+  "nym:Republic of Serbia": {
+    "edges": {
+      "from": [
+        "country:RS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Serbia"
+    }
+  },
+  "nym:Republic of Seychelles": {
+    "edges": {
+      "from": [
+        "country:SC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Seychelles"
+    }
+  },
+  "nym:Republic of Sierra Leone": {
+    "edges": {
+      "from": [
+        "country:SL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Sierra Leone"
+    }
+  },
+  "nym:Republic of Singapore": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Singapore"
+    }
+  },
+  "nym:Republic of Slovenia": {
+    "edges": {
+      "from": [
+        "country:SI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Slovenia"
+    }
+  },
+  "nym:Republic of South Africa": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of South Africa"
+    }
+  },
+  "nym:Republic of South Sudan": {
+    "edges": {
+      "from": [
+        "country:SS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of South Sudan"
+    }
+  },
+  "nym:Republic of Suriname": {
+    "edges": {
+      "from": [
+        "country:SR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Suriname"
+    }
+  },
+  "nym:Republic of Tajikistantadjik": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Tajikistantadjik"
+    }
+  },
+  "nym:Republic of Trinidad and Tobago": {
+    "edges": {
+      "from": [
+        "country:TT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Trinidad and Tobago"
+    }
+  },
+  "nym:Republic of Turkey": {
+    "edges": {
+      "from": [
+        "country:TR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Turkey"
+    }
+  },
+  "nym:Republic of Uganda": {
+    "edges": {
+      "from": [
+        "country:UG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Uganda"
+    }
+  },
+  "nym:Republic of Uzbekistan": {
+    "edges": {
+      "from": [
+        "country:UZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Uzbekistan"
+    }
+  },
+  "nym:Republic of Vanuatu": {
+    "edges": {
+      "from": [
+        "country:VU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Vanuatu"
+    }
+  },
+  "nym:Republic of Yemen": {
+    "edges": {
+      "from": [
+        "country:YE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Yemen"
+    }
+  },
+  "nym:Republic of Zambia": {
+    "edges": {
+      "from": [
+        "country:ZM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Zambia"
+    }
+  },
+  "nym:Republic of Zimbabwe": {
+    "edges": {
+      "from": [
+        "country:ZW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of Zimbabwe"
+    }
+  },
+  "nym:Republic of the Congo": {
+    "edges": {
+      "from": [
+        "country:CG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of the Congo"
+    }
+  },
+  "nym:Republic of the Marshall Islands": {
+    "edges": {
+      "from": [
+        "country:MH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of the Marshall Islands"
+    }
+  },
+  "nym:Republic of the Philippines": {
+    "edges": {
+      "from": [
+        "country:PH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of the Philippines"
+    }
+  },
+  "nym:Republic of the Sudan": {
+    "edges": {
+      "from": [
+        "country:SD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of the Sudan"
+    }
+  },
+  "nym:Republic of the Union of Myanmar": {
+    "edges": {
+      "from": [
+        "country:MM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Republic of the Union of Myanmar"
+    }
+  },
+  "nym:República Dominicana": {
+    "edges": {
+      "from": [
+        "country:DO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "República Dominicana"
+    }
+  },
+  "nym:República Oriental del Uruguay": {
+    "edges": {
+      "from": [
+        "country:UY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "República Oriental del Uruguay"
+    }
+  },
+  "nym:Reunion": {
+    "edges": {
+      "from": [
+        "territory:RE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Reunion"
+    }
+  },
+  "nym:Rgypt": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rgypt"
+    }
+  },
+  "nym:Rhodesia": {
+    "edges": {
+      "from": [
+        "country:ZW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rhodesia"
+    }
+  },
+  "nym:Romania": {
+    "edges": {
+      "from": [
+        "country:RO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Romania"
+    }
+  },
+  "nym:România": {
+    "edges": {
+      "from": [
+        "country:RO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "România"
+    }
+  },
+  "nym:Rossiya": {
+    "edges": {
+      "from": [
+        "country:RU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rossiya"
+    }
+  },
+  "nym:Rossiâ": {
+    "edges": {
+      "from": [
+        "country:RU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rossiâ"
+    }
+  },
+  "nym:Roumania": {
+    "edges": {
+      "from": [
+        "country:RO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Roumania"
+    }
+  },
+  "nym:Rumania": {
+    "edges": {
+      "from": [
+        "country:RO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rumania"
+    }
+  },
+  "nym:Russian Federation": {
+    "edges": {
+      "from": [
+        "country:RU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Russian Federation"
+    }
+  },
+  "nym:Rwandese Republic": {
+    "edges": {
+      "from": [
+        "country:RW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rwandese Republic"
+    }
+  },
+  "nym:République Centrafricaine": {
+    "edges": {
+      "from": [
+        "country:CF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "République Centrafricaine"
+    }
+  },
+  "nym:République Française": {
+    "edges": {
+      "from": [
+        "country:FR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "République Française"
+    }
+  },
+  "nym:République Gabonaise": {
+    "edges": {
+      "from": [
+        "country:GA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "République Gabonaise"
+    }
+  },
+  "nym:République du Congo": {
+    "edges": {
+      "from": [
+        "country:CG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "République du Congo"
+    }
+  },
+  "nym:République démocratique du Congo": {
+    "edges": {
+      "from": [
+        "country:CD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "République démocratique du Congo"
+    }
+  },
+  "nym:République française": {
+    "edges": {
+      "from": [
+        "country:FR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "République française"
+    }
+  },
+  "nym:République gabonaise": {
+    "edges": {
+      "from": [
+        "country:GA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "République gabonaise"
+    }
+  },
+  "nym:Réunion": {
+    "edges": {
+      "from": [
+        "territory:RE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Réunion"
+    }
+  },
+  "nym:Rìoghachd Aonaichte": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Rìoghachd Aonaichte"
+    }
+  },
+  "nym:Ríocht Aontaithe": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ríocht Aontaithe"
+    }
+  },
+  "nym:SA": {
+    "edges": {
+      "from": [
+        "country:SA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SA"
+    }
+  },
+  "nym:SB": {
+    "edges": {
+      "from": [
+        "country:SB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SB"
+    }
+  },
+  "nym:SC": {
+    "edges": {
+      "from": [
+        "country:SC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SC"
+    }
+  },
+  "nym:SCT": {
+    "edges": {
+      "from": [
+        "uk:SCT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SCT"
+    }
+  },
+  "nym:SD": {
+    "edges": {
+      "from": [
+        "country:SD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SD"
+    }
+  },
+  "nym:SE": {
+    "edges": {
+      "from": [
+        "country:SE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SE"
+    }
+  },
+  "nym:SG": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SG"
+    }
+  },
+  "nym:SH-AC": {
+    "edges": {
+      "from": [
+        "territory:SH-AC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SH-AC"
+    }
+  },
+  "nym:SH-HL": {
+    "edges": {
+      "from": [
+        "territory:SH-HL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SH-HL"
+    }
+  },
+  "nym:SH-TA": {
+    "edges": {
+      "from": [
+        "territory:SH-TA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SH-TA"
+    }
+  },
+  "nym:SI": {
+    "edges": {
+      "from": [
+        "country:SI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SI"
+    }
+  },
+  "nym:SJ": {
+    "edges": {
+      "from": [
+        "territory:SJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SJ"
+    }
+  },
+  "nym:SK": {
+    "edges": {
+      "from": [
+        "country:SK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SK"
+    }
+  },
+  "nym:SL": {
+    "edges": {
+      "from": [
+        "country:SL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SL"
+    }
+  },
+  "nym:SM": {
+    "edges": {
+      "from": [
+        "country:SM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SM"
+    }
+  },
+  "nym:SN": {
+    "edges": {
+      "from": [
+        "country:SN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SN"
+    }
+  },
+  "nym:SO": {
+    "edges": {
+      "from": [
+        "country:SO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SO"
+    }
+  },
+  "nym:SR": {
+    "edges": {
+      "from": [
+        "country:SR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SR"
+    }
+  },
+  "nym:SS": {
+    "edges": {
+      "from": [
+        "country:SS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SS"
+    }
+  },
+  "nym:ST": {
+    "edges": {
+      "from": [
+        "country:ST"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ST"
+    }
+  },
+  "nym:SU": {
+    "edges": {
+      "from": [
+        "country:SU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SU"
+    }
+  },
+  "nym:SV": {
+    "edges": {
+      "from": [
+        "country:SV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SV"
+    }
+  },
+  "nym:SX": {
+    "edges": {
+      "from": [
+        "territory:SX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SX"
+    }
+  },
+  "nym:SY": {
+    "edges": {
+      "from": [
+        "country:SY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SY"
+    }
+  },
+  "nym:SZ": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "SZ"
+    }
+  },
+  "nym:Saba": {
+    "edges": {
+      "from": [
+        "territory:BQ-SA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saba"
+    }
+  },
+  "nym:Saint Barthélemy": {
+    "edges": {
+      "from": [
+        "territory:BL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint Barthélemy"
+    }
+  },
+  "nym:Saint Helena": {
+    "edges": {
+      "from": [
+        "territory:SH-HL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint Helena"
+    }
+  },
+  "nym:Saint Lucia": {
+    "edges": {
+      "from": [
+        "country:LC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint Lucia"
+    }
+  },
+  "nym:Saint Pierre and Miquelon": {
+    "edges": {
+      "from": [
+        "territory:PM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint Pierre and Miquelon"
+    }
+  },
+  "nym:Saint Vincent and the Grenadines": {
+    "edges": {
+      "from": [
+        "country:VC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint Vincent and the Grenadines"
+    }
+  },
+  "nym:Saint-Pierre et Miquelon": {
+    "edges": {
+      "from": [
+        "territory:PM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint-Pierre et Miquelon"
+    }
+  },
+  "nym:Sak'art'velo": {
+    "edges": {
+      "from": [
+        "country:GE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sak'art'velo"
+    }
+  },
+  "nym:Sakartvelo": {
+    "edges": {
+      "from": [
+        "country:GE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sakartvelo"
+    }
+  },
+  "nym:Salvador": {
+    "edges": {
+      "from": [
+        "country:SV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Salvador"
+    }
+  },
+  "nym:Samo": {
+    "edges": {
+      "from": [
+        "country:WS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Samo"
+    }
+  },
+  "nym:Samoa i Sisifo": {
+    "edges": {
+      "from": [
+        "country:WS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Samoa i Sisifo"
+    }
+  },
+  "nym:Sao Thome e Principe": {
+    "edges": {
+      "from": [
+        "country:ST"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sao Thome e Principe"
+    }
+  },
+  "nym:Sao Tome e Principe": {
+    "edges": {
+      "from": [
+        "country:ST"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sao Tome e Principe"
+    }
+  },
+  "nym:Sarnam": {
+    "edges": {
+      "from": [
+        "country:SR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sarnam"
+    }
+  },
+  "nym:Sarnam Sranangron": {
+    "edges": {
+      "from": [
+        "country:SR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sarnam Sranangron"
+    }
+  },
+  "nym:Schweiz": {
+    "edges": {
+      "from": [
+        "country:CH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Schweiz"
+    }
+  },
+  "nym:Scotland": {
+    "edges": {
+      "from": [
+        "uk:SCT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Scotland"
+    }
+  },
+  "nym:Scottland": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Scottland"
+    }
+  },
+  "nym:Sesel": {
+    "edges": {
+      "from": [
+        "country:SC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sesel"
+    }
+  },
+  "nym:Shqipëria": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Shqipëria"
+    }
+  },
+  "nym:Siam": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Siam"
+    }
+  },
+  "nym:Singapur": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Singapur"
+    }
+  },
+  "nym:Singapura": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Singapura"
+    }
+  },
+  "nym:Sint Eustatius": {
+    "edges": {
+      "from": [
+        "territory:BQ-SE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sint Eustatius"
+    }
+  },
+  "nym:Sint Maarten": {
+    "edges": {
+      "from": [
+        "territory:SX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sint Maarten"
+    }
+  },
+  "nym:Sion": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sion"
+    }
+  },
+  "nym:Slovak Republic": {
+    "edges": {
+      "from": [
+        "country:SK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Slovak Republic"
+    }
+  },
+  "nym:Slovenija": {
+    "edges": {
+      "from": [
+        "country:SI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Slovenija"
+    }
+  },
+  "nym:Slovensko": {
+    "edges": {
+      "from": [
+        "country:SK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Slovensko"
+    }
+  },
+  "nym:Slovenská": {
+    "edges": {
+      "from": [
+        "country:SK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Slovenská"
+    }
+  },
+  "nym:Socialist Federal Republic of Yugoslavia": {
+    "edges": {
+      "from": [
+        "country:YU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Socialist Federal Republic of Yugoslavia"
+    }
+  },
+  "nym:Socialist People's Libyan Arab": {
+    "edges": {
+      "from": [
+        "country:LY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Socialist People's Libyan Arab"
+    }
+  },
+  "nym:Socialist Republic of Vietnam": {
+    "edges": {
+      "from": [
+        "country:VN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Socialist Republic of Vietnam"
+    }
+  },
+  "nym:Solomon Aelan": {
+    "edges": {
+      "from": [
+        "country:SB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Solomon Aelan"
+    }
+  },
+  "nym:Solomon Islands": {
+    "edges": {
+      "from": [
+        "country:SB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Solomon Islands"
+    }
+  },
+  "nym:Solomons": {
+    "edges": {
+      "from": [
+        "country:SB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Solomons"
+    }
+  },
+  "nym:Soomaaliya": {
+    "edges": {
+      "from": [
+        "country:SO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Soomaaliya"
+    }
+  },
+  "nym:Soudan": {
+    "edges": {
+      "from": [
+        "country:SD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Soudan"
+    }
+  },
+  "nym:South Georgia and the South Sandwich Islands": {
+    "edges": {
+      "from": [
+        "territory:GS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "South Georgia and the South Sandwich Islands"
+    }
+  },
+  "nym:South Korea": {
+    "edges": {
+      "from": [
+        "country:KR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "South Korea"
+    }
+  },
+  "nym:South west africa": {
+    "edges": {
+      "from": [
+        "country:NA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "South west africa"
+    }
+  },
+  "nym:Sovereign Base Areas of Akrotiri and Dhekelia": {
+    "edges": {
+      "from": [
+        "territory:XXD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sovereign Base Areas of Akrotiri and Dhekelia"
+    }
+  },
+  "nym:Spanish Guinea": {
+    "edges": {
+      "from": [
+        "country:GQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Spanish Guinea"
+    }
+  },
+  "nym:Sranangron": {
+    "edges": {
+      "from": [
+        "country:SR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sranangron"
+    }
+  },
+  "nym:Srbija": {
+    "edges": {
+      "from": [
+        "country:RS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Srbija"
+    }
+  },
+  "nym:Sri Lankā": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sri Lankā"
+    }
+  },
+  "nym:St Barth": {
+    "edges": {
+      "from": [
+        "territory:BL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St Barth"
+    }
+  },
+  "nym:St. Barthelemy": {
+    "edges": {
+      "from": [
+        "territory:BL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St. Barthelemy"
+    }
+  },
+  "nym:St. Kitts and Nevis": {
+    "edges": {
+      "from": [
+        "country:KN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St. Kitts and Nevis"
+    }
+  },
+  "nym:St. Lucia": {
+    "edges": {
+      "from": [
+        "country:LC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St. Lucia"
+    }
+  },
+  "nym:St. Thomas and Principe": {
+    "edges": {
+      "from": [
+        "country:ST"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St. Thomas and Principe"
+    }
+  },
+  "nym:St. Vincent": {
+    "edges": {
+      "from": [
+        "country:VC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "St. Vincent"
+    }
+  },
+  "nym:State of Bahrain": {
+    "edges": {
+      "from": [
+        "country:BH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "State of Bahrain"
+    }
+  },
+  "nym:State of Eritrea": {
+    "edges": {
+      "from": [
+        "country:ER"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "State of Eritrea"
+    }
+  },
+  "nym:State of Israel": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "State of Israel"
+    }
+  },
+  "nym:State of Kuwait": {
+    "edges": {
+      "from": [
+        "country:KW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "State of Kuwait"
+    }
+  },
+  "nym:State of Qatar": {
+    "edges": {
+      "from": [
+        "country:QA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "State of Qatar"
+    }
+  },
+  "nym:Suid-Afrika": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Suid-Afrika"
+    }
+  },
+  "nym:Suisse": {
+    "edges": {
+      "from": [
+        "country:CH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Suisse"
+    }
+  },
+  "nym:Sultanate of Oman": {
+    "edges": {
+      "from": [
+        "country:OM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sultanate of Oman"
+    }
+  },
+  "nym:Suomi": {
+    "edges": {
+      "from": [
+        "country:FI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Suomi"
+    }
+  },
+  "nym:Suriyah": {
+    "edges": {
+      "from": [
+        "country:SY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Suriyah"
+    }
+  },
+  "nym:Svalbard and Jan Mayen": {
+    "edges": {
+      "from": [
+        "territory:SJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Svalbard and Jan Mayen"
+    }
+  },
+  "nym:Sverige": {
+    "edges": {
+      "from": [
+        "country:SE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sverige"
+    }
+  },
+  "nym:Svizra": {
+    "edges": {
+      "from": [
+        "country:CH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Svizra"
+    }
+  },
+  "nym:Svizzera": {
+    "edges": {
+      "from": [
+        "country:CH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Svizzera"
+    }
+  },
+  "nym:Swatini": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Swatini"
+    }
+  },
+  "nym:Swiss Confederation": {
+    "edges": {
+      "from": [
+        "country:CH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Swiss Confederation"
+    }
+  },
+  "nym:Switerland": {
+    "edges": {
+      "from": [
+        "country:CH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Switerland"
+    }
+  },
+  "nym:Syria": {
+    "edges": {
+      "from": [
+        "country:SY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Syria"
+    }
+  },
+  "nym:Syrian Arab Republic": {
+    "edges": {
+      "from": [
+        "country:SY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Syrian Arab Republic"
+    }
+  },
+  "nym:São Tomé e Príncipe": {
+    "edges": {
+      "from": [
+        "country:ST"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "São Tomé e Príncipe"
+    }
+  },
+  "nym:Sénégal": {
+    "edges": {
+      "from": [
+        "country:SN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sénégal"
+    }
+  },
+  "nym:TC": {
+    "edges": {
+      "from": [
+        "territory:TC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TC"
+    }
+  },
+  "nym:TD": {
+    "edges": {
+      "from": [
+        "country:TD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TD"
+    }
+  },
+  "nym:TF": {
+    "edges": {
+      "from": [
+        "territory:TF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TF"
+    }
+  },
+  "nym:TG": {
+    "edges": {
+      "from": [
+        "country:TG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TG"
+    }
+  },
+  "nym:TH": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TH"
+    }
+  },
+  "nym:TJ": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TJ"
+    }
+  },
+  "nym:TK": {
+    "edges": {
+      "from": [
+        "territory:TK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TK"
+    }
+  },
+  "nym:TL": {
+    "edges": {
+      "from": [
+        "country:TL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TL"
+    }
+  },
+  "nym:TM": {
+    "edges": {
+      "from": [
+        "country:TM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TM"
+    }
+  },
+  "nym:TN": {
+    "edges": {
+      "from": [
+        "country:TN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TN"
+    }
+  },
+  "nym:TO": {
+    "edges": {
+      "from": [
+        "country:TO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TO"
+    }
+  },
+  "nym:TR": {
+    "edges": {
+      "from": [
+        "country:TR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TR"
+    }
+  },
+  "nym:TT": {
+    "edges": {
+      "from": [
+        "country:TT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TT"
+    }
+  },
+  "nym:TV": {
+    "edges": {
+      "from": [
+        "country:TV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TV"
+    }
+  },
+  "nym:TW": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TW"
+    }
+  },
+  "nym:TZ": {
+    "edges": {
+      "from": [
+        "country:TZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "TZ"
+    }
+  },
+  "nym:Tadzhik": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tadzhik"
+    }
+  },
+  "nym:Tadzhikistan": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tadzhikistan"
+    }
+  },
+  "nym:Taiwan": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Taiwan"
+    }
+  },
+  "nym:Tajik": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tajik"
+    }
+  },
+  "nym:Tchad": {
+    "edges": {
+      "from": [
+        "country:TD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tchad"
+    }
+  },
+  "nym:Territory of American Samoa": {
+    "edges": {
+      "from": [
+        "territory:AS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Territory of American Samoa"
+    }
+  },
+  "nym:Territory of Christmas Island": {
+    "edges": {
+      "from": [
+        "territory:CX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Territory of Christmas Island"
+    }
+  },
+  "nym:Territory of Guam": {
+    "edges": {
+      "from": [
+        "territory:GU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Territory of Guam"
+    }
+  },
+  "nym:Territory of Heard Island and McDonald Islands": {
+    "edges": {
+      "from": [
+        "territory:HM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Territory of Heard Island and McDonald Islands"
+    }
+  },
+  "nym:Territory of Norfolk Island": {
+    "edges": {
+      "from": [
+        "territory:NF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Territory of Norfolk Island"
+    }
+  },
+  "nym:Territory of the Cocos (Keeling) Islands": {
+    "edges": {
+      "from": [
+        "territory:CC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Territory of the Cocos (Keeling) Islands"
+    }
+  },
+  "nym:Territory of the Wallis and Futuna Islands": {
+    "edges": {
+      "from": [
+        "territory:WF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Territory of the Wallis and Futuna Islands"
+    }
+  },
+  "nym:The Arab Republic of Egypt": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Arab Republic of Egypt"
+    }
+  },
+  "nym:The Argentine Republic": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Argentine Republic"
+    }
+  },
+  "nym:The Bolivarian Republic of Venezuela": {
+    "edges": {
+      "from": [
+        "country:VE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Bolivarian Republic of Venezuela"
+    }
+  },
+  "nym:The British Indian Ocean Territory": {
+    "edges": {
+      "from": [
+        "territory:IO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The British Indian Ocean Territory"
+    }
+  },
+  "nym:The Central African Republic": {
+    "edges": {
+      "from": [
+        "country:CF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Central African Republic"
+    }
+  },
+  "nym:The Co-operative Republic of Guyana": {
+    "edges": {
+      "from": [
+        "country:GY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Co-operative Republic of Guyana"
+    }
+  },
+  "nym:The Commonwealth of Australia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Commonwealth of Australia"
+    }
+  },
+  "nym:The Commonwealth of Dominica": {
+    "edges": {
+      "from": [
+        "country:DM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Commonwealth of Dominica"
+    }
+  },
+  "nym:The Commonwealth of The Bahamas": {
+    "edges": {
+      "from": [
+        "country:BS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Commonwealth of The Bahamas"
+    }
+  },
+  "nym:The Czech Republic": {
+    "edges": {
+      "from": [
+        "country:CZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Czech Republic"
+    }
+  },
+  "nym:The Democratic People's Republic of Korea": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Democratic People's Republic of Korea"
+    }
+  },
+  "nym:The Democratic Republic of Sao Tome and Principe": {
+    "edges": {
+      "from": [
+        "country:ST"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Democratic Republic of Sao Tome and Principe"
+    }
+  },
+  "nym:The Democratic Republic of Timor-Leste": {
+    "edges": {
+      "from": [
+        "country:TL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Democratic Republic of Timor-Leste"
+    }
+  },
+  "nym:The Democratic Republic of the Congo": {
+    "edges": {
+      "from": [
+        "country:CD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Democratic Republic of the Congo"
+    }
+  },
+  "nym:The Democratic Socialist Republic of Sri Lanka": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Democratic Socialist Republic of Sri Lanka"
+    }
+  },
+  "nym:The Dominican Republic": {
+    "edges": {
+      "from": [
+        "country:DO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Dominican Republic"
+    }
+  },
+  "nym:The Federal Democratic Republic of Ethiopia": {
+    "edges": {
+      "from": [
+        "country:ET"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Federal Democratic Republic of Ethiopia"
+    }
+  },
+  "nym:The Federal Democratic Republic of Nepal": {
+    "edges": {
+      "from": [
+        "country:NP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Federal Democratic Republic of Nepal"
+    }
+  },
+  "nym:The Federal Republic of Germany": {
+    "edges": {
+      "from": [
+        "country:DE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Federal Republic of Germany"
+    }
+  },
+  "nym:The Federal Republic of Nigeria": {
+    "edges": {
+      "from": [
+        "country:NG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Federal Republic of Nigeria"
+    }
+  },
+  "nym:The Federated States of Micronesia": {
+    "edges": {
+      "from": [
+        "country:FM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Federated States of Micronesia"
+    }
+  },
+  "nym:The Federation of Saint Christopher and Nevis": {
+    "edges": {
+      "from": [
+        "country:KN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Federation of Saint Christopher and Nevis"
+    }
+  },
+  "nym:The Federative Republic of Brazil": {
+    "edges": {
+      "from": [
+        "country:BR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Federative Republic of Brazil"
+    }
+  },
+  "nym:The French Republic": {
+    "edges": {
+      "from": [
+        "country:FR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The French Republic"
+    }
+  },
+  "nym:The Gabonese Republic": {
+    "edges": {
+      "from": [
+        "country:GA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Gabonese Republic"
+    }
+  },
+  "nym:The Grand Duchy of Luxembourg": {
+    "edges": {
+      "from": [
+        "country:LU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Grand Duchy of Luxembourg"
+    }
+  },
+  "nym:The Hashemite Kingdom of Jordan": {
+    "edges": {
+      "from": [
+        "country:JO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Hashemite Kingdom of Jordan"
+    }
+  },
+  "nym:The Hellenic Republic": {
+    "edges": {
+      "from": [
+        "country:GR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Hellenic Republic"
+    }
+  },
+  "nym:The Independent State of Papua New Guinea": {
+    "edges": {
+      "from": [
+        "country:PG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Independent State of Papua New Guinea"
+    }
+  },
+  "nym:The Independent State of Samoa": {
+    "edges": {
+      "from": [
+        "country:WS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Independent State of Samoa"
+    }
+  },
+  "nym:The Islamic Republic of Afghanistan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Islamic Republic of Afghanistan"
+    }
+  },
+  "nym:The Islamic Republic of Iran": {
+    "edges": {
+      "from": [
+        "country:IR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Islamic Republic of Iran"
+    }
+  },
+  "nym:The Islamic Republic of Mauritania": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Islamic Republic of Mauritania"
+    }
+  },
+  "nym:The Islamic Republic of Pakistan": {
+    "edges": {
+      "from": [
+        "country:PK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Islamic Republic of Pakistan"
+    }
+  },
+  "nym:The Italian Republic": {
+    "edges": {
+      "from": [
+        "country:IT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Italian Republic"
+    }
+  },
+  "nym:The Kingdom of Bahrain": {
+    "edges": {
+      "from": [
+        "country:BH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Bahrain"
+    }
+  },
+  "nym:The Kingdom of Belgium": {
+    "edges": {
+      "from": [
+        "country:BE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Belgium"
+    }
+  },
+  "nym:The Kingdom of Bhutan": {
+    "edges": {
+      "from": [
+        "country:BT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Bhutan"
+    }
+  },
+  "nym:The Kingdom of Cambodia": {
+    "edges": {
+      "from": [
+        "country:KH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Cambodia"
+    }
+  },
+  "nym:The Kingdom of Denmark": {
+    "edges": {
+      "from": [
+        "country:DK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Denmark"
+    }
+  },
+  "nym:The Kingdom of Lesotho": {
+    "edges": {
+      "from": [
+        "country:LS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Lesotho"
+    }
+  },
+  "nym:The Kingdom of Morocco": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Morocco"
+    }
+  },
+  "nym:The Kingdom of Norway": {
+    "edges": {
+      "from": [
+        "country:NO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Norway"
+    }
+  },
+  "nym:The Kingdom of Saudi Arabia": {
+    "edges": {
+      "from": [
+        "country:SA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Saudi Arabia"
+    }
+  },
+  "nym:The Kingdom of Spain": {
+    "edges": {
+      "from": [
+        "country:ES"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Spain"
+    }
+  },
+  "nym:The Kingdom of Swaziland": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Swaziland"
+    }
+  },
+  "nym:The Kingdom of Sweden": {
+    "edges": {
+      "from": [
+        "country:SE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Sweden"
+    }
+  },
+  "nym:The Kingdom of Thailand": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Thailand"
+    }
+  },
+  "nym:The Kingdom of Tonga": {
+    "edges": {
+      "from": [
+        "country:TO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of Tonga"
+    }
+  },
+  "nym:The Kingdom of the Netherlands": {
+    "edges": {
+      "from": [
+        "country:NL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kingdom of the Netherlands"
+    }
+  },
+  "nym:The Kyrgyz Republic": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Kyrgyz Republic"
+    }
+  },
+  "nym:The Lao People's Democratic Republic": {
+    "edges": {
+      "from": [
+        "country:LA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Lao People's Democratic Republic"
+    }
+  },
+  "nym:The Lebanese Republic": {
+    "edges": {
+      "from": [
+        "country:LB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Lebanese Republic"
+    }
+  },
+  "nym:The Occupied Palestinian Territories": {
+    "edges": {
+      "from": [
+        "territory:PS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Occupied Palestinian Territories"
+    }
+  },
+  "nym:The Oriental Republic of Uruguay": {
+    "edges": {
+      "from": [
+        "country:UY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Oriental Republic of Uruguay"
+    }
+  },
+  "nym:The People's Democratic Republic of Algeria": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The People's Democratic Republic of Algeria"
+    }
+  },
+  "nym:The People's Republic of Bangladesh": {
+    "edges": {
+      "from": [
+        "country:BD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The People's Republic of Bangladesh"
+    }
+  },
+  "nym:The People's Republic of China": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The People's Republic of China"
+    }
+  },
+  "nym:The Plurinational State of Bolivia": {
+    "edges": {
+      "from": [
+        "country:BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Plurinational State of Bolivia"
+    }
+  },
+  "nym:The Portuguese Republic": {
+    "edges": {
+      "from": [
+        "country:PT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Portuguese Republic"
+    }
+  },
+  "nym:The Principality of Andorra": {
+    "edges": {
+      "from": [
+        "country:AD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Principality of Andorra"
+    }
+  },
+  "nym:The Principality of Liechtenstein": {
+    "edges": {
+      "from": [
+        "country:LI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Principality of Liechtenstein"
+    }
+  },
+  "nym:The Principality of Monaco": {
+    "edges": {
+      "from": [
+        "country:MC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Principality of Monaco"
+    }
+  },
+  "nym:The Republic of Albania": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Albania"
+    }
+  },
+  "nym:The Republic of Angola": {
+    "edges": {
+      "from": [
+        "country:AO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Angola"
+    }
+  },
+  "nym:The Republic of Armenia": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Armenia"
+    }
+  },
+  "nym:The Republic of Austria": {
+    "edges": {
+      "from": [
+        "country:AT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Austria"
+    }
+  },
+  "nym:The Republic of Azerbaijan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Azerbaijan"
+    }
+  },
+  "nym:The Republic of Belarus": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Belarus"
+    }
+  },
+  "nym:The Republic of Benin": {
+    "edges": {
+      "from": [
+        "country:BJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Benin"
+    }
+  },
+  "nym:The Republic of Botswana": {
+    "edges": {
+      "from": [
+        "country:BW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Botswana"
+    }
+  },
+  "nym:The Republic of Bulgaria": {
+    "edges": {
+      "from": [
+        "country:BG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Bulgaria"
+    }
+  },
+  "nym:The Republic of Burundi": {
+    "edges": {
+      "from": [
+        "country:BI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Burundi"
+    }
+  },
+  "nym:The Republic of Cabo Verde": {
+    "edges": {
+      "from": [
+        "country:CV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Cabo Verde"
+    }
+  },
+  "nym:The Republic of Cameroon": {
+    "edges": {
+      "from": [
+        "country:CM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Cameroon"
+    }
+  },
+  "nym:The Republic of Chad": {
+    "edges": {
+      "from": [
+        "country:TD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Chad"
+    }
+  },
+  "nym:The Republic of Chile": {
+    "edges": {
+      "from": [
+        "country:CL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Chile"
+    }
+  },
+  "nym:The Republic of Colombia": {
+    "edges": {
+      "from": [
+        "country:CO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Colombia"
+    }
+  },
+  "nym:The Republic of Costa Rica": {
+    "edges": {
+      "from": [
+        "country:CR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Costa Rica"
+    }
+  },
+  "nym:The Republic of Cote D'Ivoire": {
+    "edges": {
+      "from": [
+        "country:CI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Cote D'Ivoire"
+    }
+  },
+  "nym:The Republic of Croatia": {
+    "edges": {
+      "from": [
+        "country:HR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Croatia"
+    }
+  },
+  "nym:The Republic of Cuba": {
+    "edges": {
+      "from": [
+        "country:CU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Cuba"
+    }
+  },
+  "nym:The Republic of Cyprus": {
+    "edges": {
+      "from": [
+        "country:CY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Cyprus"
+    }
+  },
+  "nym:The Republic of Djibouti": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Djibouti"
+    }
+  },
+  "nym:The Republic of Ecuador": {
+    "edges": {
+      "from": [
+        "country:EC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Ecuador"
+    }
+  },
+  "nym:The Republic of El Salvador": {
+    "edges": {
+      "from": [
+        "country:SV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of El Salvador"
+    }
+  },
+  "nym:The Republic of Equatorial Guinea": {
+    "edges": {
+      "from": [
+        "country:GQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Equatorial Guinea"
+    }
+  },
+  "nym:The Republic of Estonia": {
+    "edges": {
+      "from": [
+        "country:EE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Estonia"
+    }
+  },
+  "nym:The Republic of Fiji": {
+    "edges": {
+      "from": [
+        "country:FJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Fiji"
+    }
+  },
+  "nym:The Republic of Finland": {
+    "edges": {
+      "from": [
+        "country:FI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Finland"
+    }
+  },
+  "nym:The Republic of Ghana": {
+    "edges": {
+      "from": [
+        "country:GH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Ghana"
+    }
+  },
+  "nym:The Republic of Guatemala": {
+    "edges": {
+      "from": [
+        "country:GT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Guatemala"
+    }
+  },
+  "nym:The Republic of Guinea": {
+    "edges": {
+      "from": [
+        "country:GN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Guinea"
+    }
+  },
+  "nym:The Republic of Guinea-Bissau": {
+    "edges": {
+      "from": [
+        "country:GW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Guinea-Bissau"
+    }
+  },
+  "nym:The Republic of Haiti": {
+    "edges": {
+      "from": [
+        "country:HT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Haiti"
+    }
+  },
+  "nym:The Republic of Honduras": {
+    "edges": {
+      "from": [
+        "country:HN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Honduras"
+    }
+  },
+  "nym:The Republic of Iceland": {
+    "edges": {
+      "from": [
+        "country:IS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Iceland"
+    }
+  },
+  "nym:The Republic of India": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of India"
+    }
+  },
+  "nym:The Republic of Indonesia": {
+    "edges": {
+      "from": [
+        "country:ID"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Indonesia"
+    }
+  },
+  "nym:The Republic of Iraq": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Iraq"
+    }
+  },
+  "nym:The Republic of Kazakhstan": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Kazakhstan"
+    }
+  },
+  "nym:The Republic of Kenya": {
+    "edges": {
+      "from": [
+        "country:KE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Kenya"
+    }
+  },
+  "nym:The Republic of Kiribati": {
+    "edges": {
+      "from": [
+        "country:KI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Kiribati"
+    }
+  },
+  "nym:The Republic of Korea": {
+    "edges": {
+      "from": [
+        "country:KR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Korea"
+    }
+  },
+  "nym:The Republic of Kosovo": {
+    "edges": {
+      "from": [
+        "country:XK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Kosovo"
+    }
+  },
+  "nym:The Republic of Latvia": {
+    "edges": {
+      "from": [
+        "country:LV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Latvia"
+    }
+  },
+  "nym:The Republic of Liberia": {
+    "edges": {
+      "from": [
+        "country:LR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Liberia"
+    }
+  },
+  "nym:The Republic of Lithuania": {
+    "edges": {
+      "from": [
+        "country:LT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Lithuania"
+    }
+  },
+  "nym:The Republic of Macedonia": {
+    "edges": {
+      "from": [
+        "country:MK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Macedonia"
+    }
+  },
+  "nym:The Republic of Madagascar": {
+    "edges": {
+      "from": [
+        "country:MG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Madagascar"
+    }
+  },
+  "nym:The Republic of Malawi": {
+    "edges": {
+      "from": [
+        "country:MW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Malawi"
+    }
+  },
+  "nym:The Republic of Maldives": {
+    "edges": {
+      "from": [
+        "country:MV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Maldives"
+    }
+  },
+  "nym:The Republic of Mali": {
+    "edges": {
+      "from": [
+        "country:ML"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Mali"
+    }
+  },
+  "nym:The Republic of Malta": {
+    "edges": {
+      "from": [
+        "country:MT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Malta"
+    }
+  },
+  "nym:The Republic of Mauritius": {
+    "edges": {
+      "from": [
+        "country:MU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Mauritius"
+    }
+  },
+  "nym:The Republic of Moldova": {
+    "edges": {
+      "from": [
+        "country:MD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Moldova"
+    }
+  },
+  "nym:The Republic of Mozambique": {
+    "edges": {
+      "from": [
+        "country:MZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Mozambique"
+    }
+  },
+  "nym:The Republic of Namibia": {
+    "edges": {
+      "from": [
+        "country:NA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Namibia"
+    }
+  },
+  "nym:The Republic of Nauru": {
+    "edges": {
+      "from": [
+        "country:NR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Nauru"
+    }
+  },
+  "nym:The Republic of Nicaragua": {
+    "edges": {
+      "from": [
+        "country:NI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Nicaragua"
+    }
+  },
+  "nym:The Republic of Niger": {
+    "edges": {
+      "from": [
+        "country:NE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Niger"
+    }
+  },
+  "nym:The Republic of Palau": {
+    "edges": {
+      "from": [
+        "country:PW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Palau"
+    }
+  },
+  "nym:The Republic of Panama": {
+    "edges": {
+      "from": [
+        "country:PA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Panama"
+    }
+  },
+  "nym:The Republic of Paraguay": {
+    "edges": {
+      "from": [
+        "country:PY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Paraguay"
+    }
+  },
+  "nym:The Republic of Peru": {
+    "edges": {
+      "from": [
+        "country:PE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Peru"
+    }
+  },
+  "nym:The Republic of Poland": {
+    "edges": {
+      "from": [
+        "country:PL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Poland"
+    }
+  },
+  "nym:The Republic of Rwanda": {
+    "edges": {
+      "from": [
+        "country:RW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Rwanda"
+    }
+  },
+  "nym:The Republic of San Marino": {
+    "edges": {
+      "from": [
+        "country:SM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of San Marino"
+    }
+  },
+  "nym:The Republic of Senegal": {
+    "edges": {
+      "from": [
+        "country:SN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Senegal"
+    }
+  },
+  "nym:The Republic of Serbia": {
+    "edges": {
+      "from": [
+        "country:RS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Serbia"
+    }
+  },
+  "nym:The Republic of Seychelles": {
+    "edges": {
+      "from": [
+        "country:SC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Seychelles"
+    }
+  },
+  "nym:The Republic of Sierra Leone": {
+    "edges": {
+      "from": [
+        "country:SL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Sierra Leone"
+    }
+  },
+  "nym:The Republic of Singapore": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Singapore"
+    }
+  },
+  "nym:The Republic of Slovenia": {
+    "edges": {
+      "from": [
+        "country:SI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Slovenia"
+    }
+  },
+  "nym:The Republic of South Africa": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of South Africa"
+    }
+  },
+  "nym:The Republic of South Sudan": {
+    "edges": {
+      "from": [
+        "country:SS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of South Sudan"
+    }
+  },
+  "nym:The Republic of Suriname": {
+    "edges": {
+      "from": [
+        "country:SR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Suriname"
+    }
+  },
+  "nym:The Republic of Tajikistan": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Tajikistan"
+    }
+  },
+  "nym:The Republic of The Gambia": {
+    "edges": {
+      "from": [
+        "country:GM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of The Gambia"
+    }
+  },
+  "nym:The Republic of Trinidad and Tobago": {
+    "edges": {
+      "from": [
+        "country:TT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Trinidad and Tobago"
+    }
+  },
+  "nym:The Republic of Turkey": {
+    "edges": {
+      "from": [
+        "country:TR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Turkey"
+    }
+  },
+  "nym:The Republic of Uganda": {
+    "edges": {
+      "from": [
+        "country:UG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Uganda"
+    }
+  },
+  "nym:The Republic of Uzbekistan": {
+    "edges": {
+      "from": [
+        "country:UZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Uzbekistan"
+    }
+  },
+  "nym:The Republic of Vanuatu": {
+    "edges": {
+      "from": [
+        "country:VU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Vanuatu"
+    }
+  },
+  "nym:The Republic of Yemen": {
+    "edges": {
+      "from": [
+        "country:YE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Yemen"
+    }
+  },
+  "nym:The Republic of Zambia": {
+    "edges": {
+      "from": [
+        "country:ZM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Zambia"
+    }
+  },
+  "nym:The Republic of Zimbabwe": {
+    "edges": {
+      "from": [
+        "country:ZW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of Zimbabwe"
+    }
+  },
+  "nym:The Republic of the Congo": {
+    "edges": {
+      "from": [
+        "country:CG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of the Congo"
+    }
+  },
+  "nym:The Republic of the Marshall Islands": {
+    "edges": {
+      "from": [
+        "country:MH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of the Marshall Islands"
+    }
+  },
+  "nym:The Republic of the Philippines": {
+    "edges": {
+      "from": [
+        "country:PH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of the Philippines"
+    }
+  },
+  "nym:The Republic of the Sudan": {
+    "edges": {
+      "from": [
+        "country:SD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of the Sudan"
+    }
+  },
+  "nym:The Republic of the Union of Myanmar": {
+    "edges": {
+      "from": [
+        "country:MM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Republic of the Union of Myanmar"
+    }
+  },
+  "nym:The Russian Federation": {
+    "edges": {
+      "from": [
+        "country:RU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Russian Federation"
+    }
+  },
+  "nym:The Slovak Republic": {
+    "edges": {
+      "from": [
+        "country:SK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Slovak Republic"
+    }
+  },
+  "nym:The Socialist Republic of Vietnam": {
+    "edges": {
+      "from": [
+        "country:VN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Socialist Republic of Vietnam"
+    }
+  },
+  "nym:The State of Eritrea": {
+    "edges": {
+      "from": [
+        "country:ER"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The State of Eritrea"
+    }
+  },
+  "nym:The State of Israel": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The State of Israel"
+    }
+  },
+  "nym:The State of Kuwait": {
+    "edges": {
+      "from": [
+        "country:KW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The State of Kuwait"
+    }
+  },
+  "nym:The State of Qatar": {
+    "edges": {
+      "from": [
+        "country:QA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The State of Qatar"
+    }
+  },
+  "nym:The States": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The States"
+    }
+  },
+  "nym:The Sultanate of Oman": {
+    "edges": {
+      "from": [
+        "country:OM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Sultanate of Oman"
+    }
+  },
+  "nym:The Swiss Confederation": {
+    "edges": {
+      "from": [
+        "country:CH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Swiss Confederation"
+    }
+  },
+  "nym:The Syrian Arab Republic": {
+    "edges": {
+      "from": [
+        "country:SY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Syrian Arab Republic"
+    }
+  },
+  "nym:The Togolese Republic": {
+    "edges": {
+      "from": [
+        "country:TG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Togolese Republic"
+    }
+  },
+  "nym:The Tunisian Republic": {
+    "edges": {
+      "from": [
+        "country:TN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Tunisian Republic"
+    }
+  },
+  "nym:The Union of the Comoros": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Union of the Comoros"
+    }
+  },
+  "nym:The United Arab Emirates": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The United Arab Emirates"
+    }
+  },
+  "nym:The United Kingdom of Great Britain and Northern Ireland": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The United Kingdom of Great Britain and Northern Ireland"
+    }
+  },
+  "nym:The United Mexican States": {
+    "edges": {
+      "from": [
+        "country:MX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The United Mexican States"
+    }
+  },
+  "nym:The United Republic of Tanzania": {
+    "edges": {
+      "from": [
+        "country:TZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The United Republic of Tanzania"
+    }
+  },
+  "nym:The United States of America": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The United States of America"
+    }
+  },
+  "nym:The Virgin Islands": {
+    "edges": {
+      "from": [
+        "territory:VG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "The Virgin Islands"
+    }
+  },
+  "nym:Timor Lorosa'e": {
+    "edges": {
+      "from": [
+        "country:TL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Timor Lorosa'e"
+    }
+  },
+  "nym:Timor-Leste": {
+    "edges": {
+      "from": [
+        "country:TL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Timor-Leste"
+    }
+  },
+  "nym:Togolese": {
+    "edges": {
+      "from": [
+        "country:TG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Togolese"
+    }
+  },
+  "nym:Togolese Republic": {
+    "edges": {
+      "from": [
+        "country:TG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Togolese Republic"
+    }
+  },
+  "nym:Tojikistan": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tojikistan"
+    }
+  },
+  "nym:Tokelau": {
+    "edges": {
+      "from": [
+        "territory:TK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tokelau"
+    }
+  },
+  "nym:Toçikiston": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Toçikiston"
+    }
+  },
+  "nym:Tristan da Cunha": {
+    "edges": {
+      "from": [
+        "territory:SH-TA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tristan da Cunha"
+    }
+  },
+  "nym:Tunes": {
+    "edges": {
+      "from": [
+        "country:TN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tunes"
+    }
+  },
+  "nym:Tunisian Republic": {
+    "edges": {
+      "from": [
+        "country:TN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tunisian Republic"
+    }
+  },
+  "nym:Turkiye": {
+    "edges": {
+      "from": [
+        "country:TR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turkiye"
+    }
+  },
+  "nym:Turkmen": {
+    "edges": {
+      "from": [
+        "country:TM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turkmen"
+    }
+  },
+  "nym:Turkmenia": {
+    "edges": {
+      "from": [
+        "country:TM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turkmenia"
+    }
+  },
+  "nym:Turkmenistan": {
+    "edges": {
+      "from": [
+        "country:TM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turkmenistan"
+    }
+  },
+  "nym:Turkomen": {
+    "edges": {
+      "from": [
+        "country:TM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turkomen"
+    }
+  },
+  "nym:Turks and Caicos Islands": {
+    "edges": {
+      "from": [
+        "territory:TC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turks and Caicos Islands"
+    }
+  },
+  "nym:Tuvalu": {
+    "edges": {
+      "from": [
+        "country:TV"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tuvalu"
+    }
+  },
+  "nym:Táiwān": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Táiwān"
+    }
+  },
+  "nym:Türkiye": {
+    "edges": {
+      "from": [
+        "country:TR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Türkiye"
+    }
+  },
+  "nym:Türkmenistan": {
+    "edges": {
+      "from": [
+        "country:TM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Türkmenistan"
+    }
+  },
+  "nym:Tšād": {
+    "edges": {
+      "from": [
+        "country:TD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tšād"
+    }
+  },
+  "nym:Tūns": {
+    "edges": {
+      "from": [
+        "country:TN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tūns"
+    }
+  },
+  "nym:U.K.": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "U.K."
+    }
+  },
+  "nym:U.S.": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "U.S."
+    }
+  },
+  "nym:U.S.A.": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "U.S.A."
+    }
+  },
+  "nym:UA": {
+    "edges": {
+      "from": [
+        "country:UA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UA"
+    }
+  },
+  "nym:UAE": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UAE"
+    }
+  },
+  "nym:UG": {
+    "edges": {
+      "from": [
+        "country:UG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UG"
+    }
+  },
+  "nym:UK": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UK"
+    }
+  },
+  "nym:UM-67": {
+    "edges": {
+      "from": [
+        "territory:UM-67"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UM-67"
+    }
+  },
+  "nym:UM-71": {
+    "edges": {
+      "from": [
+        "territory:UM-71"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UM-71"
+    }
+  },
+  "nym:UM-76": {
+    "edges": {
+      "from": [
+        "territory:UM-76"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UM-76"
+    }
+  },
+  "nym:UM-81": {
+    "edges": {
+      "from": [
+        "territory:UM-81"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UM-81"
+    }
+  },
+  "nym:UM-84": {
+    "edges": {
+      "from": [
+        "territory:UM-84"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UM-84"
+    }
+  },
+  "nym:UM-86": {
+    "edges": {
+      "from": [
+        "territory:UM-86"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UM-86"
+    }
+  },
+  "nym:UM-89": {
+    "edges": {
+      "from": [
+        "territory:UM-89"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UM-89"
+    }
+  },
+  "nym:UM-95": {
+    "edges": {
+      "from": [
+        "territory:UM-95"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UM-95"
+    }
+  },
+  "nym:US": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "US"
+    }
+  },
+  "nym:USA": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "USA"
+    }
+  },
+  "nym:UY": {
+    "edges": {
+      "from": [
+        "country:UY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UY"
+    }
+  },
+  "nym:UZ": {
+    "edges": {
+      "from": [
+        "country:UZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "UZ"
+    }
+  },
+  "nym:Ukraine": {
+    "edges": {
+      "from": [
+        "country:UA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ukraine"
+    }
+  },
+  "nym:Ukrayina": {
+    "edges": {
+      "from": [
+        "country:UA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ukrayina"
+    }
+  },
+  "nym:Ukraїna": {
+    "edges": {
+      "from": [
+        "country:UA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ukraїna"
+    }
+  },
+  "nym:Umbuso weSwatini": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Umbuso weSwatini"
+    }
+  },
+  "nym:Union of Soviet Socialist Republics": {
+    "edges": {
+      "from": [
+        "country:SU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Union of Soviet Socialist Republics"
+    }
+  },
+  "nym:Union of the Comoros": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Union of the Comoros"
+    }
+  },
+  "nym:Unit States": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Unit States"
+    }
+  },
+  "nym:Unite States": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Unite States"
+    }
+  },
+  "nym:United Arab Emirates": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Arab Emirates"
+    }
+  },
+  "nym:United Arab Republic": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Arab Republic"
+    }
+  },
+  "nym:United Kingdom of Great Britain and Northern Ireland": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Kingdom of Great Britain and Northern Ireland"
+    }
+  },
+  "nym:United Mexican States": {
+    "edges": {
+      "from": [
+        "country:MX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Mexican States"
+    }
+  },
+  "nym:United Republic of Tanzania": {
+    "edges": {
+      "from": [
+        "country:TZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Republic of Tanzania"
+    }
+  },
+  "nym:United Sat": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Sat"
+    }
+  },
+  "nym:United Staes": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Staes"
+    }
+  },
+  "nym:United Stated": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Stated"
+    }
+  },
+  "nym:United States of America": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United States of America"
+    }
+  },
+  "nym:United Stats": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Stats"
+    }
+  },
+  "nym:United Sttes": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United Sttes"
+    }
+  },
+  "nym:Unites States": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Unites States"
+    }
+  },
+  "nym:Unitit Kinrick": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Unitit Kinrick"
+    }
+  },
+  "nym:Untied State": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Untied State"
+    }
+  },
+  "nym:Uvea mo Futuna": {
+    "edges": {
+      "from": [
+        "territory:WF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Uvea mo Futuna"
+    }
+  },
+  "nym:Uzbek": {
+    "edges": {
+      "from": [
+        "country:UZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Uzbek"
+    }
+  },
+  "nym:VA": {
+    "edges": {
+      "from": [
+        "country:VA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "VA"
+    }
+  },
+  "nym:VC": {
+    "edges": {
+      "from": [
+        "country:VC"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "VC"
+    }
+  },
+  "nym:VE": {
+    "edges": {
+      "from": [
+        "country:VE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "VE"
+    }
+  },
+  "nym:VG": {
+    "edges": {
+      "from": [
+        "territory:VG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "VG"
+    }
+  },
+  "nym:VI": {
+    "edges": {
+      "from": [
+        "territory:VI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "VI"
+    }
+  },
+  "nym:VN": {
+    "edges": {
+      "from": [
+        "country:VN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "VN"
+    }
+  },
+  "nym:VU": {
+    "edges": {
+      "from": [
+        "country:VU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "VU"
+    }
+  },
+  "nym:Vatican City State": {
+    "edges": {
+      "from": [
+        "country:VA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Vatican City State"
+    }
+  },
+  "nym:Veitnam": {
+    "edges": {
+      "from": [
+        "country:VN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Veitnam"
+    }
+  },
+  "nym:Venezuela": {
+    "edges": {
+      "from": [
+        "country:VE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Venezuela"
+    }
+  },
+  "nym:Venezula": {
+    "edges": {
+      "from": [
+        "country:VE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Venezula"
+    }
+  },
+  "nym:Vietman": {
+    "edges": {
+      "from": [
+        "country:VN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Vietman"
+    }
+  },
+  "nym:Virgin Islands": {
+    "edges": {
+      "from": [
+        "territory:VG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Virgin Islands"
+    }
+  },
+  "nym:Virgin Islands of the United States": {
+    "edges": {
+      "from": [
+        "territory:VI"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Virgin Islands of the United States"
+    }
+  },
+  "nym:Virgina Islands": {
+    "edges": {
+      "from": [
+        "territory:VG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Virgina Islands"
+    }
+  },
+  "nym:Viti": {
+    "edges": {
+      "from": [
+        "country:FJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Viti"
+    }
+  },
+  "nym:Việt Nam": {
+    "edges": {
+      "from": [
+        "country:VN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Việt Nam"
+    }
+  },
+  "nym:Volta": {
+    "edges": {
+      "from": [
+        "country:BF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Volta"
+    }
+  },
+  "nym:Volívia": {
+    "edges": {
+      "from": [
+        "country:BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Volívia"
+    }
+  },
+  "nym:WF": {
+    "edges": {
+      "from": [
+        "territory:WF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "WF"
+    }
+  },
+  "nym:WLS": {
+    "edges": {
+      "from": [
+        "uk:WLS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "WLS"
+    }
+  },
+  "nym:WS": {
+    "edges": {
+      "from": [
+        "country:WS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "WS"
+    }
+  },
+  "nym:Wales": {
+    "edges": {
+      "from": [
+        "uk:WLS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Wales"
+    }
+  },
+  "nym:Wallis-et-Futuna": {
+    "edges": {
+      "from": [
+        "territory:WF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Wallis-et-Futuna"
+    }
+  },
+  "nym:West Pakistan": {
+    "edges": {
+      "from": [
+        "country:PK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "West Pakistan"
+    }
+  },
+  "nym:Western Sahara": {
+    "edges": {
+      "from": [
+        "territory:EH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Western Sahara"
+    }
+  },
+  "nym:Western samoa": {
+    "edges": {
+      "from": [
+        "country:WS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Western samoa"
+    }
+  },
+  "nym:White Russia": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "White Russia"
+    }
+  },
+  "nym:Wuliwya": {
+    "edges": {
+      "from": [
+        "country:BO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Wuliwya"
+    }
+  },
+  "nym:XK": {
+    "edges": {
+      "from": [
+        "country:XK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "XK"
+    }
+  },
+  "nym:XQZ": {
+    "edges": {
+      "from": [
+        "territory:XQZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "XQZ"
+    }
+  },
+  "nym:XXD": {
+    "edges": {
+      "from": [
+        "territory:XXD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "XXD"
+    }
+  },
+  "nym:Xīnjiāpō": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Xīnjiāpō"
+    }
+  },
+  "nym:Y Deyrnas Unedig": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Y Deyrnas Unedig"
+    }
+  },
+  "nym:YE": {
+    "edges": {
+      "from": [
+        "country:YE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "YE"
+    }
+  },
+  "nym:YT": {
+    "edges": {
+      "from": [
+        "territory:YT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "YT"
+    }
+  },
+  "nym:YU": {
+    "edges": {
+      "from": [
+        "country:YU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "YU"
+    }
+  },
+  "nym:Yaltopya": {
+    "edges": {
+      "from": [
+        "country:ET"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Yaltopya"
+    }
+  },
+  "nym:Yisra'el": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Yisra'el"
+    }
+  },
+  "nym:Yisrael": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Yisrael"
+    }
+  },
+  "nym:Yugosav": {
+    "edges": {
+      "from": [
+        "country:YU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Yugosav"
+    }
+  },
+  "nym:ZA": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ZA"
+    }
+  },
+  "nym:ZM": {
+    "edges": {
+      "from": [
+        "country:ZM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ZM"
+    }
+  },
+  "nym:ZW": {
+    "edges": {
+      "from": [
+        "country:ZW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ZW"
+    }
+  },
+  "nym:Zealnd": {
+    "edges": {
+      "from": [
+        "country:NZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zealnd"
+    }
+  },
+  "nym:Zeland": {
+    "edges": {
+      "from": [
+        "country:NZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zeland"
+    }
+  },
+  "nym:Zhongguo": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zhongguo"
+    }
+  },
+  "nym:Zhonghua": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zhonghua"
+    }
+  },
+  "nym:Zhonghua Peoples Republic": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zhonghua Peoples Republic"
+    }
+  },
+  "nym:Zhōngguó": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zhōngguó"
+    }
+  },
+  "nym:Zhōnghuá Mínguó": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zhōnghuá Mínguó"
+    }
+  },
+  "nym:Zion": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Zion"
+    }
+  },
+  "nym:Ztate of Katar": {
+    "edges": {
+      "from": [
+        "country:QA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ztate of Katar"
+    }
+  },
+  "nym:afganastan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "afganastan"
+    }
+  },
+  "nym:afganestan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "afganestan"
+    }
+  },
+  "nym:afganhistan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "afganhistan"
+    }
+  },
+  "nym:afganistan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "afganistan"
+    }
+  },
+  "nym:afghanistan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "afghanistan"
+    }
+  },
+  "nym:afghanlstan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "afghanlstan"
+    }
+  },
+  "nym:afghistan": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "afghistan"
+    }
+  },
+  "nym:aigeria": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "aigeria"
+    }
+  },
+  "nym:alabnia": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "alabnia"
+    }
+  },
+  "nym:albana": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "albana"
+    }
+  },
+  "nym:albania": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "albania"
+    }
+  },
+  "nym:albanian": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "albanian"
+    }
+  },
+  "nym:albanija": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "albanija"
+    }
+  },
+  "nym:albenia": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "albenia"
+    }
+  },
+  "nym:albiana": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "albiana"
+    }
+  },
+  "nym:alegeria": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "alegeria"
+    }
+  },
+  "nym:algeir": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "algeir"
+    }
+  },
+  "nym:algeirs": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "algeirs"
+    }
+  },
+  "nym:algeria": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "algeria"
+    }
+  },
+  "nym:algers": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "algers"
+    }
+  },
+  "nym:algieria": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "algieria"
+    }
+  },
+  "nym:algiers": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "algiers"
+    }
+  },
+  "nym:alibania": {
+    "edges": {
+      "from": [
+        "country:AL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "alibania"
+    }
+  },
+  "nym:americia": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "americia"
+    }
+  },
+  "nym:angolo": {
+    "edges": {
+      "from": [
+        "country:AO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "angolo"
+    }
+  },
+  "nym:arab emir ates": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "arab emir ates"
+    }
+  },
+  "nym:arab emirates": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "arab emirates"
+    }
+  },
+  "nym:argentiha": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "argentiha"
+    }
+  },
+  "nym:argentina": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "argentina"
+    }
+  },
+  "nym:argentine": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "argentine"
+    }
+  },
+  "nym:argentna": {
+    "edges": {
+      "from": [
+        "country:AR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "argentna"
+    }
+  },
+  "nym:arima": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "arima"
+    }
+  },
+  "nym:armenia": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "armenia"
+    }
+  },
+  "nym:arminia": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "arminia"
+    }
+  },
+  "nym:ausralia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ausralia"
+    }
+  },
+  "nym:austalia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "austalia"
+    }
+  },
+  "nym:austraila": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "austraila"
+    }
+  },
+  "nym:austrailia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "austrailia"
+    }
+  },
+  "nym:australa": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "australa"
+    }
+  },
+  "nym:australla": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "australla"
+    }
+  },
+  "nym:austrilia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "austrilia"
+    }
+  },
+  "nym:austrlia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "austrlia"
+    }
+  },
+  "nym:autralia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "autralia"
+    }
+  },
+  "nym:avstralia": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "avstralia"
+    }
+  },
+  "nym:avstria": {
+    "edges": {
+      "from": [
+        "country:AU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "avstria"
+    }
+  },
+  "nym:azebaijan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azebaijan"
+    }
+  },
+  "nym:azeraijan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azeraijan"
+    }
+  },
+  "nym:azerbaijan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbaijan"
+    }
+  },
+  "nym:azerbaijann": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbaijann"
+    }
+  },
+  "nym:azerbaisan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbaisan"
+    }
+  },
+  "nym:azerbaizan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbaizan"
+    }
+  },
+  "nym:azerbajan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbajan"
+    }
+  },
+  "nym:azerbaycan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbaycan"
+    }
+  },
+  "nym:azerbayjan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbayjan"
+    }
+  },
+  "nym:azerbeyjan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbeyjan"
+    }
+  },
+  "nym:azerbpijan": {
+    "edges": {
+      "from": [
+        "country:AZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "azerbpijan"
+    }
+  },
+  "nym:aş-Şūmāl": {
+    "edges": {
+      "from": [
+        "country:SO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "aş-Şūmāl"
+    }
+  },
+  "nym:iNingizimu Afrika": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "iNingizimu Afrika"
+    }
+  },
+  "nym:iSewula Afrika": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "iSewula Afrika"
+    }
+  },
+  "nym:il-ikwet": {
+    "edges": {
+      "from": [
+        "country:KW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "il-ikwet"
+    }
+  },
+  "nym:kaNgwane": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "kaNgwane"
+    }
+  },
+  "nym:uMzantsi Afrika": {
+    "edges": {
+      "from": [
+        "country:ZA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "uMzantsi Afrika"
+    }
+  },
+  "nym:weSwatini": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "weSwatini"
+    }
+  },
+  "nym:weSwatini Swatini Ngwane": {
+    "edges": {
+      "from": [
+        "country:SZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "weSwatini Swatini Ngwane"
+    }
+  },
+  "nym:Åland": {
+    "edges": {
+      "from": [
+        "territory:AX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Åland"
+    }
+  },
+  "nym:Åland Islands": {
+    "edges": {
+      "from": [
+        "territory:AX"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Åland Islands"
+    }
+  },
+  "nym:Éire": {
+    "edges": {
+      "from": [
+        "country:IE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Éire"
+    }
+  },
+  "nym:États-Unis": {
+    "edges": {
+      "from": [
+        "country:US"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "États-Unis"
+    }
+  },
+  "nym:Ísland": {
+    "edges": {
+      "from": [
+        "country:IS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ísland"
+    }
+  },
+  "nym:Îraq": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Îraq"
+    }
+  },
+  "nym:Österreich": {
+    "edges": {
+      "from": [
+        "country:AT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Österreich"
+    }
+  },
+  "nym:Česko": {
+    "edges": {
+      "from": [
+        "country:CZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Česko"
+    }
+  },
+  "nym:Česká": {
+    "edges": {
+      "from": [
+        "country:CZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Česká"
+    }
+  },
+  "nym:Česká republika": {
+    "edges": {
+      "from": [
+        "country:CZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Česká republika"
+    }
+  },
+  "nym:Īrān": {
+    "edges": {
+      "from": [
+        "country:IR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Īrān"
+    }
+  },
+  "nym:Ελλάδα": {
+    "edges": {
+      "from": [
+        "country:GR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ελλάδα"
+    }
+  },
+  "nym:Ελλάς": {
+    "edges": {
+      "from": [
+        "country:GR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ελλάς"
+    }
+  },
+  "nym:Κύπρος": {
+    "edges": {
+      "from": [
+        "country:CY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Κύπρος"
+    }
+  },
+  "nym:Ўзбекистон": {
+    "edges": {
+      "from": [
+        "country:UZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ўзбекистон"
+    }
+  },
+  "nym:Беларусь": {
+    "edges": {
+      "from": [
+        "country:BY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Беларусь"
+    }
+  },
+  "nym:Босна и Херцеговина": {
+    "edges": {
+      "from": [
+        "country:BA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Босна и Херцеговина"
+    }
+  },
+  "nym:България": {
+    "edges": {
+      "from": [
+        "country:BG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "България"
+    }
+  },
+  "nym:Казахстан": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Казахстан"
+    }
+  },
+  "nym:Киргизия": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Киргизия"
+    }
+  },
+  "nym:Косово": {
+    "edges": {
+      "from": [
+        "country:XK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Косово"
+    }
+  },
+  "nym:Кыргызстан": {
+    "edges": {
+      "from": [
+        "country:KG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Кыргызстан"
+    }
+  },
+  "nym:Македонија": {
+    "edges": {
+      "from": [
+        "country:MK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Македонија"
+    }
+  },
+  "nym:Монгол Улс": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Монгол Улс"
+    }
+  },
+  "nym:Монгол улс": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Монгол улс"
+    }
+  },
+  "nym:Российская": {
+    "edges": {
+      "from": [
+        "country:RU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Российская"
+    }
+  },
+  "nym:Россия": {
+    "edges": {
+      "from": [
+        "country:RU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Россия"
+    }
+  },
+  "nym:Россия1": {
+    "edges": {
+      "from": [
+        "country:RU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Россия1"
+    }
+  },
+  "nym:Союз Советских Социалистических Республик": {
+    "edges": {
+      "from": [
+        "country:SU"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Союз Советских Социалистических Республик"
+    }
+  },
+  "nym:Србија": {
+    "edges": {
+      "from": [
+        "country:RS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Србија"
+    }
+  },
+  "nym:Србија Srbija": {
+    "edges": {
+      "from": [
+        "country:RS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Србија Srbija"
+    }
+  },
+  "nym:Тоҷикистон": {
+    "edges": {
+      "from": [
+        "country:TJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Тоҷикистон"
+    }
+  },
+  "nym:Україна": {
+    "edges": {
+      "from": [
+        "country:UA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Україна"
+    }
+  },
+  "nym:Црна Гора": {
+    "edges": {
+      "from": [
+        "country:ME"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Црна Гора"
+    }
+  },
+  "nym:Қазақстан": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Қазақстан"
+    }
+  },
+  "nym:Հայաստան": {
+    "edges": {
+      "from": [
+        "country:AM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Հայաստան"
+    }
+  },
+  "nym:ישראל": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ישראל"
+    }
+  },
+  "nym:إرتريا": {
+    "edges": {
+      "from": [
+        "country:ER"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "إرتريا"
+    }
+  },
+  "nym:إسرائيل": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "إسرائيل"
+    }
+  },
+  "nym:إسرائيل ישראל": {
+    "edges": {
+      "from": [
+        "country:IL"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "إسرائيل ישראל"
+    }
+  },
+  "nym:افغانستان": {
+    "edges": {
+      "from": [
+        "country:AF"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "افغانستان"
+    }
+  },
+  "nym:الأردن": {
+    "edges": {
+      "from": [
+        "country:JO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "الأردن"
+    }
+  },
+  "nym:الإمارات": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "الإمارات"
+    }
+  },
+  "nym:الإمارات العربيّة المتّحدة": {
+    "edges": {
+      "from": [
+        "country:AE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "الإمارات العربيّة المتّحدة"
+    }
+  },
+  "nym:البحرين": {
+    "edges": {
+      "from": [
+        "country:BH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "البحرين"
+    }
+  },
+  "nym:الجزائر": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "الجزائر"
+    }
+  },
+  "nym:السعودية": {
+    "edges": {
+      "from": [
+        "country:SA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "السعودية"
+    }
+  },
+  "nym:السودان": {
+    "edges": {
+      "from": [
+        "country:SD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "السودان"
+    }
+  },
+  "nym:الصومال": {
+    "edges": {
+      "from": [
+        "country:SO"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "الصومال"
+    }
+  },
+  "nym:العراق": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "العراق"
+    }
+  },
+  "nym:العراق‎": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "العراق‎"
+    }
+  },
+  "nym:الكويت": {
+    "edges": {
+      "from": [
+        "country:KW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "الكويت"
+    }
+  },
+  "nym:المغرب": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "المغرب"
+    }
+  },
+  "nym:المملكة العربية السعودية": {
+    "edges": {
+      "from": [
+        "country:SA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "المملكة العربية السعودية"
+    }
+  },
+  "nym:الموريتانية": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "الموريتانية"
+    }
+  },
+  "nym:اليمن": {
+    "edges": {
+      "from": [
+        "country:YE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "اليمن"
+    }
+  },
+  "nym:ایران": {
+    "edges": {
+      "from": [
+        "country:IR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ایران"
+    }
+  },
+  "nym:بروني": {
+    "edges": {
+      "from": [
+        "country:BN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "بروني"
+    }
+  },
+  "nym:تشاد": {
+    "edges": {
+      "from": [
+        "country:TD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "تشاد"
+    }
+  },
+  "nym:تشاد‎": {
+    "edges": {
+      "from": [
+        "country:TD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "تشاد‎"
+    }
+  },
+  "nym:تونس": {
+    "edges": {
+      "from": [
+        "country:TN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "تونس"
+    }
+  },
+  "nym:جز القمر": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "جز القمر"
+    }
+  },
+  "nym:جزر القمر": {
+    "edges": {
+      "from": [
+        "country:KM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "جزر القمر"
+    }
+  },
+  "nym:جيبوتي": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "جيبوتي"
+    }
+  },
+  "nym:جيبوتي‎": {
+    "edges": {
+      "from": [
+        "country:DJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "جيبوتي‎"
+    }
+  },
+  "nym:دولة الكويت": {
+    "edges": {
+      "from": [
+        "country:KW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "دولة الكويت"
+    }
+  },
+  "nym:سورية": {
+    "edges": {
+      "from": [
+        "country:SY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "سورية"
+    }
+  },
+  "nym:عمان": {
+    "edges": {
+      "from": [
+        "country:OM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "عمان"
+    }
+  },
+  "nym:عُمان": {
+    "edges": {
+      "from": [
+        "country:OM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "عُمان"
+    }
+  },
+  "nym:فلسطين": {
+    "edges": {
+      "from": [
+        "territory:PS"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "فلسطين"
+    }
+  },
+  "nym:قازاقستان": {
+    "edges": {
+      "from": [
+        "country:KZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "قازاقستان"
+    }
+  },
+  "nym:قطر": {
+    "edges": {
+      "from": [
+        "country:QA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "قطر"
+    }
+  },
+  "nym:لبنان": {
+    "edges": {
+      "from": [
+        "country:LB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "لبنان"
+    }
+  },
+  "nym:لصحراء الغربية": {
+    "edges": {
+      "from": [
+        "territory:EH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "لصحراء الغربية"
+    }
+  },
+  "nym:ليبيا": {
+    "edges": {
+      "from": [
+        "country:LY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ليبيا"
+    }
+  },
+  "nym:مصر": {
+    "edges": {
+      "from": [
+        "country:EG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "مصر"
+    }
+  },
+  "nym:موريتانيا": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "موريتانيا"
+    }
+  },
+  "nym:پاکستان": {
+    "edges": {
+      "from": [
+        "country:PK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "پاکستان"
+    }
+  },
+  "nym:नेपाल": {
+    "edges": {
+      "from": [
+        "country:NP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "नेपाल"
+    }
+  },
+  "nym:फ़िजी": {
+    "edges": {
+      "from": [
+        "country:FJ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "फ़िजी"
+    }
+  },
+  "nym:भारत": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "भारत"
+    }
+  },
+  "nym:भारत गणराज्य": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "भारत गणराज्य"
+    }
+  },
+  "nym:भारतम्": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "भारतम्"
+    }
+  },
+  "nym:भूटान": {
+    "edges": {
+      "from": [
+        "country:BT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "भूटान"
+    }
+  },
+  "nym:शर्नम्": {
+    "edges": {
+      "from": [
+        "country:SR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "शर्नम्"
+    }
+  },
+  "nym:বাংলাদেশ": {
+    "edges": {
+      "from": [
+        "country:BD"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "বাংলাদেশ"
+    }
+  },
+  "nym:ভারত": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ভারত"
+    }
+  },
+  "nym:ভাৰত": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ভাৰত"
+    }
+  },
+  "nym:ਭਾਰਤ": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ਭਾਰਤ"
+    }
+  },
+  "nym:ભારત": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ભારત"
+    }
+  },
+  "nym:ଭାରତ": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ଭାରତ"
+    }
+  },
+  "nym:இலங்கை": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "இலங்கை"
+    }
+  },
+  "nym:சிங்கப்பூர்": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "சிங்கப்பூர்"
+    }
+  },
+  "nym:சிங்கப்பூர் குடியரசு": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "சிங்கப்பூர் குடியரசு"
+    }
+  },
+  "nym:சிங்கப்பூர்கு": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "சிங்கப்பூர்கு"
+    }
+  },
+  "nym:டியரசு": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "டியரசு"
+    }
+  },
+  "nym:பாரதம்": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "பாரதம்"
+    }
+  },
+  "nym:மலேசியா": {
+    "edges": {
+      "from": [
+        "country:MY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "மலேசியா"
+    }
+  },
+  "nym:భారత దేశం": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "భారత దేశం"
+    }
+  },
+  "nym:ಭಾರತ": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ಭಾರತ"
+    }
+  },
+  "nym:ഭാരതം": {
+    "edges": {
+      "from": [
+        "country:IN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ഭാരതം"
+    }
+  },
+  "nym:ශ්‍රී ලංකා": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ශ්‍රී ලංකා"
+    }
+  },
+  "nym:ශ්‍රී ලංකා இலங்கை": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ශ්‍රී ලංකා இலங்கை"
+    }
+  },
+  "nym:ශ්‍රී ලංකාව": {
+    "edges": {
+      "from": [
+        "country:LK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ශ්‍රී ලංකාව"
+    }
+  },
+  "nym:ประเทศไทย": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ประเทศไทย"
+    }
+  },
+  "nym:ราชอาณาจักรไทย": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ราชอาณาจักรไทย"
+    }
+  },
+  "nym:เมืองไทย": {
+    "edges": {
+      "from": [
+        "country:TH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "เมืองไทย"
+    }
+  },
+  "nym:ປະເທດລາວ": {
+    "edges": {
+      "from": [
+        "country:LA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ປະເທດລາວ"
+    }
+  },
+  "nym:འབྲུག་ཡུལ": {
+    "edges": {
+      "from": [
+        "country:BT"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "འབྲུག་ཡུལ"
+    }
+  },
+  "nym:မြန်မာ": {
+    "edges": {
+      "from": [
+        "country:MM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "မြန်မာ"
+    }
+  },
+  "nym:საქართველო": {
+    "edges": {
+      "from": [
+        "country:GE"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "საქართველო"
+    }
+  },
+  "nym:ኢትዮጵያ": {
+    "edges": {
+      "from": [
+        "country:ET"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ኢትዮጵያ"
+    }
+  },
+  "nym:ኤርትራ": {
+    "edges": {
+      "from": [
+        "country:ER"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ኤርትራ"
+    }
+  },
+  "nym:កម្ពុជា": {
+    "edges": {
+      "from": [
+        "country:KH"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "កម្ពុជា"
+    }
+  },
+  "nym:ᠮᠤᠩᠭᠤᠯ ᠤᠯᠤᠰ": {
+    "edges": {
+      "from": [
+        "country:MN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ᠮᠤᠩᠭᠤᠯ ᠤᠯᠤᠰ"
+    }
+  },
+  "nym:‎": {
+    "edges": {
+      "from": [
+        "country:IQ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "‎"
+    }
+  },
+  "nym:‘Umān": {
+    "edges": {
+      "from": [
+        "country:OM"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "‘Umān"
+    }
+  },
+  "nym:ⴰⴳⴰⵡⵛ": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ⴰⴳⴰⵡⵛ"
+    }
+  },
+  "nym:ⴰⵎⵔⵔⵓⴽ": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ⴰⵎⵔⵔⵓⴽ"
+    }
+  },
+  "nym:ⴷⵣⴰⵢⴻⵔ": {
+    "edges": {
+      "from": [
+        "country:DZ"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ⴷⵣⴰⵢⴻⵔ"
+    }
+  },
+  "nym:ⵍⵉⴱⵢⴰ": {
+    "edges": {
+      "from": [
+        "country:LY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ⵍⵉⴱⵢⴰ"
+    }
+  },
+  "nym:ⵍⵎⵖⵔⵉⴱ": {
+    "edges": {
+      "from": [
+        "country:MA"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ⵍⵎⵖⵔⵉⴱ"
+    }
+  },
+  "nym:ⵎⵓⵔⵉⵜⴰⵏ": {
+    "edges": {
+      "from": [
+        "country:MR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ⵎⵓⵔⵉⵜⴰⵏ"
+    }
+  },
+  "nym:ⵜⵓⵏⵙ": {
+    "edges": {
+      "from": [
+        "country:TN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "ⵜⵓⵏⵙ"
+    }
+  },
+  "nym:中华": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "中华"
+    }
+  },
+  "nym:中国": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "中国"
+    }
+  },
+  "nym:中国/中华": {
+    "edges": {
+      "from": [
+        "country:CN"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "中国/中华"
+    }
+  },
+  "nym:中華民國": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "中華民國"
+    }
+  },
+  "nym:台灣": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "台灣"
+    }
+  },
+  "nym:新加坡": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "新加坡"
+    }
+  },
+  "nym:新加坡共和国": {
+    "edges": {
+      "from": [
+        "country:SG"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "新加坡共和国"
+    }
+  },
+  "nym:日本": {
+    "edges": {
+      "from": [
+        "country:JP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "日本"
+    }
+  },
+  "nym:臺灣": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "臺灣"
+    }
+  },
+  "nym:臺灣/台灣": {
+    "edges": {
+      "from": [
+        "territory:TW"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "臺灣/台灣"
+    }
+  },
+  "nym:香港": {
+    "edges": {
+      "from": [
+        "territory:HK"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "香港"
+    }
+  },
+  "nym:马来西亚": {
+    "edges": {
+      "from": [
+        "country:MY"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "马来西亚"
+    }
+  },
+  "nym:남한": {
+    "edges": {
+      "from": [
+        "country:KR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "남한"
+    }
+  },
+  "nym:북조선": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "북조선"
+    }
+  },
+  "nym:조선 / 朝鮮": {
+    "edges": {
+      "from": [
+        "country:KP"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "조선 / 朝鮮"
+    }
+  },
+  "nym:한국 / 韓國": {
+    "edges": {
+      "from": [
+        "country:KR"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": false,
+      "stable-name": false
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "한국 / 韓國"
+    }
+  },
+  "territory:AE-AJ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ajman"
+    }
+  },
+  "territory:AE-AZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Abu Dhabi"
+    }
+  },
+  "territory:AE-DU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dubai"
+    }
+  },
+  "territory:AE-FU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Fujairah"
+    }
+  },
+  "territory:AE-RK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ras al-Khaimah"
+    }
+  },
+  "territory:AE-SH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sharjah"
+    }
+  },
+  "territory:AE-UQ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Umm al-Quwain"
+    }
+  },
+  "territory:AI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Anguilla"
+    }
+  },
+  "territory:AQ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Antarctica"
+    }
+  },
+  "territory:AS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "American Samoa"
+    }
+  },
+  "territory:AW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Aruba"
+    }
+  },
+  "territory:AX": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Åland Islands"
+    }
+  },
+  "territory:BAT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "British Antarctic Territory"
+    }
+  },
+  "territory:BL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint Barthélemy"
+    }
+  },
+  "territory:BM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bermuda"
+    }
+  },
+  "territory:BQ-BO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bonaire"
+    }
+  },
+  "territory:BQ-SA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saba"
+    }
+  },
+  "territory:BQ-SE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sint Eustatius"
+    }
+  },
+  "territory:BV": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Bouvet Island"
+    }
+  },
+  "territory:CC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cocos (Keeling) Islands"
+    }
+  },
+  "territory:CK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cook Islands"
+    }
+  },
+  "territory:CW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Curaçao"
+    }
+  },
+  "territory:CX": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Christmas Island"
+    }
+  },
+  "territory:EH": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Western Sahara"
+    }
+  },
+  "territory:ES-CE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ceuta"
+    }
+  },
+  "territory:ES-ML": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Melilla"
+    }
+  },
+  "territory:FK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Falkland Islands"
+    }
+  },
+  "territory:FO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Faroe Islands"
+    }
+  },
+  "territory:GF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Guiana"
+    }
+  },
+  "territory:GG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guernsey"
+    }
+  },
+  "territory:GI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Gibraltar"
+    }
+  },
+  "territory:GL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Greenland"
+    }
+  },
+  "territory:GP": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guadeloupe"
+    }
+  },
+  "territory:GS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "South Georgia and South Sandwich Islands"
+    }
+  },
+  "territory:GU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Guam"
+    }
+  },
+  "territory:HK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Hong Kong"
+    }
+  },
+  "territory:HM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Heard Island and McDonald Islands"
+    }
+  },
+  "territory:IM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Isle of Man"
+    }
+  },
+  "territory:IO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "British Indian Ocean Territory"
+    }
+  },
+  "territory:JE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jersey"
+    }
+  },
+  "territory:KY": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Cayman Islands"
+    }
+  },
+  "territory:MF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint-Martin (French part)"
+    }
+  },
+  "territory:MO": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Macao"
+    }
+  },
+  "territory:MP": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Northern Mariana Islands"
+    }
+  },
+  "territory:MQ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Martinique"
+    }
+  },
+  "territory:MS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Montserrat"
+    }
+  },
+  "territory:NC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "New Caledonia"
+    }
+  },
+  "territory:NF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Norfolk Island"
+    }
+  },
+  "territory:NU": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Niue"
+    }
+  },
+  "territory:PF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Polynesia"
+    }
+  },
+  "territory:PM": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint Pierre and Miquelon"
+    }
+  },
+  "territory:PN": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Pitcairn, Henderson, Ducie and Oeno Islands"
+    }
+  },
+  "territory:PR": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Puerto Rico"
+    }
+  },
+  "territory:PS": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Occupied Palestinian Territories"
+    }
+  },
+  "territory:RE": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Réunion"
+    }
+  },
+  "territory:SH-AC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Ascension"
+    }
+  },
+  "territory:SH-HL": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Saint Helena"
+    }
+  },
+  "territory:SH-TA": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tristan da Cunha"
+    }
+  },
+  "territory:SJ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Svalbard and Jan Mayen"
+    }
+  },
+  "territory:SX": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Sint Maarten (Dutch part)"
+    }
+  },
+  "territory:TC": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Turks and Caicos Islands"
+    }
+  },
+  "territory:TF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "French Southern Territories"
+    }
+  },
+  "territory:TK": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Tokelau"
+    }
+  },
+  "territory:TW": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Taiwan"
+    }
+  },
+  "territory:UM-67": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Johnston Atoll"
+    }
+  },
+  "territory:UM-71": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Midway Islands"
+    }
+  },
+  "territory:UM-76": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Navassa Island"
+    }
+  },
+  "territory:UM-79": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Wake Island"
+    }
+  },
+  "territory:UM-81": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Baker Island"
+    }
+  },
+  "territory:UM-84": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Howland Island"
+    }
+  },
+  "territory:UM-86": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Jarvis Island"
+    }
+  },
+  "territory:UM-89": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Kingman Reef"
+    }
+  },
+  "territory:UM-95": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Palmyra Atoll"
+    }
+  },
+  "territory:VG": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "British Virgin Islands"
+    }
+  },
+  "territory:VI": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "United States Virgin Islands"
+    }
+  },
+  "territory:WF": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Wallis and Futuna"
+    }
+  },
+  "territory:XQZ": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Akrotiri"
+    }
+  },
+  "territory:XXD": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Dhekelia"
+    }
+  },
+  "territory:YT": {
+    "edges": {
+      "from": [
+      ]
+    },
+    "meta": {
+      "canonical": true,
+      "canonical-mask": 1,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Mayotte"
+    }
+  },
+  "uk:ENG": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "England"
+    }
+  },
+  "uk:GBN": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Great Britain"
+    }
+  },
+  "uk:NIR": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Northern Ireland"
+    }
+  },
+  "uk:SCT": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Scotland"
+    }
+  },
+  "uk:WLS": {
+    "edges": {
+      "from": [
+        "country:GB"
+      ]
+    },
+    "meta": {
+      "canonical": false,
+      "canonical-mask": 0,
+      "display-name": true,
+      "stable-name": true
+    },
+    "names": {
+      "cy": false,
+      "en-GB": "Wales"
+    }
+  }
+}
diff --git a/notifications_utils/countries/_data/synonyms.json b/notifications_utils/countries/_data/synonyms.json
new file mode 100644
index 0000000000..69c712f2a8
--- /dev/null
+++ b/notifications_utils/countries/_data/synonyms.json
@@ -0,0 +1,58 @@
+{
+  "England": "United Kingdom",
+  "Northern Ireland": "United Kingdom",
+  "Scotland": "United Kingdom",
+  "Wales": "United Kingdom",
+  "ROI": "Ireland",
+  "Irish Republic": "Ireland",
+  "Rep of Ireland": "Ireland",
+  "South Ireland": "Ireland",
+  "Southern Ireland": "Ireland",
+  "N Ireland": "United Kingdom",
+  "North Ireland": "United Kingdom",
+  "GBR": "United Kingdom",
+  "United States America": "United States",
+  "America": "United States",
+  "Macedonia": "North Macedonia",
+  "Autonomous Region of the Azores": "Azores",
+  "Islas Canarias": "Canary Islands",
+  "Canaries": "Canary Islands",
+  "Autonomous Region of Madeira": "Madeira",
+  "Região Autónoma da Madeira": "Madeira",
+  "Islas Baleares": "Balearic Islands",
+  "Illes Balears": "Balearic Islands",
+  "Corse": "Corsica",
+  "Burma": "Myanmar (Burma)",
+  "Czechoslovakia": "Czechia",
+  "East Germany": "Germany",
+  "Easter Island": "Easter Island",
+  "Falkland": "Falkland Islands",
+  "The Falklands": "Falkland Islands",
+  "The Falkland Islands": "Falkland Islands",
+  "Hawaii": "United States",
+  "Khazakhstan": "Kazakhstan",
+  "Korea": "South Korea",
+  "Macau": "Macao",
+  "Myanmar": "Myanmar (Burma)",
+  "New Zeeland": "New Zealand",
+  "NI": "United Kingdom",
+  "Pitcairn Island": "Pitcairn, Henderson, Ducie and Oeno Islands",
+  "Henderson Island": "Pitcairn, Henderson, Ducie and Oeno Islands",
+  "Ducie Island": "Pitcairn, Henderson, Ducie and Oeno Islands",
+  "Oeno Island": "Pitcairn, Henderson, Ducie and Oeno Islands",
+  "Republic of China": "Taiwan",
+  "Republik Österreich": "Austria",
+  "République Islamique de Mauritanie": "Mauritania",
+  "Saint Helena": "Saint Helena",
+  "St Helena": "Saint Helena",
+  "Swaziland": "Eswatini",
+  "the south sandwich islands": "South Georgia and the South Sandwich Islands",
+  "the sandwich islands": "South Georgia and the South Sandwich Islands",
+  "South Georgia": "South Georgia and the South Sandwich Islands",
+  "Tristan": "Tristan da Cunha",
+  "Vatican": "Vatican City",
+  "West Germany": "Germany",
+  "Saint Kitts and Nevis": "St Kitts and Nevis",
+  "Saint Kitts": "St Kitts and Nevis",
+  "St Kitts": "St Kitts and Nevis"
+}
diff --git a/notifications_utils/countries/_data/uk-islands.txt b/notifications_utils/countries/_data/uk-islands.txt
new file mode 100644
index 0000000000..d678109e12
--- /dev/null
+++ b/notifications_utils/countries/_data/uk-islands.txt
@@ -0,0 +1,8 @@
+Alderney
+Brecqhou
+Guernsey
+Herm
+Isle of Man
+Jersey
+Jethou
+Sark
diff --git a/notifications_utils/countries/_data/welsh-names.json b/notifications_utils/countries/_data/welsh-names.json
new file mode 100644
index 0000000000..edfbf2ac35
--- /dev/null
+++ b/notifications_utils/countries/_data/welsh-names.json
@@ -0,0 +1,103 @@
+{
+  "Affganistan": "Afghanistan",
+  "Antigwa a Barbiwda": "Antigua and Barbuda",
+  "Yr Ariannin": "Argentina",
+  "Awstralia": "Australia",
+  "Awstria": "Austria",
+  "Aserbaijan": "Azerbaijan",
+  "Y Bahamas": "The Bahamas",
+  "Belarws": "Belarus",
+  "Gwlad Belg": "Belgium",
+  "Bhwtan": "Bhutan",
+  "Bolifia": "Bolivia",
+  "Bosnia a Hercegovina": "Bosnia and Herzegovina",
+  "Brasil": "Brazil",
+  "Bwlgaria": "Bulgaria",
+  "Bwrwndi": "Burundi",
+  "Camerŵn": "Cameroon",
+  "Cabo Verde": "Cape Verde",
+  "Gweriniaeth Canolbarth Affrica": "Central African Republic",
+  "Tchad": "Chad",
+  "Tsieina": "China",
+  "Y Comoros": "Comoros",
+  "Ciwba": "Cuba",
+  "Y Weriniaeth Tsiec": "Czechia",
+  "Gweriniaeth Ddemocrataidd Congo": "Congo (Democratic Republic)",
+  "Denmarc": "Denmark",
+  "Gweriniaeth Dominica": "Dominican Republic",
+  "Dwyrain Timor": "East Timor",
+  "Ecwador": "Ecuador",
+  "Yr Aifft": "Egypt",
+  "Gini Gyhydeddol": "Equatorial Guinea",
+  "Ffiji": "Fiji",
+  "Y Ffindir": "Finland",
+  "Ffrainc": "France",
+  "Y Gambia": "The Gambia",
+  "Yr Alban": "United Kingdom",
+  "Yr Almaen": "Germany",
+  "Gwlad Groeg": "Greece",
+  "Gini": "Guinea",
+  "Guiné-Bissau": "Guinea-Bissau",
+  "Gaiana": "Guyana",
+  "Hondwras": "Honduras",
+  "Hwngari": "Hungary",
+  "Gwlad yr Iâ": "Iceland",
+  "Irac": "Iraq",
+  "Iwerddon": "Ireland",
+  "Yr Eidal": "Italy",
+  "Iorddonen": "Jordan",
+  "Kazakstan": "Kazakhstan",
+  "Latfia": "Latvia",
+  "Libanus": "Lebanon",
+  "Libia": "Libya",
+  "Lithwania": "Lithuania",
+  "Lwcsembwrg": "Luxembourg",
+  "Madagasgar": "Madagascar",
+  "Ynysoedd Marshall": "Marshall Islands",
+  "Mecsico": "Mexico",
+  "Moldofa": "Moldova",
+  "Moroco": "Morocco",
+  "Mosambic": "Mozambique",
+  "Yr Iseldiroedd": "Netherlands",
+  "Seland Newydd": "New Zealand",
+  "Nicaragwa": "Nicaragua",
+  "Gogledd Corea": "North Korea",
+  "Norwy": "Norway",
+  "Papua Guinea Newydd": "Papua New Guinea",
+  "Paragwâi": "Paraguay",
+  "Periw": "Peru",
+  "Pilipinas": "Philippines",
+  "Gwlad Pwyl": "Poland",
+  "Portiwgal": "Portugal",
+  "Gweriniaeth y Congo": "Congo",
+  "Gweriniaeth Macedonia": "North Macedonia",
+  "Gogledd Macedonia": "North Macedonia",
+  "Rwmania": "Romania",
+  "Rwsia": "Russia",
+  "Saint Kitts a Nevis": "St Kitts and Nevis",
+  "St Kitts a Nevis": "St Kitts and Nevis",
+  "Saint Vincent a’r Grenadines": "St Vincent",
+  "São Tomé a Príncipe": "Sao Tome and Principe",
+  "Sénégal": "Senegal",
+  "Slofacia": "Slovakia",
+  "Slofenia": "Slovenia",
+  "Ynysoedd Solomon": "Solomon Islands",
+  "De Affrica": "South Africa",
+  "De Corea": "South Korea",
+  "De Sudan": "South Sudan",
+  "Sbaen": "Spain",
+  "Swrinam": "Suriname",
+  "Gwlad Swazi": "Eswatini",
+  "Y Swistir": "Switzerland",
+  "Gwlad Thai": "Thailand",
+  "Trinidad a Thobago": "Trinidad and Tobago",
+  "Twrci": "Turkey",
+  "Twfalw": "Tuvalu",
+  "Wcráin": "Ukraine",
+  "Yr Emiradau Arabaidd Unedig": "United Arab Emirates",
+  "Y Deyrnas Unedig": "United Kingdom",
+  "Unol Daleithiau America": "United States",
+  "Wrwgwái": "Uruguay",
+  "Feneswela": "Venezuela",
+  "Fietnam": "Vietnam"
+}
diff --git a/notifications_utils/countries/data.py b/notifications_utils/countries/data.py
new file mode 100644
index 0000000000..0acabb22de
--- /dev/null
+++ b/notifications_utils/countries/data.py
@@ -0,0 +1,67 @@
+import json
+import os
+
+
+def _load_data(filename):
+    with open(os.path.join(os.path.dirname(__file__), "_data", filename)) as contents:
+        if filename.endswith(".json"):
+            return json.load(contents)
+        return [line.strip() for line in contents.readlines()]
+
+
+def find_canonical(item, graph, key):
+    if item["meta"]["canonical"]:
+        return key, item["names"]["en-GB"]
+    return find_canonical(
+        graph[item["edges"]["from"][0]],
+        graph,
+        key,
+    )
+
+
+# Copied from
+# https://github.com/alphagov/govuk-country-and-territory-autocomplete
+# /blob/b61091a502983fd2a77b3cdb5f94a604412eb093
+# /dist/location-autocomplete-graph.json
+_graph = _load_data("location-autocomplete-graph.json")
+
+UK = "United Kingdom"
+
+ENDED_COUNTRIES = _load_data("ended-countries.json")
+ADDITIONAL_SYNONYMS = list(_load_data("synonyms.json").items())
+WELSH_NAMES = list(_load_data("welsh-names.json").items())
+_UK_ISLANDS_LIST = _load_data("uk-islands.txt")
+_EUROPEAN_ISLANDS_LIST = _load_data("european-islands.txt")
+
+CURRENT_AND_ENDED_COUNTRIES_AND_TERRITORIES = [
+    find_canonical(item, _graph, item["names"]["en-GB"]) for item in _graph.values()
+]
+
+COUNTRIES_AND_TERRITORIES = []
+
+for synonym, canonical in CURRENT_AND_ENDED_COUNTRIES_AND_TERRITORIES:
+    if canonical in _UK_ISLANDS_LIST:
+        COUNTRIES_AND_TERRITORIES.append((synonym, UK))
+    elif canonical in ENDED_COUNTRIES:
+        succeeding_country = ENDED_COUNTRIES[canonical]
+        if succeeding_country:
+            COUNTRIES_AND_TERRITORIES.append((synonym, succeeding_country))
+            COUNTRIES_AND_TERRITORIES.append((canonical, succeeding_country))
+    else:
+        COUNTRIES_AND_TERRITORIES.append((synonym, canonical))
+
+UK_ISLANDS = [(synonym, UK) for synonym in _UK_ISLANDS_LIST]
+
+EUROPEAN_ISLANDS = [(synonym, synonym) for synonym in _EUROPEAN_ISLANDS_LIST]
+
+# Copied from https://www.royalmail.com/international-zones#europe
+# Modified to use the canonical names for countries where incorrect
+ROYAL_MAIL_EUROPEAN = _load_data("europe.txt")
+
+
+class Postage:
+    UK = "united-kingdom"
+    FIRST = "first"
+    SECOND = "second"
+    EUROPE = "europe"
+    REST_OF_WORLD = "rest-of-world"
diff --git a/notifications_utils/field.py b/notifications_utils/field.py
new file mode 100644
index 0000000000..c0ea50216b
--- /dev/null
+++ b/notifications_utils/field.py
@@ -0,0 +1,208 @@
+import re
+
+from markupsafe import Markup
+from ordered_set import OrderedSet
+
+from notifications_utils.formatters import (
+    escape_html,
+    strip_and_remove_obscure_whitespace,
+    strip_html,
+    unescaped_formatted_list,
+)
+from notifications_utils.insensitive_dict import InsensitiveDict
+
+
+class Placeholder:
+    def __init__(self, body):
+        # body shouldn’t include leading/trailing brackets, like (( and ))
+        self.body = body.lstrip("(").rstrip(")")
+
+    @classmethod
+    def from_match(cls, match):
+        return cls(match.group(0))
+
+    def is_conditional(self):
+        return "??" in self.body
+
+    @property
+    def name(self):
+        # for non conditionals, name equals body
+        return self.body.split("??")[0]
+
+    @property
+    def conditional_text(self):
+        if self.is_conditional():
+            # ((a?? b??c)) returns " b??c"
+            return "??".join(self.body.split("??")[1:])
+        else:
+            raise ValueError("{} not conditional".format(self))
+
+    def get_conditional_body(self, show_conditional):
+        # note: unsanitised/converted
+        if self.is_conditional():
+            return self.conditional_text if str2bool(show_conditional) else ""
+        else:
+            raise ValueError("{} not conditional".format(self))
+
+    def __repr__(self):
+        return "Placeholder({})".format(self.body)
+
+
+class Field:
+    """
+    An instance of Field represents a string of text which may contain
+    placeholders.
+
+    If values are provided the field replaces the placeholders with the
+    corresponding values. If a value for a placeholder is missing then
+    the field will highlight the placeholder by wrapping it in some HTML.
+
+    A template can have several fields, for example an email template
+    has a field for the body and a field for the subject.
+    """
+
+    placeholder_pattern = re.compile(
+        r"\({2}"  # opening ((
+        r"([^()]+)"  # body of placeholder - potentially standard or conditional.
+        r"\){2}"  # closing ))
+    )
+    placeholder_tag = "<span class='placeholder'>(({}))</span>"
+    conditional_placeholder_tag = (
+        "<span class='placeholder-conditional'>(({}??</span>{}))"
+    )
+    placeholder_tag_no_brackets = "<span class='placeholder-no-brackets'>{}</span>"
+    placeholder_tag_redacted = "<span class='placeholder-redacted'>hidden</span>"
+
+    def __init__(
+        self,
+        content,
+        values=None,
+        with_brackets=True,
+        html="strip",
+        markdown_lists=False,
+        redact_missing_personalisation=False,
+    ):
+        self.content = content
+        self.values = values
+        self.markdown_lists = markdown_lists
+        if not with_brackets:
+            self.placeholder_tag = self.placeholder_tag_no_brackets
+        self.sanitizer = {
+            "strip": strip_html,
+            "escape": escape_html,
+            "passthrough": str,
+        }[html]
+        self.redact_missing_personalisation = redact_missing_personalisation
+
+    def __str__(self):
+        if self.values:
+            return self.replaced
+        return self.formatted
+
+    def __repr__(self):
+        return '{}("{}", {})'.format(
+            self.__class__.__name__, self.content, self.values
+        )  # TODO: more real
+
+    def splitlines(self):
+        return str(self).splitlines()
+
+    @property
+    def values(self):
+        return self._values
+
+    @values.setter
+    def values(self, value):
+        self._values = InsensitiveDict(value) if value else {}
+
+    def format_match(self, match):
+        placeholder = Placeholder.from_match(match)
+
+        if self.redact_missing_personalisation:
+            return self.placeholder_tag_redacted
+
+        if placeholder.is_conditional():
+            return self.conditional_placeholder_tag.format(
+                placeholder.name, placeholder.conditional_text
+            )
+
+        return self.placeholder_tag.format(placeholder.name)
+
+    def replace_match(self, match):
+        placeholder = Placeholder.from_match(match)
+        replacement = self.values.get(placeholder.name)
+
+        if placeholder.is_conditional() and replacement is not None:
+            return placeholder.get_conditional_body(replacement)
+
+        replaced_value = self.get_replacement(placeholder)
+        if replaced_value is not None:
+            return self.get_replacement(placeholder)
+
+        return self.format_match(match)
+
+    def get_replacement(self, placeholder):
+        replacement = self.values.get(placeholder.name)
+        if replacement is None:
+            return None
+
+        if isinstance(replacement, list):
+            vals = (
+                strip_and_remove_obscure_whitespace(str(val))
+                for val in replacement
+                if val is not None
+            )
+            vals = list(filter(None, vals))
+            if not vals:
+                return ""
+            return self.sanitizer(self.get_replacement_as_list(vals))
+
+        return self.sanitizer(str(replacement))
+
+    def get_replacement_as_list(self, replacement):
+        if self.markdown_lists:
+            return "\n\n" + "\n".join("* {}".format(item) for item in replacement)
+        return unescaped_formatted_list(replacement, before_each="", after_each="")
+
+    @property
+    def _raw_formatted(self):
+        return re.sub(
+            self.placeholder_pattern, self.format_match, self.sanitizer(self.content)
+        )
+
+    @property
+    def formatted(self):
+        return Markup(self._raw_formatted)
+
+    @property
+    def placeholders(self):
+        if not getattr(self, "content", ""):
+            return set()
+        return OrderedSet(
+            Placeholder(body).name
+            for body in re.findall(self.placeholder_pattern, self.content)
+        )
+
+    @property
+    def replaced(self):
+        return re.sub(
+            self.placeholder_pattern, self.replace_match, self.sanitizer(self.content)
+        )
+
+
+class PlainTextField(Field):
+    """
+    Use this where no HTML should be rendered in the outputted content,
+    even when no values have been passed in
+    """
+
+    placeholder_tag = "(({}))"
+    conditional_placeholder_tag = "(({}??{}))"
+    placeholder_tag_no_brackets = "{}"
+    placeholder_tag_redacted = "[hidden]"
+
+
+def str2bool(value):
+    if not value:
+        return False
+    return str(value).lower() in ("yes", "y", "true", "t", "1", "include", "show")
diff --git a/notifications_utils/formatters.py b/notifications_utils/formatters.py
new file mode 100644
index 0000000000..a2cb7c3d7e
--- /dev/null
+++ b/notifications_utils/formatters.py
@@ -0,0 +1,349 @@
+import re
+import string
+import urllib
+from html import _replace_charref, escape
+
+import bleach
+import smartypants
+from markupsafe import Markup
+
+from notifications_utils.sanitise_text import SanitiseSMS
+
+from . import email_with_smart_quotes_regex
+
+OBSCURE_ZERO_WIDTH_WHITESPACE = (
+    "\u180E"  # Mongolian vowel separator
+    "\u200B"  # zero width space
+    "\u200C"  # zero width non-joiner
+    "\u200D"  # zero width joiner
+    "\u2060"  # word joiner
+    "\uFEFF"  # zero width non-breaking space
+)
+
+OBSCURE_FULL_WIDTH_WHITESPACE = "\u00A0"  # non breaking space
+
+ALL_WHITESPACE = (
+    string.whitespace + OBSCURE_ZERO_WIDTH_WHITESPACE + OBSCURE_FULL_WIDTH_WHITESPACE
+)
+
+govuk_not_a_link = re.compile(r"(^|\s)(#|\*|\^)?(GOV)\.(UK)(?!\/|\?|#)", re.IGNORECASE)
+
+smartypants.tags_to_skip = smartypants.tags_to_skip + ["a"]
+
+whitespace_before_punctuation = re.compile(r"[ \t]+([,\.])")
+
+hyphens_surrounded_by_spaces = re.compile(
+    r"\s+[-–—]{1,3}\s+"
+)  # check three different unicode hyphens
+
+multiple_newlines = re.compile(r"((\n)\2{2,})")
+
+HTML_ENTITY_MAPPING = (
+    ("&nbsp;", "👾🐦🥴"),
+    ("&amp;", "➕🐦🥴"),
+    ("&lpar;", "◀️🐦🥴"),
+    ("&rpar;", "▶️🐦🥴"),
+)
+
+url = re.compile(
+    r"(?i)"  # case insensitive
+    r"\b(?<![\@\.])"  # match must not start with @ or . (like @test.example.com)
+    r"(https?:\/\/)?"  # optional http:// or https://
+    r"([\w\-]+\.{1})+"  # one or more (sub)domains
+    r"([a-z]{2,63})"  # top-level domain
+    r"(?!\@)\b"  # match must not end with @ (like firstname.lastname@)
+    r"([/\?#][^<\s]*)?"  # start of path, query or fragment
+)
+
+more_than_two_newlines_in_a_row = re.compile(r"\n{3,}")
+
+
+def unlink_govuk_escaped(message):
+    return re.sub(
+        govuk_not_a_link,
+        r"\1\2\3" + ".\u200B" + r"\4",  # Unicode zero-width space
+        message,
+    )
+
+
+def nl2br(value):
+    return re.sub(r"\n|\r", "<br>", value.strip())
+
+
+def add_prefix(body, prefix=None):
+    if prefix:
+        return "{}: {}".format(prefix.strip(), body)
+    return body
+
+
+def make_link_from_url(linked_part, *, classes=""):
+    """
+    Takes something which looks like a URL, works out which trailing characters shouldn’t
+    be considered part of the link and returns an HTML <a> tag
+
+    input: `http://example.com/foo_(bar)).`
+    output: `<a href="http://example.com/foo_(bar)">http://example.com/foo_(bar)</a>).`
+    """
+    CORRESPONDING_OPENING_CHARACTER_MAP = {
+        ")": "(",
+        "]": "[",
+        ".": None,
+        ",": None,
+        ":": None,
+    }
+
+    trailing_characters = ""
+
+    while (
+        last_character := linked_part[-1]
+    ) in CORRESPONDING_OPENING_CHARACTER_MAP.keys():
+        corresponding_opening_character = CORRESPONDING_OPENING_CHARACTER_MAP[
+            last_character
+        ]
+
+        if corresponding_opening_character:
+            count_opening_characters = linked_part.count(
+                corresponding_opening_character
+            )
+            count_closing_characters = linked_part.count(last_character)
+            if count_opening_characters >= count_closing_characters:
+                break
+
+        trailing_characters = linked_part[-1] + trailing_characters
+        linked_part = linked_part[:-1]
+
+    return f"{create_sanitised_html_for_url(linked_part, classes=classes)}{trailing_characters}"
+
+
+def autolink_urls(value, *, classes=""):
+    return Markup(
+        url.sub(
+            lambda match: make_link_from_url(
+                match.group(0),
+                classes=classes,
+            ),
+            value,
+        )
+    )
+
+
+def create_sanitised_html_for_url(link, *, classes="", style=""):
+    """
+    takes a link and returns an a tag to that link.  does the quote/unquote dance to ensure that " quotes are escaped
+    correctly to prevent xss
+
+    input: `http://foo.com/"bar"?x=1#2`
+    output: `<a style=... href="http://foo.com/%22bar%22?x=1#2">http://foo.com/"bar"?x=1#2</a>`
+    """
+    link_text = link
+
+    if not link.lower().startswith("http"):
+        link = f"http://{link}"
+
+    class_attribute = f'class="{classes}" ' if classes else ""
+    style_attribute = f'style="{style}" ' if style else ""
+
+    return ('<a {}{}href="{}">{}</a>').format(
+        class_attribute,
+        style_attribute,
+        urllib.parse.quote(urllib.parse.unquote(link), safe=":/?#=&;"),
+        link_text,
+    )
+
+
+def prepend_subject(body, subject):
+    return "# {}\n\n{}".format(subject, body)
+
+
+def sms_encode(content):
+    return SanitiseSMS.encode(content)
+
+
+def strip_html(value):
+    return bleach.clean(value, tags=[], strip=True)
+
+
+"""
+Re-implements html._charref but makes trailing semicolons non-optional
+"""
+_charref = re.compile(r"&(#[0-9]+;" r"|#[xX][0-9a-fA-F]+;" r"|[^\t\n\f <&#;]{1,32};)")
+
+
+def unescape_strict(s):
+    """
+    Re-implements html.unescape to use our own definition of `_charref`
+    """
+    if "&" not in s:
+        return s
+    return _charref.sub(_replace_charref, s)
+
+
+def escape_html(value):
+    if not value:
+        return value
+    value = str(value)
+
+    for entity, temporary_replacement in HTML_ENTITY_MAPPING:
+        value = value.replace(entity, temporary_replacement)
+
+    value = escape(unescape_strict(value), quote=False)
+
+    for entity, temporary_replacement in HTML_ENTITY_MAPPING:
+        value = value.replace(temporary_replacement, entity)
+
+    return value
+
+
+def url_encode_full_stops(value):
+    return value.replace(".", "%2E")
+
+
+def unescaped_formatted_list(
+    items,
+    conjunction="and",
+    before_each="‘",
+    after_each="’",
+    separator=", ",
+    prefix="",
+    prefix_plural="",
+):
+    if prefix:
+        prefix += " "
+    if prefix_plural:
+        prefix_plural += " "
+
+    if len(items) == 1:
+        return "{prefix}{before_each}{items[0]}{after_each}".format(**locals())
+    elif items:
+        formatted_items = [
+            "{}{}{}".format(before_each, item, after_each) for item in items
+        ]
+
+        first_items = separator.join(formatted_items[:-1])
+        last_item = formatted_items[-1]
+        return ("{prefix_plural}{first_items} {conjunction} {last_item}").format(
+            **locals()
+        )
+
+
+def formatted_list(
+    items,
+    conjunction="and",
+    before_each="‘",
+    after_each="’",
+    separator=", ",
+    prefix="",
+    prefix_plural="",
+):
+    return Markup(
+        unescaped_formatted_list(
+            [escape_html(x) for x in items],
+            conjunction,
+            before_each,
+            after_each,
+            separator,
+            prefix,
+            prefix_plural,
+        )
+    )
+
+
+def remove_whitespace_before_punctuation(value):
+    return re.sub(whitespace_before_punctuation, lambda match: match.group(1), value)
+
+
+def make_quotes_smart(value):
+    return smartypants.smartypants(value, smartypants.Attr.q | smartypants.Attr.u)
+
+
+def replace_hyphens_with_en_dashes(value):
+    return re.sub(
+        hyphens_surrounded_by_spaces,
+        (" " "\u2013" " "),  # space  # en dash  # space
+        value,
+    )
+
+
+def replace_hyphens_with_non_breaking_hyphens(value):
+    return value.replace(
+        "-",
+        "\u2011",  # non-breaking hyphen
+    )
+
+
+def normalise_whitespace_and_newlines(value):
+    return "\n".join(get_lines_with_normalised_whitespace(value))
+
+
+def get_lines_with_normalised_whitespace(value):
+    return [normalise_whitespace(line) for line in value.splitlines()]
+
+
+def normalise_whitespace(value):
+    # leading and trailing whitespace removed
+    # inner whitespace with width becomes a single space
+    # inner whitespace with zero width is removed
+    # multiple space characters next to each other become just a single space character
+    for character in OBSCURE_FULL_WIDTH_WHITESPACE:
+        value = value.replace(character, " ")
+
+    for character in OBSCURE_ZERO_WIDTH_WHITESPACE:
+        value = value.replace(character, "")
+
+    return " ".join(value.split())
+
+
+def normalise_multiple_newlines(value):
+    return more_than_two_newlines_in_a_row.sub("\n\n", value)
+
+
+def strip_leading_whitespace(value):
+    return value.lstrip()
+
+
+def add_trailing_newline(value):
+    return "{}\n".format(value)
+
+
+def remove_smart_quotes_from_email_addresses(value):
+    def remove_smart_quotes(match):
+        value = match.group(0)
+        for character in "‘’":
+            value = value.replace(character, "'")
+        return value
+
+    return email_with_smart_quotes_regex.sub(
+        remove_smart_quotes,
+        value,
+    )
+
+
+def strip_all_whitespace(value, extra_characters=""):
+    # Removes from the beginning and end of the string all whitespace characters and `extra_characters`
+    if value is not None and hasattr(value, "strip"):
+        return value.strip(ALL_WHITESPACE + extra_characters)
+    return value
+
+
+def strip_and_remove_obscure_whitespace(value):
+    if value == "":
+        # Return early to avoid making multiple, slow calls to
+        # str.replace on an empty string
+        return ""
+
+    for character in OBSCURE_ZERO_WIDTH_WHITESPACE + OBSCURE_FULL_WIDTH_WHITESPACE:
+        value = value.replace(character, "")
+
+    return value.strip(string.whitespace)
+
+
+def remove_whitespace(value):
+    # Removes ALL whitespace, not just the obscure characters we normaly remove
+    for character in ALL_WHITESPACE:
+        value = value.replace(character, "")
+
+    return value
+
+
+def strip_unsupported_characters(value):
+    return value.replace("\u2028", "")
diff --git a/notifications_utils/insensitive_dict.py b/notifications_utils/insensitive_dict.py
new file mode 100644
index 0000000000..7b239b8846
--- /dev/null
+++ b/notifications_utils/insensitive_dict.py
@@ -0,0 +1,59 @@
+from functools import lru_cache
+
+from ordered_set import OrderedSet
+
+
+class InsensitiveDict(dict):
+    """
+    `InsensitiveDict` behaves like an ordered dictionary, except it normalises
+    case, whitespace, hypens and underscores in keys.
+
+    In other words,
+    InsensitiveDict({'FIRST_NAME': 'example'}) == InsensitiveDict({'first name': 'example'})
+    >>> True
+    """
+
+    KEY_TRANSLATION_TABLE = {ord(c): None for c in " _-"}
+
+    def __init__(self, row_dict):
+        for key, value in row_dict.items():
+            self[key] = value
+
+    @classmethod
+    def from_keys(cls, keys):
+        """
+        This behaves like `dict.from_keys`, except:
+        - it normalises the keys to ignore case, whitespace, hypens and
+          underscores
+        - it stores the original, unnormalised key as the value of the
+          item so it can be retrieved later
+        """
+        return cls({key: key for key in keys})
+
+    def keys(self):
+        return OrderedSet(super().keys())
+
+    def __getitem__(self, key):
+        return super().__getitem__(self.make_key(key))
+
+    def __setitem__(self, key, value):
+        super().__setitem__(self.make_key(key), value)
+
+    def __contains__(self, key):
+        return super().__contains__(self.make_key(key))
+
+    def get(self, key, default=None):
+        return self[key] if key in self else default
+
+    def copy(self):
+        return self.__class__(super().copy())
+
+    def as_dict_with_keys(self, keys):
+        return {key: self.get(key) for key in keys}
+
+    @staticmethod
+    @lru_cache(maxsize=32, typed=False)
+    def make_key(original_key):
+        if original_key is None:
+            return None
+        return original_key.translate(InsensitiveDict.KEY_TRANSLATION_TABLE).lower()
diff --git a/notifications_utils/international_billing_rates.py b/notifications_utils/international_billing_rates.py
new file mode 100644
index 0000000000..f725834f40
--- /dev/null
+++ b/notifications_utils/international_billing_rates.py
@@ -0,0 +1,31 @@
+"""
+Format of the yaml file looks like:
+
+1:
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: Bulk/marketing traffic NOT allowed
+  billable_units: 1
+  names:
+  - Canada
+  - United States
+  - Dominican Republic
+"""
+
+import os
+
+import yaml
+
+dir_path = os.path.dirname(os.path.realpath(__file__))
+
+with open("{}/international_billing_rates.yml".format(dir_path)) as f:
+    INTERNATIONAL_BILLING_RATES = yaml.safe_load(f)
+    COUNTRY_PREFIXES = list(
+        reversed(sorted(INTERNATIONAL_BILLING_RATES.keys(), key=len))
+    )
diff --git a/notifications_utils/international_billing_rates.yml b/notifications_utils/international_billing_rates.yml
new file mode 100644
index 0000000000..dfa87d4906
--- /dev/null
+++ b/notifications_utils/international_billing_rates.yml
@@ -0,0 +1,2891 @@
+#################################################
+#
+# DO NOT MODIFY THE "attributes" IN THIS FILE
+#
+# This file was generated from an external source,
+# so its content should be kept as-is to avoid any
+# ambiguity if we regenerate it in future. If you
+# find something is incorrect, add a comment.
+#
+# It's OK to modify the "billable_units", as these
+# get used for our actual billing calculations.
+#
+#################################################
+#
+# Key for entries:
+#
+#   *in all cases, "null" means "don't know" or "n/a"
+#
+#   alpha:
+#     possible values: 'REG' | 'YES' | 'NO'
+#     description: whether alphanumeric sender names are supported, potentially by registration only ('REG')
+#   comment:
+#     possible values: <text>
+#     description: additional usage info e.g. "OPT-OUT option in the message is required"
+#   dlr:
+#     possible_values: '' | 'YES' | 'Carrier DLR' | 'NO'
+#     description: whether we get delivery receipts; 'Carrier DLR' also means 'NO'; unclear what '' means
+#   generic_sender:
+#     possible_values: '' | <alpha>
+#     description: supports unregistered senders by converted to <alpha> ('' means we don't know what <alpha> is)
+#   numeric:
+#     possible_values: 'NO' | 'YES' | 'LIMITED'
+#     description: whether numeric sender names are supported, or randomly generated ('LIMITED')
+#   sc:
+#     possible_values: 'NO' | 'YES' | 'LIMITED' | 'REG'
+#     description: whether short codes are supported, potentially by registration only ('REG'), potentially limited in availability ('LIMITED')
+#   sender_and_registration_info:
+#     possible_values: <text>
+#     description: specific operational info e.g. "All senders CONVERTED into random long numeric senders"
+#   text_restrictions:
+#     possible_values: <text>
+#     description: similar to "comment"
+
+'1':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: Bulk/marketing traffic NOT allowed
+  billable_units: 1
+  names:
+  - Canada
+  - United States
+  - Dominican Republic
+'7':
+  attributes:
+    alpha: REG
+    comment: HIGH FEEs for SPAM
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: ''
+    text_restrictions: Transactional traffic ONLY
+  billable_units: 1
+  names:
+  - South Ossetia
+  - Kazakhstan
+  - Abkhazia
+  - Russian Federation
+'20':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: REG
+    sc: REG
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Egypt
+'27':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into long numeric sender
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - South Africa
+'30':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: Senders MUST NOT include "," (comma separator) within,
+      up to 11 chars in length
+    text_restrictions: NO unicode nor binary formatted SMS support
+  billable_units: 2
+  names:
+  - Greece
+'31':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Netherlands
+'32':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Belgium
+'33':
+  attributes:
+    alpha: 'YES'
+    comment: STOP and CONTACT for OPT-OUTs required
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: REG
+    sender_and_registration_info: All numeric senders CONVERTED into limited amount
+      of registered shared SCs. HIGH one time and monthly FEEs for each additional
+      SC
+    text_restrictions: Marketing traffic is on hold on working days from 10PM to 8AM
+      (UTC/GMT +1 hour), weekend and bank holidays. Transactional traffic can be allowed  with
+      no time limits with approval only.
+  billable_units: 2
+  names:
+  - France
+'34':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'YES'
+    sender_and_registration_info: All long numeric senders not starting with 34 are
+      CONVERTED to "InfoSMS"
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Spain
+'36':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED to one national long numeric
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Hungary
+'39':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: Numeric national (local) sender IDs allowed only
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Italy
+'40':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: REG
+    sender_and_registration_info: All not registered senders are CONVERTED into one
+      SC. Monthly time  FEE for each SC, one time fee for each Alpha sender, authorization
+      letter and description required. Unregistered senders are converted to SC 1797
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Romania
+'41':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'YES'
+    sender_and_registration_info: National numeric senders are not allowed
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Switzerland
+'43':
+  attributes:
+    alpha: REG
+    comment: OPT-IN REQUIRED for each end user
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: HIGH monthly FEE for alpha senders. Otherwise ONLY
+      one long numeric sender allowed
+    text_restrictions: Bulk traffic NOT allowed. NO political content and other text
+      restrictions
+  billable_units: 3
+  names:
+  - Austria
+'44':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Guernsey
+  - Isle of Man
+  - Jersey
+'45':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: ''
+    text_restrictions: Only transactional traffic allowed
+  billable_units: 1
+  names:
+  - Denmark
+'46':
+  attributes:
+    alpha: 'YES'
+    comment: HIGH FEEs for SPAM
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: ''
+    text_restrictions: ''
+  billable_units: 2
+  names:
+  - Sweden
+'47':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Norway
+'48':
+  attributes:
+    alpha: 'YES'
+    comment: Extremely HIGH penalties for marketing messages without OPT-Ins
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: REG
+    sc: 'NO'
+    sender_and_registration_info: ''
+    text_restrictions: ''
+  billable_units: 1
+  names:
+  - Poland
+'49':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Germany
+'51':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: LIMITED
+    sender_and_registration_info: All senders CONVERTED into one SC
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Peru
+'52':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: Bulk/marketing traffic NOT allowed
+  billable_units: 2
+  names:
+  - Mexico
+'53':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Cuba
+'54':
+  attributes:
+    alpha: 'NO'
+    comment: OPT-IN REQUIRED for each end user
+    dlr: 'NO'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: LIMITED
+    sender_and_registration_info: All senders CONVERTED into one available shared
+      SC
+    text_restrictions: Political content NOT allowed
+  billable_units: 3
+  names:
+  - Argentina
+'55':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: LIMITED
+    sender_and_registration_info: LIMITED amount of SCs available
+    text_restrictions: NO marketing traffic. NO special characters. 160 chars per
+      message available
+  billable_units: 1
+  names:
+  - Brazil
+'56':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: Bulk/marketing traffic NOT allowed
+  billable_units: 2
+  names:
+  - Chile
+'57':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'NO'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: LIMITED
+    sender_and_registration_info: LIMITED amount of SCs available
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Colombia
+'58':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'NO'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Venezuela
+'60':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: REG
+    sender_and_registration_info: LIMITED amount of registered shared SCs available.
+      HIGH one time and monthly FEEs for each additional dedicated SC
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Malaysia
+'61':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: Long numeric MUST NOT begin with "0" (zero)
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Australia
+'62':
+  attributes:
+    alpha: REG
+    comment: Local clients NOT allowed. International clients ONLY
+    dlr: 'YES'
+    generic_sender: globalsms/InfoSMS
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: ''
+    text_restrictions: ''
+  billable_units: 1
+  names:
+  - Indonesia
+'63':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: INFO / Globalsms
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: All numeric senders are converted to InfoText
+    text_restrictions: Adult, alcohol, drugs, gambling, election and tobacco contents
+      are strictly forbidden
+  billable_units: 1
+  names:
+  - Philippines
+'64':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: All alpha senders converted to a random UK longnumber
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - New Zealand
+'65':
+  attributes:
+    alpha: REG
+    comment: Where SMS exceeds 160 characters, it shall be broken into two or more
+      messages and transmitted separately
+    dlr: 'YES'
+    generic_sender: InfoSMS
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All not registered senders are CONVERTED into "InfoSMS".
+      LIMITED amount of free senders, MONTHLY FEE for additional Alpha and numeric
+      senders. Only national long numeric senders ara available
+    text_restrictions: ''
+  billable_units: 1
+  names:
+  - Singapore
+'66':
+  attributes:
+    alpha: REG
+    comment: Maximum long message lenght is 459 for GSM7 or 201 for Unicode alphabet.
+      Special registration procedure for sending to DND numbers
+    dlr: 'YES'
+    generic_sender: SMS
+    numeric: REG
+    sc: REG
+    sender_and_registration_info: Alpha sender up to 11 characters in length. NO "
+      " (space) support in the sender name. NO special character at the beginning
+      of the sender. Numeric sender up to 11 digits in length. Dynamic sender available
+      over Offnet connection.
+    text_restrictions: NO political nor erotic content and other text restrictions
+  billable_units: 1
+  names:
+  - Thailand
+'81':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'YES'
+    sender_and_registration_info: 11-digit long short code.
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Japan
+'82':
+  attributes:
+    alpha: 'NO'
+    comment: Message length - 140 characters
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: 'All Alpha senders CONVERTED to one local long numeric.
+      "00" is ADDED in front of international long numeric sender ids. '
+    text_restrictions: "[\uAD6D\uC81C\uBC1C\uC2E0] is added in front of SMS text for\
+      \ every inbound P2P and A2P coming from overseas countries."
+  billable_units: 2
+  names:
+  - Korea, Republic of
+'84':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: InfoSMS
+    numeric: 'NO'
+    sc: REG
+    sender_and_registration_info: One time and monthly FEEs for each sender. All not
+      registered senders CONVERTED into "InfoSMS" sender
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Vietnam
+'86':
+  attributes:
+    alpha: 'NO'
+    comment: Extremenly HIGH penalties for any traffic other than transactional
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into one available national
+      numeric sender
+    text_restrictions: Content template MUST be approved by the MNO. Transactional
+      traffic ONLY. Sufix added in the message text
+  billable_units: 1
+  names:
+  - China
+'90':
+  attributes:
+    alpha: REG
+    comment: ONLY for Turkish clients. International clients NOT allowed, unless approved
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: LIMITED
+    sender_and_registration_info: LIMITED amount of numeric senders are allowed (just
+      some ranges)
+    text_restrictions: NO lottery, gambling nor erotic content and other text restrictions
+  billable_units: 1
+  names:
+  - Turkey
+  - Northern Cyprus
+'91':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: Alpha senders with exactly 6 characters ONLY
+    text_restrictions: Transactional traffic ONLY
+  billable_units: 1
+  names:
+  - India
+'92':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'NO'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Pakistan
+'93':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: SMS-Info
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: 'All not registered senders CONVERTED to ''SMS-Info''.
+      Sender and text example required prior to registration. Registration ETA: up
+      to 10 days.'
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Afghanistan
+'94':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Sri Lanka
+'95':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: There is monthly FEE for renting a SC. No generic
+      senders available. WEB page and description for each sender needed.
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Myanmar
+'98':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Iran
+'211':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - South Sudan
+'212':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: Globalsms
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: Case sensitive senders
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Morocco
+'213':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: InfoSMS/SMS
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Algeria
+'216':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Tunisia
+'218':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Libya
+'220':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Gambia
+'221':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Senegal
+'222':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Mauritania
+'223':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Mali
+'224':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: 00 added in front of destination
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Guinea
+'225':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Cote d'Ivoire
+'226':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Burkina Faso
+'227':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Niger
+'228':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Togo
+'229':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Benin
+'230':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Mauritius
+'231':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Liberia
+'232':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Sierra Leone
+'233':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: REG
+    sender_and_registration_info: One time and monthly FEEs for each SC
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Ghana
+'234':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: SMS
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Nigeria
+'235':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Chad
+'236':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Central African Republic
+'237':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Cameroon
+'238':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Cape Verde
+'239':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Sao Tome and Principe
+'240':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Equatorial Guinea
+'241':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Gabon
+'242':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Congo
+'243':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Congo, Democratic Republic of
+'244':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: Info
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Angola
+'245':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Guinea-Bissau
+'246':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - British Indian Ocean Territory
+'248':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Seychelles
+'249':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Sudan
+'250':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Rwanda, Republic of
+'251':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Ethiopia
+'252':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Somalia
+'253':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Djibouti, Republic of
+'254':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'YES'
+    sender_and_registration_info: ONLY one shared SC available. HIGH one time and
+      monthly FEEs for each additional sender. Only local entities can register senders
+      for Safaricom.
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Kenya
+'255':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Tanzania
+'256':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: INFOSMS
+    numeric: 'NO'
+    sc: REG
+    sender_and_registration_info: All not registered senders CONVERTED to "INFOSMS".
+      Only local entities can register the sender (requires Authorization letter).
+    text_restrictions: As per regulation, 'DND*196#' is being added at the end of
+      each message.
+  billable_units: 1
+  names:
+  - Uganda
+'257':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Burundi
+'258':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Mozambique
+'260':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Zambia
+'261':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Madagascar
+'262':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Reunion
+'263':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Zimbabwe
+'264':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: Long registration procedure, up to 30 days. Monthly
+      FEE for each sender
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Namibia
+'265':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Malawi
+'266':
+  attributes:
+    alpha: null  # should be 'REG'
+    comment: null
+    dlr: null  # should be 'YES'
+    generic_sender: null  # should be "''"
+    numeric: null  # should be 'NO'
+    sc: null  # should be 'NO'
+    sender_and_registration_info: null  # should be "Sender names can only be 3-11 chars, no spaces"
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Lesotho
+'267':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Botswana
+'268':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Swaziland
+'269':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Comoros
+'297':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Aruba
+'298':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Faroe Islands
+'299':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Greenland
+'350':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Gibraltar
+'351':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Portugal
+'352':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Luxembourg
+'353':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: Numeric sender up to 12 digits in length. SC available
+      upon registration
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Ireland
+'354':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Iceland
+'355':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Albania
+'356':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Malta
+'357':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: InfoSMS/Message
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: Senders up to 11 characters in length. NO special
+      characters. Generic senders available
+    text_restrictions: NO violent, offensive, discriminatory or erotic content
+  billable_units: 1
+  names:
+  - Cyprus
+'358':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: $ INSERTED in front of each Alpha sender, "00" in
+      front of long numeric senders
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Finland
+'359':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'YES'
+    sender_and_registration_info: Sender converts to short code 1917.
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Bulgaria
+'370':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Lithuania
+'371':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Latvia
+'372':
+  attributes:
+    alpha: 'YES'
+    comment: OPT-INs required
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: ''
+    text_restrictions: NO messages in any way related to premium rate services
+  billable_units: 2
+  names:
+  - Estonia
+'373':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'YES'
+    sender_and_registration_info: All senders CONVERTED into one SC
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Moldova
+'374':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: REG
+    sc: REG
+    sender_and_registration_info: NO long numeric senders
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Armenia
+'375':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: SMSinfo
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Belarus
+'376':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Andorra
+'377':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Monaco
+'378':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - San Marino, Republic of
+'380':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: Info/INFO/InfoSMS/SMS
+    numeric: REG
+    sc: 'NO'
+    sender_and_registration_info: Alpha senders are case sensitive
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Ukraine
+'381':
+  attributes:
+    alpha: REG
+    comment: All traffic bulks MUST be registered at MNO
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: REG
+    sender_and_registration_info: Monthly FEE for each SC
+    text_restrictions: Transactional traffic ONLY
+  billable_units: 1
+  names:
+  - Serbia
+'382':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: REG
+    sc: REG
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Montenegro
+'385':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: InfoSMS
+    numeric: 'NO'
+    sc: REG
+    sender_and_registration_info: One time and monthly FEES for each sender. NO special
+      chars nor " " (space) support in the sender name. Instead of space "_" (underscore)
+      is being used
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Croatia
+'386':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: InfoSMS
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Slovenia
+'387':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: INFOSMS
+    numeric: REG
+    sc: REG
+    sender_and_registration_info: Numeric sender available for the FEE upon registration.
+      SC registration CHARGED - one time and monthly FEEs per each sender.
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Bosnia and Herzegovina
+'389':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'NO'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Macedonia
+'420':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: Info
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: All not registered senders CONVERTED into "Info"
+      sender. Monthly FEE for each additional sender. NO special chars nor " " (space)
+      support in the sender name
+    text_restrictions: Traffic allowed ONLY between 8am and 6pm (CET) on working days.
+      Content promoting lottery, betting, gambling nor consumer loans NOT allowed.
+      NO political, violent, erotic nor abusive content and other text restrictions
+  billable_units: 2
+  names:
+  - Czech Republic
+'421':
+  attributes:
+    alpha: 'YES'
+    comment: P2P not allowed
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: REG
+    sc: 'NO'
+    sender_and_registration_info: SC up to 6 digits in length. One time and monthly
+      FEEs for numeric senders. All not registered long numeric senders are CONVERTED
+      into "Info"
+    text_restrictions: ''
+  billable_units: 2
+  names:
+  - Slovakia
+'423':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: LIMITED
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Liechtenstein
+'500':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Falkland Islands
+'501':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Belize
+'502':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Guatemala
+'503':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - El Salvador
+'504':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Honduras
+'505':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Nicaragua
+'506':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Costa Rica
+'507':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Panama
+'508':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Saint Pierre and Miquelon
+'509':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Haiti
+'590':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Guadeloupe
+'591':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Bolivia
+'592':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Guyana
+'593':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: ''
+    generic_sender: null
+    numeric: 'NO'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Ecuador
+'594':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - French Guiana
+'595':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Paraguay
+'596':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Martinique
+'597':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Suriname
+'598':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Uruguay
+'599':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Curacao (former Netherlands Antilles)
+'670':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Timor L'este
+'672':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Norfolk Island
+'673':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Brunei Darussalam
+'674':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Nauru
+'675':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Papua New Guinea
+'676':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Tonga
+'677':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Solomon Islands
+'678':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Vanuatu
+'679':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Fiji
+'680':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Palau
+'682':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Cook Islands
+'685':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Samoa
+'687':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - New Caledonia
+'689':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - French Polynesia
+'691':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Micronesia, Federated States of
+'692':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Marshall Islands
+'852':
+  attributes:
+    alpha: REG
+    comment: DND register is being used
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: REG
+    sc: 'NO'
+    sender_and_registration_info: ''
+    text_restrictions: OPT-IN required for promotional traffic. NO violent, discriminatory
+      nor erotic content
+  billable_units: 3
+  names:
+  - Hong Kong
+'853':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Macau
+'855':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Cambodia
+'856':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Laos
+'880':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Bangladesh
+'886':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'NO'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: ONLY one shared long numeric available
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Taiwan
+'960':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Maldives
+'961':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Lebanon
+'962':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Jordan
+'963':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Syria
+'964':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 3
+  names:
+  - Iraq
+'965':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: No new senders available at the moment. Registration
+      ETA 1-5 days.
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Kuwait
+'966':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Saudi Arabia
+'967':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Yemen
+'968':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: Only local entities can register senders. NOC and
+      Trace Licence required.
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Oman
+'970':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Palestinian Territory
+'971':
+  attributes:
+    alpha: REG
+    comment: OPT-OUT option in the message is required
+    dlr: 'YES'
+    generic_sender: SMS-Info
+    numeric: 'NO'
+    sc: REG
+    sender_and_registration_info: NOC letter is required to begin the registration
+      process. One time and monthly FEEs for each additional SC
+    text_restrictions: 'No marketing traffic between 8pm and 8am (GMT +4). International
+      traffic is allowed. '
+  billable_units: 2
+  names:
+  - United Arab Emirates
+'972':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Israel
+'973':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Bahrain
+'974':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: INFOSMSI / Message
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: Case sensitive senders. SCs and numeric senders
+      MUST have more than 5 digits. All not registered senders are CONVERTED to "INFOSMSI"
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Qatar
+'975':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Bhutan
+'976':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Mongolia
+'977':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'NO'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Nepal
+'992':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: REG
+    sc: 'NO'
+    sender_and_registration_info: Numeric sender available upon registration. Numeric
+      sender MUST begin with "992" or "0" (zero)
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Tajikistan
+'993':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Turkmenistan
+'994':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: ''
+    text_restrictions: NO political, erotic, religious, alcoholic or tobacco products,
+      premium services related info. APPROVAL required for food add., medical, non-govern.
+      organizations or minor individuals related messages
+  billable_units: 3
+  names:
+  - Azerbaijan
+'995':
+  attributes:
+    alpha: REG
+    comment: null
+    dlr: 'YES'
+    generic_sender: InfoSMS
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: ''
+    text_restrictions: Few GSM 7 characters are not supported
+  billable_units: 1
+  names:
+  - Georgia
+'996':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: REG
+    sc: 'NO'
+    sender_and_registration_info: ONLY two shared numeric senders available. Long
+      numeric usage MUST be approved by MNO
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Kyrgyzstan
+'998':
+  attributes:
+    alpha: REG
+    comment: All features are supported (DLRs, longSMS, special characters, Unicode)
+    dlr: 'YES'
+    generic_sender: InfoSMS
+    numeric: 'NO'
+    sc: 'NO'
+    sender_and_registration_info: Numeric and all non registered senders are converted
+      to InfoSMS
+    text_restrictions: ''
+  billable_units: 1
+  names:
+  - Uzbekistan
+'1242':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: Bulk/marketing traffic NOT allowed
+  billable_units: 2
+  names:
+  - Bahamas
+'1246':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: Bulk/marketing traffic NOT allowed
+  billable_units: 2
+  names:
+  - Barbados
+'1264':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Anguilla
+'1268':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Antigua and Barbuda
+'1284':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Virgin Islands, British
+'1345':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Cayman Islands
+'1441':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Bermuda
+'1473':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Grenada
+'1649':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Turks and Caicos Islands
+'1664':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: 'YES'
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: Bulk/marketing traffic NOT allowed
+  billable_units: 1
+  names:
+  - Montserrat
+'1684':
+  attributes:
+    alpha: 'NO'
+    comment: null
+    dlr: Carrier DLR
+    generic_sender: ''
+    numeric: LIMITED
+    sc: 'NO'
+    sender_and_registration_info: All senders CONVERTED into random long numeric senders
+    text_restrictions: Bulk/marketing traffic NOT allowed
+  billable_units: 3
+  names:
+  - American Samoa
+'1721':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Sint Maarten
+'1758':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Saint Lucia
+'1767':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Dominica, Commonwealth of
+'1784':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Saint Vincent and The Grenadines
+'1868':
+  attributes:
+    alpha: null
+    comment: null
+    dlr: null
+    generic_sender: null
+    numeric: null
+    sc: null
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Trinidad and Tobago
+'1869':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 2
+  names:
+  - Saint Kitts and Nevis
+'1876':
+  attributes:
+    alpha: 'YES'
+    comment: null
+    dlr: 'YES'
+    generic_sender: null
+    numeric: 'YES'
+    sc: 'YES'
+    sender_and_registration_info: null
+    text_restrictions: null
+  billable_units: 1
+  names:
+  - Jamaica
diff --git a/notifications_utils/jinja_templates/broadcast_preview_template.jinja2 b/notifications_utils/jinja_templates/broadcast_preview_template.jinja2
new file mode 100644
index 0000000000..bf22045fee
--- /dev/null
+++ b/notifications_utils/jinja_templates/broadcast_preview_template.jinja2
@@ -0,0 +1,12 @@
+<div class="broadcast-message-wrapper">
+  <h2 class="broadcast-message-heading">
+    <svg class="broadcast-message-heading__icon" xmlns="http://www.w3.org/2000/svg" width="22" height="18.23" viewBox="0 0 17.5 14.5" aria-hidden="true">
+      <path fill-rule="evenodd"
+            fill="currentcolor"
+            d="M8.6 0L0 14.5h17.5L8.6 0zm.2 10.3c-.8 0-1.5.7-1.5 1.5s.7 1.5 1.5 1.5 1.5-.7 1.5-1.5c-.1-.8-.7-1.5-1.5-1.5zm1.3-4.5c.1.8-.3 3.2-.3 3.2h-2s-.5-2.3-.5-3c0 0 0-1.6 1.4-1.6s1.4 1.4 1.4 1.4z"
+      />
+    </svg>
+    Emergency alert
+  </h2>
+  {{ body }}
+</div>
diff --git a/notifications_utils/jinja_templates/email_preview_template.jinja2 b/notifications_utils/jinja_templates/email_preview_template.jinja2
new file mode 100644
index 0000000000..68314f2034
--- /dev/null
+++ b/notifications_utils/jinja_templates/email_preview_template.jinja2
@@ -0,0 +1,39 @@
+<div class="email-message">
+  <table class="email-message-meta">
+    <tbody>
+      {% if show_recipient %}
+        {% if from_name %}
+          <tr>
+            <th scope="row">From</th>
+            <td>
+              {{ from_name }}
+            </td>
+          </tr>
+        {% endif %}
+        {% if reply_to %}
+          <tr>
+            <th scope="row">Reply&nbsp;to</th>
+            <td>
+              {{ reply_to }}
+            </td>
+          </tr>
+        {% endif %}
+        <tr>
+          <th scope="row">To</th>
+          <td>
+            {{ recipient }}
+          </td>
+        </tr>
+      {% endif %}
+      <tr class="email-message-meta">
+        <th scope="row">Subject</th>
+        <td>
+          {{ subject }}
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <div class="email-message-body">
+    {{ body }}
+  </div>
+</div>
diff --git a/notifications_utils/jinja_templates/email_template.jinja2 b/notifications_utils/jinja_templates/email_template.jinja2
new file mode 100644
index 0000000000..5ecd58a8d3
--- /dev/null
+++ b/notifications_utils/jinja_templates/email_template.jinja2
@@ -0,0 +1,252 @@
+{% if complete_html %}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta content="telephone=no" name="format-detection" /> <!-- need to add formatting for real phone numbers -->
+  <meta name="viewport" content="width=device-width" />
+  <title>{{ subject }}</title>
+
+  <style type="text/css">
+    @media only screen and (min-device-width: 581px) {
+      .content {
+        width: 580px !important;
+      }
+    }
+    body { margin:0 !important; }
+    div[style*="margin: 16px 0"] { margin:0 !important; }
+  </style>
+
+  <!--[if gte mso 9]>
+    <style type="text/css">
+      li {
+        margin-left: 4px !important;
+      }
+      table {
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+      }
+    </style>
+  <![endif]-->
+
+</head>
+
+<body style="font-family: Helvetica, Arial, sans-serif;font-size: 16px;margin: 0;color:#0b0c0c;">
+{% endif %}
+<span style="display: none;font-size: 1px;color: #fff; max-height: 0;">{{ preheader }}…</span>
+{% if govuk_banner %}
+  <table role="presentation" width="100%" style="border-collapse: collapse;min-width: 100%;width: 100% !important;" cellpadding="0" cellspacing="0" border="0">
+    <tr>
+      <td width="100%" height="53">
+        <!--[if (gte mso 9)|(IE)]>
+          <table role="presentation" width="580" align="center" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;width: 580px;">
+            <tr>
+              <td>
+        <![endif]-->
+        <table role="presentation" width="100%" style="border-collapse: collapse;max-width: 580px;" cellpadding="0" cellspacing="0" border="0" align="center">
+          <tr>
+            <td width="70" valign="middle">
+              <a href="https://beta.notify.gov" title="Go to the beta.notify.gov homepage" style="text-decoration: none;">
+                <table role="presentation" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;">
+                  <tr>
+                    <td style="font-size: 28px; line-height: 1.315789474; Margin-top: 4px; padding-left: 10px;">
+                      <span style="
+                        font-family: Public Sans Web,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica,Arial,sans-serif;
+                        font-weight: 600;
+                        color:#0b0c0c;
+                        text-decoration: none;
+                        vertical-align:top;
+                        display: inline-block;
+                          ">Notify.gov</span>
+                    </td>
+                  </tr>
+                </table>
+              </a>
+            </td>
+          </tr>
+        </table>
+        <!--[if (gte mso 9)|(IE)]>
+              </td>
+            </tr>
+          </table>
+        <![endif]-->
+      </td>
+    </tr>
+  </table>
+  <table
+      role="presentation"
+      class="content"
+      align="center"
+      cellpadding="0"
+      cellspacing="0"
+      border="0"
+      style="border-collapse: collapse;max-width: 580px; width: 100% !important;"
+      width="100%"
+  >
+    <tr>
+      <td width="10" height="10" valign="middle"></td>
+      <td>
+        <!--[if (gte mso 9)|(IE)]>
+          <table role="presentation" width="560" align="center" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;width: 560px;">
+            <tr>
+              <td height="10">
+        <![endif]-->
+                <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;">
+                  <tr>
+                    <td bgcolor="#1D70B8" width="100%" height="10"></td>
+                  </tr>
+                </table>
+        <!--[if (gte mso 9)|(IE)]>
+              </td>
+            </tr>
+          </table>
+        <![endif]-->
+      </td>
+      <td width="10" valign="middle" height="10"></td>
+    </tr>
+  </table>
+{% endif %}
+{% if brand_banner %}
+  {% set brand_colour = brand_colour if brand_colour else '#0b0c0c' %}
+  <table role="presentation" width="100%" style="border-collapse: collapse;min-width: 100%;width: 100% !important;" cellpadding="0" cellspacing="0" border="0">
+      <tr>
+        <td width="100%" height="53" bgcolor="{{brand_colour}}">
+          <!--[if (gte mso 9)|(IE)]>
+            <table role="presentation" width="580" align="center" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;width: 580px;">
+              <tr>
+                <td>
+          <![endif]-->
+          <table role="presentation" width="100%" style="border-collapse: collapse;max-width: 580px;" cellpadding="0" cellspacing="0" border="0" align="center">
+            <tr>
+              {% if brand_logo %}
+                <td
+                  width="70"
+                  height="{% if brand_text -%} 27 {%- else -%} 54 {%- endif %}"
+                  bgcolor="{{brand_colour}}"
+                  valign="middle"
+                  style="padding: 10px 0px 12px 10px"
+                >
+                  <img
+                    src="{{ brand_logo }}"
+                    border="0"
+                    style="display: block; border: 0;"
+                    height="{% if brand_text -%} 27 {%- else -%} 54 {%- endif %}"
+                    alt="{% if brand_text %}{% else -%}{{ brand_name }}{%- endif %}"
+                  />
+                </td>
+              {% endif %}
+              {% if brand_text %}
+                <td width="100%" bgcolor="{{brand_colour}}" valign="middle" align="left" style="padding: 14px 0 14px 10px">
+                  <span style="
+                    display: block;
+                    font-family: Helvetica, Arial, sans-serif;
+                    font-weight: 700;
+                    font-size: 19px;
+                    color: #ffffff;
+                    line-height: 25px;
+                    ">
+                      {{ brand_text }}
+                  </span>
+                </td>
+              {% endif %}
+            </tr>
+          </table>
+          <!--[if (gte mso 9)|(IE)]>
+                </td>
+              </tr>
+            </table>
+          <![endif]-->
+        </td>
+      </tr>
+    </table>
+{% endif %}
+{% if brand_logo and not brand_banner %}
+  <table
+      role="presentation"
+      class="content"
+      align="center"
+      cellpadding="0"
+      cellspacing="0"
+      border="0"
+      style="border-collapse: collapse;max-width: 580px; width: 100% !important;"
+      width="100%"
+  >
+    <tr>
+      <td width="10" height="10" valign="middle"></td>
+      <td>
+        <!--[if (gte mso 9)|(IE)]>
+          <table role="presentation" width="560" align="center" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;width: 560px;">
+            <tr>
+              <td height="10">
+        <![endif]-->
+                <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse">
+                  <tr>
+                    <td height="24" width="100%" colspan="2"><br /></td>
+                  </tr>
+                  <tr>
+                    <td>
+                      <table role="presentation" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse">
+                        <tr>
+                          <td style="padding: 0 5px 0{% if brand_colour %} 7px; border-left: solid 2px {{ brand_colour }}{% else %} 0{% endif %}">
+                            <img src="{{ brand_logo }}" style="display: block; border: 0" height="{% if brand_text -%} 27 {%- else -%} 54 {%- endif %}"
+                                 alt="{% if brand_text %}{% else -%}{{ brand_name }}{%- endif %}" />
+                          </td>
+                          <td width="100%" style="font-family: Helvetica, Arial, sans-serif; font-size: 18px; line-height: 23px;" valign="center">
+                            {% if brand_text %}
+                            {{ brand_text }}
+                            {% endif %}
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+        <!--[if (gte mso 9)|(IE)]>
+              </td>
+            </tr>
+          </table>
+        <![endif]-->
+      </td>
+      <td width="10" valign="middle" height="10"></td>
+    </tr>
+  </table>
+{% endif %}
+  <table
+      role="presentation"
+      class="content"
+      align="center"
+      cellpadding="0"
+      cellspacing="0"
+      border="0"
+      style="border-collapse: collapse;max-width: 580px; width: 100% !important;"
+      width="100%"
+  >
+    <tr>
+      <td height="30"><br /></td>
+    </tr>
+    <tr>
+      <td width="10" valign="middle"><br /></td>
+      <td style="font-family: Helvetica, Arial, sans-serif; font-size: 19px; line-height: 1.315789474; max-width: 560px;">
+        <!--[if (gte mso 9)|(IE)]>
+          <table role="presentation" width="560" align="center" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;width: 560px;">
+            <tr>
+              <td style="font-family: Helvetica, Arial, sans-serif; font-size: 19px; line-height: 1.315789474;">
+        <![endif]-->
+            {{ body|safe }}
+        <!--[if (gte mso 9)|(IE)]>
+              </td>
+            </tr>
+          </table>
+        <![endif]-->
+      </td>
+      <td width="10" valign="middle"><br /></td>
+    </tr>
+    <tr>
+      <td height="30"><br /></td>
+    </tr>
+  </table>
+{% if complete_html %}
+</body>
+</html>
+{% endif %}
diff --git a/notifications_utils/jinja_templates/letter_image_template.jinja2 b/notifications_utils/jinja_templates/letter_image_template.jinja2
new file mode 100644
index 0000000000..b03428ca18
--- /dev/null
+++ b/notifications_utils/jinja_templates/letter_image_template.jinja2
@@ -0,0 +1,37 @@
+{% for page_number in page_numbers %}
+  <div class="letter">
+    {% if loop.first and show_postage %}
+      <p class="letter-postage {{ postage_class_value }}">
+        Postage: {{ postage_description }}
+      </p>
+    {% endif %}
+    <img src="{{ image_url }}?page={{ page_number }}" alt="" loading="{{ 'eager' if loop.first else 'lazy' }}">
+  </div>
+{% endfor %}
+
+<div class="govuk-visually-hidden">
+  <h3>
+    Recipient address
+  </h3>
+  <ul>
+  {%- for line in address -%}
+    <li>{{ line }}</li>
+  {%- endfor -%}
+  </ul>
+  <h3>
+    Contact block
+  </h3>
+  <p>
+    {{ contact_block }}
+  </p>
+  <h3>
+    Content
+  </h3>
+  <p>
+    {{ date }}
+  </p>
+  <h3>
+    {{ subject }}
+  </h3>
+  {{ message }}
+</div>
diff --git a/notifications_utils/jinja_templates/letter_pdf/_body.jinja2 b/notifications_utils/jinja_templates/letter_pdf/_body.jinja2
new file mode 100644
index 0000000000..6e16bfe610
--- /dev/null
+++ b/notifications_utils/jinja_templates/letter_pdf/_body.jinja2
@@ -0,0 +1,33 @@
+  </head>
+  <body>
+    <div id="logo">
+      {% if logo_file_name %}
+        <img src="{{admin_base_url}}/static/images/letter-template/{{logo_file_name}}" class="{{ logo_class }}"/>
+      {% endif %}
+    </div>
+    <div id="to">
+      <div id="mdi">
+        000_000_0000000_000000_0000_00000
+      </div>
+      <ul>
+      {%- for line in address -%}
+        <li>{{ line }}</li>
+      {%- endfor -%}
+      </ul>
+    </div>
+    <div id="barcode">
+    </div>
+    <div id="qrcode">
+    </div>
+    <div id="from">
+      {{ contact_block }}
+    </div>
+    <div id="content">
+      <p>
+        {{ date }}
+      </p>
+      <h1>{{ subject }}</h1>
+      {{ message }}
+    </div>
+  </body>
+</html>
diff --git a/notifications_utils/jinja_templates/letter_pdf/_head.jinja2 b/notifications_utils/jinja_templates/letter_pdf/_head.jinja2
new file mode 100644
index 0000000000..064237fa64
--- /dev/null
+++ b/notifications_utils/jinja_templates/letter_pdf/_head.jinja2
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>
+      Preview – GOV.UK Notify
+    </title>
diff --git a/notifications_utils/jinja_templates/letter_pdf/_main_css.jinja2 b/notifications_utils/jinja_templates/letter_pdf/_main_css.jinja2
new file mode 100644
index 0000000000..c73684d32e
--- /dev/null
+++ b/notifications_utils/jinja_templates/letter_pdf/_main_css.jinja2
@@ -0,0 +1,197 @@
+{% set line_height = '16.0pt' %}
+<style media="print">
+  @page {
+    size: A4 portrait;
+    margin: 15mm 10mm 15mm 15mm;
+  }
+  @page :first {
+    margin-top: 10mm;
+  }
+  @page {
+    @bottom-right {
+      content: "Page " counter(page) " of " counter(pages);
+      font-family: 'Nimbus Sans L';
+      font-size: 10pt;
+      text-align: right;
+      vertical-align: top;
+    }
+  }
+  body {
+    font-family: 'Nimbus Sans L', 'FreeSans', sans-serif;
+    font-size: 12.5pt;
+    line-height: {{ line_height }};
+    letter-spacing: 0.01em;
+    word-spacing: -0.04em;
+    margin: 0;
+    padding: 94mm 50mm 0 0;
+  }
+  #logo {
+    height: 18mm;
+    width: 70mm;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+  #logo img.png {
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    max-width: 100%;
+    max-height: 100%;
+  }
+  #logo img.svg {
+      display: block;
+      width: auto;
+      height: 100%;
+      max-width: 100%;
+  }
+  #to,
+  #from {
+    position: absolute;
+  }
+  #to {
+    width: 85mm;
+    max-height: 26.7mm;
+    left: 9.6mm;
+    bottom: 215.8mm;
+    font-size: 8pt;
+    line-height: 8.5pt;
+    text-transform: uppercase;
+  }
+  #to ul {
+    margin: 0;
+    padding: 0;
+  }
+  #to li {
+    display: block;
+    max-width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+  #from {
+    bottom: 199.8mm;
+    right: 0mm;
+    width: 71.2mm;
+    max-height: 132pt;
+    font-size: 10pt;
+    line-height: 12pt;
+  }
+  #mdi {
+    font-size: 6pt;
+  }
+  #barcode {
+    position: absolute;
+    top: 61mm;
+    left: 9.6mm;
+    width: 85mm; /* not width constrained */
+    height: 8.1mm;
+    background: url({{admin_base_url}}/static/images/letter-template/type29.png);
+    background-repeat: no-repeat;
+    background-size: auto 110%;
+  }
+  #qrcode {
+    position: absolute;
+    top: 26.9mm;
+    left: -10.6mm;
+    width: 6.7mm;
+    height: 6.7mm;
+    background: url({{admin_base_url}}/static/images/letter-template/qr1.png);
+    background-size: 100% 100%;
+  }
+  #content {
+    width: 137.5mm;
+  }
+  h1 {
+    font-size: 20pt;
+    line-height: 23.4pt;
+    font-weight: bold;
+    margin: 18.16pt 0 7.68pt 0;
+  }
+  h2 {
+    font-size: 14pt;
+    line-height: 17.4pt;
+    font-weight: bold;
+    margin: 0 0 {{ line_height }} 0;
+  }
+  h1 + h2 {
+    margin-top: 8.35pt;
+  }
+  p {
+    font-size: 12.5pt;
+    line-height: {{ line_height }};
+    margin: 0 0 {{ line_height }} 0;
+    orphans: 4;
+  }
+  #content ul,
+  #content ol {
+    font-size: 12.5pt;
+    line-height: {{ line_height }};
+    margin: 0 0 {{ line_height }} 0;
+    padding: 0 0 0 0.8em;
+  }
+  #content ol {
+    padding-left: 1.4em;
+  }
+  #content li {
+    margin: 0;
+    padding: 0;
+  }
+  #content ol ul,
+  #content ul ul {
+    margin: {{ line_height }} 0 0 0;
+    padding-left: 0;
+    list-style-type: disc;
+  }
+  #content ol ul {
+    margin-left: -0.6em;
+  }
+  #content *:last-child {
+    margin-bottom: 0;
+  }
+
+  .page‑break {
+    page-break-after: always;
+    height: 0;
+  }
+
+  .placeholder {
+    display: inline;
+    background-color: #FD0;
+    background-image: url({{admin_base_url}}/static/images/letter-template/placeholder-mask-left.svg), url({{admin_base_url}}/static/images/letter-template/placeholder-mask-right.svg);
+    background-size: auto 150%, auto 150%;
+    background-position: 0 -0.17em, right -0.17em;
+    color: #000;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    border-radius: 1.05em;
+  }
+
+  .placeholder-no-brackets {
+    display: inline;
+    background: #FD0;
+    color: #000;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    padding-left: 3px;
+    padding-right: 3px;
+    border-radius: 1px;
+    text-transform: none;
+  }
+
+  .placeholder-conditional {
+    display: inline;
+    background: #FD0;
+    background-image: url({{admin_base_url}}/static/images/letter-template/placeholder-mask-left.svg), url({{admin_base_url}}/static/images/letter-template/placeholder-mask-right-conditional.svg);
+    background-size: auto 115%, 5mm 100%;
+    background-position: 0 -0.05em, right 0;
+    background-repeat: no-repeat, no-repeat;
+    color: #000;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    border-radius: 1.05em;
+  }
+
+</style>
diff --git a/notifications_utils/jinja_templates/letter_pdf/_print_only_css.jinja2 b/notifications_utils/jinja_templates/letter_pdf/_print_only_css.jinja2
new file mode 100644
index 0000000000..3d4c2c59b5
--- /dev/null
+++ b/notifications_utils/jinja_templates/letter_pdf/_print_only_css.jinja2
@@ -0,0 +1,17 @@
+<style media="print">
+
+  #mdi,
+  #barcode,
+  #qrcode {
+    display: none;
+  }
+
+  @page :first {
+    @top-left-corner {
+        content: 'NOTIFY';
+        color: white;
+        font-family: 'arial';
+        font-size: 6pt;
+    }
+  }
+</style>
diff --git a/notifications_utils/jinja_templates/letter_pdf/preview.jinja2 b/notifications_utils/jinja_templates/letter_pdf/preview.jinja2
new file mode 100644
index 0000000000..d1b73fefb9
--- /dev/null
+++ b/notifications_utils/jinja_templates/letter_pdf/preview.jinja2
@@ -0,0 +1,3 @@
+{% include 'letter_pdf/_head.jinja2' %}
+{% include 'letter_pdf/_main_css.jinja2' %}
+{% include 'letter_pdf/_body.jinja2' %}
diff --git a/notifications_utils/jinja_templates/letter_pdf/print.jinja2 b/notifications_utils/jinja_templates/letter_pdf/print.jinja2
new file mode 100644
index 0000000000..f56f497466
--- /dev/null
+++ b/notifications_utils/jinja_templates/letter_pdf/print.jinja2
@@ -0,0 +1,4 @@
+{% include 'letter_pdf/_head.jinja2' %}
+{% include 'letter_pdf/_main_css.jinja2' %}
+{% include 'letter_pdf/_print_only_css.jinja2' %}
+{% include 'letter_pdf/_body.jinja2' %}
diff --git a/notifications_utils/jinja_templates/sms_preview_template.jinja2 b/notifications_utils/jinja_templates/sms_preview_template.jinja2
new file mode 100644
index 0000000000..dea33cce51
--- /dev/null
+++ b/notifications_utils/jinja_templates/sms_preview_template.jinja2
@@ -0,0 +1,13 @@
+{% if show_sender %}
+  <p class="sms-message-sender">
+    From: {{ sender }}
+  </p>
+{% endif %}
+{% if show_recipient %}
+  <p class="sms-message-recipient">
+    To: {{ recipient }}
+  </p>
+{% endif %}
+<div class="sms-message-wrapper">
+  {{ body }}
+</div>
diff --git a/notifications_utils/letter_timings.py b/notifications_utils/letter_timings.py
new file mode 100644
index 0000000000..62abf2c21a
--- /dev/null
+++ b/notifications_utils/letter_timings.py
@@ -0,0 +1,180 @@
+from collections import namedtuple
+from datetime import datetime, time, timedelta
+
+import pytz
+from govuk_bank_holidays.bank_holidays import BankHolidays
+
+from notifications_utils.countries.data import Postage
+from notifications_utils.timezones import utc_string_to_aware_gmt_datetime
+
+LETTER_PROCESSING_DEADLINE = time(17, 30)
+CANCELLABLE_JOB_LETTER_STATUSES = [
+    "created",
+    "cancelled",
+    "virus-scan-failed",
+    "validation-failed",
+    "technical-failure",
+    "pending-virus-check",
+]
+
+
+non_working_days_dvla = BankHolidays(
+    use_cached_holidays=True,
+    weekend=(5, 6),
+)
+non_working_days_royal_mail = BankHolidays(
+    use_cached_holidays=True,
+    weekend=(6,),  # Only Sunday (day 6 of the week) is a non-working day
+)
+
+
+def set_gmt_hour(day, hour):
+    return (
+        day.astimezone(pytz.timezone("Europe/London"))
+        .replace(hour=hour, minute=0)
+        .astimezone(pytz.utc)
+    )
+
+
+def get_next_work_day(date, non_working_days):
+    next_day = date + timedelta(days=1)
+    if non_working_days.is_work_day(
+        date=next_day.date(),
+        division=BankHolidays.ENGLAND_AND_WALES,
+    ):
+        return next_day
+    return get_next_work_day(next_day, non_working_days)
+
+
+def get_next_dvla_working_day(date):
+    """
+    Printing takes place monday to friday, excluding bank holidays
+    """
+    return get_next_work_day(date, non_working_days=non_working_days_dvla)
+
+
+def get_next_royal_mail_working_day(date):
+    """
+    Royal mail deliver letters on monday to saturday
+    """
+    return get_next_work_day(date, non_working_days=non_working_days_royal_mail)
+
+
+def get_delivery_day(date, *, days_to_deliver):
+    next_day = get_next_royal_mail_working_day(date)
+    if days_to_deliver == 1:
+        return next_day
+    return get_delivery_day(next_day, days_to_deliver=(days_to_deliver - 1))
+
+
+def get_min_and_max_days_in_transit(postage):
+    return {
+        # first class post is printed earlier in the day, so will
+        # actually transit on the printing day, and be delivered the next
+        # day, so effectively spends no full days in transit
+        "first": (0, 0),
+        "second": (1, 2),
+        Postage.EUROPE: (3, 5),
+        Postage.REST_OF_WORLD: (5, 7),
+    }[postage]
+
+
+def get_earliest_and_latest_delivery(print_day, postage):
+    for days_to_transit in get_min_and_max_days_in_transit(postage):
+        yield get_delivery_day(print_day, days_to_deliver=1 + days_to_transit)
+
+
+def get_letter_timings(upload_time, postage):
+    LetterTimings = namedtuple(
+        "LetterTimings", "printed_by, is_printed, earliest_delivery, latest_delivery"
+    )
+
+    # shift anything after 5:30pm to the next day
+    processing_day = utc_string_to_aware_gmt_datetime(upload_time) + timedelta(
+        hours=6, minutes=30
+    )
+    print_day = get_next_dvla_working_day(processing_day)
+
+    earliest_delivery, latest_delivery = get_earliest_and_latest_delivery(
+        print_day, postage
+    )
+
+    # print deadline is 3pm BST
+    printed_by = set_gmt_hour(print_day, hour=15)
+    now = (
+        datetime.utcnow()
+        .replace(tzinfo=pytz.utc)
+        .astimezone(pytz.timezone("Europe/London"))
+    )
+
+    return LetterTimings(
+        printed_by=printed_by,
+        is_printed=(now > printed_by),
+        earliest_delivery=set_gmt_hour(earliest_delivery, hour=16),
+        latest_delivery=set_gmt_hour(latest_delivery, hour=16),
+    )
+
+
+def letter_can_be_cancelled(notification_status, notification_created_at):
+    """
+    If letter does not have status of created or pending-virus-check
+        => can't be cancelled (it has already been processed)
+
+    If it's after 5.30pm local time and the notification was created today before 5.30pm local time
+        => can't be cancelled (it will already be zipped up to be sent)
+    """
+    if notification_status not in ("created", "pending-virus-check"):
+        return False
+
+    if too_late_to_cancel_letter(notification_created_at):
+        return False
+    return True
+
+
+def too_late_to_cancel_letter(notification_created_at):
+    time_created_at = notification_created_at
+    day_created_on = time_created_at.date()
+
+    current_time = datetime.utcnow()
+    current_day = current_time.date()
+    if (
+        _after_letter_processing_deadline()
+        and _notification_created_before_today_deadline(notification_created_at)
+    ):
+        return True
+    if (
+        _notification_created_before_that_day_deadline(notification_created_at)
+        and day_created_on < current_day
+    ):
+        return True
+    if (current_day - day_created_on).days > 1:
+        return True
+
+
+def _after_letter_processing_deadline():
+    current_utc_datetime = datetime.utcnow()
+    bst_time = current_utc_datetime.time()
+
+    return bst_time >= LETTER_PROCESSING_DEADLINE
+
+
+def _notification_created_before_today_deadline(notification_created_at):
+    current_bst_datetime = datetime.utcnow()
+    todays_deadline = current_bst_datetime.replace(
+        hour=LETTER_PROCESSING_DEADLINE.hour,
+        minute=LETTER_PROCESSING_DEADLINE.minute,
+    )
+
+    notification_created_at_in_bst = notification_created_at
+
+    return notification_created_at_in_bst <= todays_deadline
+
+
+def _notification_created_before_that_day_deadline(notification_created_at):
+    notification_created_at_bst_datetime = notification_created_at
+    created_at_day_deadline = notification_created_at_bst_datetime.replace(
+        hour=LETTER_PROCESSING_DEADLINE.hour,
+        minute=LETTER_PROCESSING_DEADLINE.minute,
+    )
+
+    return notification_created_at_bst_datetime <= created_at_day_deadline
diff --git a/notifications_utils/logging.py b/notifications_utils/logging.py
new file mode 100644
index 0000000000..6a209cdd30
--- /dev/null
+++ b/notifications_utils/logging.py
@@ -0,0 +1,133 @@
+import logging
+import logging.handlers
+import sys
+from itertools import product
+
+from flask import g, request
+from flask.ctx import has_app_context, has_request_context
+from flask.logging import default_handler
+from pythonjsonlogger.jsonlogger import JsonFormatter as BaseJSONFormatter
+
+LOG_FORMAT = (
+    "%(asctime)s %(app_name)s %(name)s %(levelname)s "
+    '%(request_id)s %(service_id)s "%(message)s" [in %(pathname)s:%(lineno)d]'
+)
+TIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
+
+logger = logging.getLogger(__name__)
+
+
+def init_app(app):
+    app.config.setdefault("NOTIFY_LOG_LEVEL", "INFO")
+    app.config.setdefault("NOTIFY_APP_NAME", "none")
+
+    app.logger.removeHandler(default_handler)
+
+    handlers = get_handlers(app)
+    loglevel = logging.getLevelName(app.config["NOTIFY_LOG_LEVEL"])
+    loggers = [
+        app.logger,
+        logging.getLogger("utils"),
+        logging.getLogger("notifications_python_client"),
+        logging.getLogger("werkzeug"),
+    ]
+    for logger_instance, handler in product(loggers, handlers):
+        logger_instance.addHandler(handler)
+        logger_instance.setLevel(loglevel)
+    warning_loggers = [logging.getLogger("boto3"), logging.getLogger("s3transfer")]
+    for logger_instance, handler in product(warning_loggers, handlers):
+        logger_instance.addHandler(handler)
+        logger_instance.setLevel(logging.WARNING)
+    app.logger.info("Logging configured")
+
+
+def get_handlers(app):
+    handlers = []
+    standard_formatter = logging.Formatter(LOG_FORMAT, TIME_FORMAT)
+    json_formatter = JSONFormatter(LOG_FORMAT, TIME_FORMAT)
+
+    stream_handler = logging.StreamHandler(sys.stdout)
+    if not app.debug:
+        handlers.append(configure_handler(stream_handler, app, json_formatter))
+    else:
+        # turn off 200 OK static logs in development
+        def is_200_static_log(log):
+            msg = log.getMessage()
+            return not ("GET /static/" in msg and " 200 " in msg)
+
+        logging.getLogger("werkzeug").addFilter(is_200_static_log)
+
+        # human readable stdout logs
+        handlers.append(configure_handler(stream_handler, app, standard_formatter))
+
+    return handlers
+
+
+def configure_handler(handler, app, formatter):
+    handler.setLevel(logging.getLevelName(app.config["NOTIFY_LOG_LEVEL"]))
+    handler.setFormatter(formatter)
+    handler.addFilter(AppNameFilter(app.config["NOTIFY_APP_NAME"]))
+    handler.addFilter(RequestIdFilter())
+    handler.addFilter(ServiceIdFilter())
+
+    return handler
+
+
+class AppNameFilter(logging.Filter):
+    def __init__(self, app_name):
+        self.app_name = app_name
+
+    def filter(self, record):
+        record.app_name = self.app_name
+
+        return record
+
+
+class RequestIdFilter(logging.Filter):
+    @property
+    def request_id(self):
+        default = "no-request-id"
+        if has_request_context() and hasattr(request, "request_id"):
+            return request.request_id or default
+        elif has_app_context() and "request_id" in g:
+            return g.request_id or default
+        else:
+            return default
+
+    def filter(self, record):
+        record.request_id = self.request_id
+
+        return record
+
+
+class ServiceIdFilter(logging.Filter):
+    @property
+    def service_id(self):
+        default = "no-service-id"
+        if has_app_context() and "service_id" in g:
+            return g.service_id or default
+        else:
+            return default
+
+    def filter(self, record):
+        record.service_id = self.service_id
+
+        return record
+
+
+class JSONFormatter(BaseJSONFormatter):
+    def process_log_record(self, log_record):
+        rename_map = {
+            "asctime": "time",
+            "request_id": "requestId",
+            "app_name": "application",
+            "service_id": "service_id",
+        }
+        for key, newkey in rename_map.items():
+            log_record[newkey] = log_record.pop(key)
+        log_record["logType"] = "application"
+        try:
+            log_record["message"] = log_record["message"].format(**log_record)
+        except (KeyError, IndexError) as e:
+            logger.exception("failed to format log message: {} not found".format(e))
+        return log_record
diff --git a/notifications_utils/markdown.py b/notifications_utils/markdown.py
new file mode 100644
index 0000000000..7d2c719e19
--- /dev/null
+++ b/notifications_utils/markdown.py
@@ -0,0 +1,308 @@
+import re
+from itertools import count
+
+import mistune
+from ordered_set import OrderedSet
+
+from notifications_utils import MAGIC_SEQUENCE, magic_sequence_regex
+from notifications_utils.formatters import create_sanitised_html_for_url
+
+LINK_STYLE = "word-wrap: break-word; color: #1D70B8;"
+
+mistune._block_quote_leading_pattern = re.compile(r"^ *\^ ?", flags=re.M)
+mistune.BlockGrammar.block_quote = re.compile(r"^( *\^[^\n]+(\n[^\n]+)*\n*)+")
+mistune.BlockGrammar.list_block = re.compile(
+    r"^( *)([•*-]|\d+\.)[\s\S]+?"
+    r"(?:"
+    r"\n+(?=\1?(?:[-*_] *){3,}(?:\n+|$))"  # hrule
+    r"|\n+(?=%s)"  # def links
+    r"|\n+(?=%s)"  # def footnotes
+    r"|\n{2,}"
+    r"(?! )"
+    r"(?!\1(?:[•*-]|\d+\.) )\n*"
+    r"|"
+    r"\s*$)"
+    % (
+        mistune._pure_pattern(mistune.BlockGrammar.def_links),
+        mistune._pure_pattern(mistune.BlockGrammar.def_footnotes),
+    )
+)
+mistune.BlockGrammar.list_item = re.compile(
+    r"^(( *)(?:[•*-]|\d+\.)[^\n]*" r"(?:\n(?!\2(?:[•*-]|\d+\.))[^\n]*)*)", flags=re.M
+)
+mistune.BlockGrammar.list_bullet = re.compile(r"^ *(?:[•*-]|\d+\.)")
+mistune.InlineGrammar.url = re.compile(r"""^(https?:\/\/[^\s<]+[^<.,:"')\]\s])""")
+
+mistune.InlineLexer.default_rules = list(
+    OrderedSet(mistune.InlineLexer.default_rules)
+    - set(
+        (
+            "emphasis",
+            "double_emphasis",
+            "strikethrough",
+            "code",
+        )
+    )
+)
+mistune.InlineLexer.inline_html_rules = list(
+    set(mistune.InlineLexer.inline_html_rules)
+    - set(
+        (
+            "emphasis",
+            "double_emphasis",
+            "strikethrough",
+            "code",
+        )
+    )
+)
+
+
+class NotifyLetterMarkdownPreviewRenderer(mistune.Renderer):
+    # TODO if we start removing the dead code detected by
+    # the vulture tool (such as the parameter 'language' here)
+    # it will break all the tests.  Need to do some massive
+    # cleanup apparently, although it's not clear why vulture
+    # only recently started detecting this.
+    def block_code(self, code, language=None):  # noqa
+        return code
+
+    def block_quote(self, text):
+        return text
+
+    def header(self, text, level, raw=None):  # noqa
+        if level == 1:
+            return super().header(text, 2)
+        return self.paragraph(text)
+
+    def hrule(self):
+        return '<div class="page-break">&nbsp;</div>'
+
+    def paragraph(self, text):
+        if text.strip():
+            return "<p>{}</p>".format(text)
+        return ""
+
+    def table(self, header, body):
+        return ""
+
+    def autolink(self, link, is_email=False):
+        return "<strong>{}</strong>".format(
+            link.replace("http://", "").replace("https://", "")
+        )
+
+    def image(self, src, title, alt_text):  # noqa
+        return ""
+
+    def linebreak(self):
+        return "<br>"
+
+    def newline(self):
+        return self.linebreak()
+
+    def list_item(self, text):
+        return "<li>{}</li>\n".format(text.strip())
+
+    def link(self, link, title, content):
+        return "{}: {}".format(content, self.autolink(link))
+
+    def footnote_ref(self, key, index):
+        return ""
+
+    def footnote_item(self, key, text):
+        return text
+
+    def footnotes(self, text):
+        return text
+
+
+class NotifyEmailMarkdownRenderer(NotifyLetterMarkdownPreviewRenderer):
+    def header(self, text, level, raw=None):  # noqa
+        if level == 1:
+            return (
+                '<h2 style="Margin: 0 0 20px 0; padding: 0; '
+                'font-size: 27px; line-height: 35px; font-weight: bold; color: #0B0C0C;">'
+                "{}"
+                "</h2>"
+            ).format(text)
+        return self.paragraph(text)
+
+    def hrule(self):
+        return '<hr style="border: 0; height: 1px; background: #B1B4B6; Margin: 30px 0 30px 0;">'
+
+    def linebreak(self):
+        return "<br />"
+
+    def list(self, body, ordered=True):
+        return (
+            (
+                '<table role="presentation" style="padding: 0 0 20px 0;">'
+                "<tr>"
+                '<td style="font-family: Helvetica, Arial, sans-serif;">'
+                '<ol style="Margin: 0 0 0 20px; padding: 0; list-style-type: decimal;">'
+                "{}"
+                "</ol>"
+                "</td>"
+                "</tr>"
+                "</table>"
+            ).format(body)
+            if ordered
+            else (
+                '<table role="presentation" style="padding: 0 0 20px 0;">'
+                "<tr>"
+                '<td style="font-family: Helvetica, Arial, sans-serif;">'
+                '<ul style="Margin: 0 0 0 20px; padding: 0; list-style-type: disc;">'
+                "{}"
+                "</ul>"
+                "</td>"
+                "</tr>"
+                "</table>"
+            ).format(body)
+        )
+
+    def list_item(self, text):
+        return (
+            '<li style="Margin: 5px 0 5px; padding: 0 0 0 5px; font-size: 19px;'
+            'line-height: 25px; color: #0B0C0C;">'
+            "{}"
+            "</li>"
+        ).format(text.strip())
+
+    def paragraph(self, text):
+        if text.strip():
+            return (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">{}</p>'
+            ).format(text)
+        return ""
+
+    def block_quote(self, text):
+        return (
+            "<blockquote "
+            'style="Margin: 0 0 20px 0; border-left: 10px solid #B1B4B6;'
+            'padding: 15px 0 0.1px 15px; font-size: 19px; line-height: 25px;"'
+            ">"
+            "{}"
+            "</blockquote>"
+        ).format(text)
+
+    def link(self, link, title, content):
+        return ('<a style="{}"{}{}>{}</a>').format(
+            LINK_STYLE,
+            ' href="{}"'.format(link),
+            ' title="{}"'.format(title) if title else "",
+            content,
+        )
+
+    def autolink(self, link, is_email=False):
+        if is_email:
+            return link
+        return create_sanitised_html_for_url(link, style=LINK_STYLE)
+
+
+class NotifyPlainTextEmailMarkdownRenderer(NotifyEmailMarkdownRenderer):
+    COLUMN_WIDTH = 65
+
+    def header(self, text, level, raw=None):  # noqa
+        if level == 1:
+            return "".join(
+                (
+                    self.linebreak() * 3,
+                    text,
+                    self.linebreak(),
+                    "-" * self.COLUMN_WIDTH,
+                )
+            )
+        return self.paragraph(text)
+
+    def hrule(self):
+        return self.paragraph("=" * self.COLUMN_WIDTH)
+
+    def linebreak(self):
+        return "\n"
+
+    def list(self, body, ordered=True):
+        def _get_list_marker():
+            decimal = count(1)
+            return lambda _: "{}.".format(next(decimal)) if ordered else "•"
+
+        return "".join(
+            (
+                self.linebreak(),
+                re.sub(
+                    magic_sequence_regex,
+                    _get_list_marker(),
+                    body,
+                ),
+            )
+        )
+
+    def list_item(self, text):
+        return "".join(
+            (
+                self.linebreak(),
+                MAGIC_SEQUENCE,
+                " ",
+                text.strip(),
+            )
+        )
+
+    def paragraph(self, text):
+        if text.strip():
+            return "".join(
+                (
+                    self.linebreak() * 2,
+                    text,
+                )
+            )
+        return ""
+
+    def block_quote(self, text):
+        return text
+
+    def link(self, link, title, content):
+        return "".join(
+            (
+                content,
+                " ({})".format(title) if title else "",
+                ": ",
+                link,
+            )
+        )
+
+    def autolink(self, link, is_email=False):  # noqa
+        return link
+
+
+class NotifyEmailPreheaderMarkdownRenderer(NotifyPlainTextEmailMarkdownRenderer):
+    def header(self, text, level, raw=None):  # noqa
+        return self.paragraph(text)
+
+    def hrule(self):
+        return ""
+
+    def link(self, link, title, content):
+        return "".join(
+            (
+                content,
+                " ({})".format(title) if title else "",
+            )
+        )
+
+
+notify_email_markdown = mistune.Markdown(
+    renderer=NotifyEmailMarkdownRenderer(),
+    hard_wrap=True,
+    use_xhtml=False,
+)
+notify_plain_text_email_markdown = mistune.Markdown(
+    renderer=NotifyPlainTextEmailMarkdownRenderer(),
+    hard_wrap=True,
+)
+notify_email_preheader_markdown = mistune.Markdown(
+    renderer=NotifyEmailPreheaderMarkdownRenderer(),
+    hard_wrap=True,
+)
+notify_letter_preview_markdown = mistune.Markdown(
+    renderer=NotifyLetterMarkdownPreviewRenderer(),
+    hard_wrap=True,
+    use_xhtml=False,
+)
diff --git a/notifications_utils/postal_address.py b/notifications_utils/postal_address.py
new file mode 100644
index 0000000000..9e0a008bd9
--- /dev/null
+++ b/notifications_utils/postal_address.py
@@ -0,0 +1,185 @@
+import re
+from functools import lru_cache
+
+from notifications_utils.countries import UK, Country, CountryNotFoundError
+from notifications_utils.countries.data import Postage
+from notifications_utils.formatters import (
+    get_lines_with_normalised_whitespace,
+    remove_whitespace,
+    remove_whitespace_before_punctuation,
+)
+
+address_lines_1_to_6_keys = [
+    # The API only accepts snake_case placeholders
+    "address_line_1",
+    "address_line_2",
+    "address_line_3",
+    "address_line_4",
+    "address_line_5",
+    "address_line_6",
+]
+address_lines_1_to_6_and_postcode_keys = address_lines_1_to_6_keys + ["postcode"]
+address_line_7_key = "address_line_7"
+address_lines_1_to_7_keys = address_lines_1_to_6_keys + [address_line_7_key]
+country_UK = Country(UK)
+
+
+class PostalAddress:
+    MIN_LINES = 3
+    MAX_LINES = 7
+    INVALID_CHARACTERS_AT_START_OF_ADDRESS_LINE = r'[\/()@]<>",=~'
+
+    def __init__(self, raw_address, allow_international_letters=False):
+        self.raw_address = raw_address
+        self.allow_international_letters = allow_international_letters
+
+        self._lines = [
+            remove_whitespace_before_punctuation(line.rstrip(" ,"))
+            for line in get_lines_with_normalised_whitespace(self.raw_address)
+            if line.rstrip(" ,")
+        ] or [""]
+
+        try:
+            self.country = Country(self._lines[-1])
+            self._lines_without_country = self._lines[:-1]
+        except CountryNotFoundError:
+            self._lines_without_country = self._lines
+            self.country = country_UK
+
+    def __bool__(self):
+        return bool(self.normalised)
+
+    def __repr__(self):
+        return f"{self.__class__.__name__}({repr(self.raw_address)})"
+
+    @classmethod
+    def from_personalisation(
+        cls, personalisation_dict, allow_international_letters=False
+    ):
+        if address_line_7_key in personalisation_dict:
+            keys = address_lines_1_to_6_keys + [address_line_7_key]
+        else:
+            keys = address_lines_1_to_6_and_postcode_keys
+        return cls(
+            "\n".join(str(personalisation_dict.get(key) or "") for key in keys),
+            allow_international_letters=allow_international_letters,
+        )
+
+    @property
+    def as_personalisation(self):
+        lines = dict.fromkeys(address_lines_1_to_6_keys, "")
+        lines.update(
+            {
+                f"address_line_{index}": value
+                for index, value in enumerate(self.normalised_lines[:-1], start=1)
+                if index < 7
+            }
+        )
+        lines["postcode"] = lines["address_line_7"] = self.normalised_lines[-1]
+        return lines
+
+    @property
+    def as_single_line(self):
+        return ", ".join(self.normalised_lines)
+
+    @property
+    def line_count(self):
+        return len(self.normalised.splitlines())
+
+    @property
+    def has_enough_lines(self):
+        return self.line_count >= self.MIN_LINES
+
+    @property
+    def has_too_many_lines(self):
+        return self.line_count > self.MAX_LINES
+
+    @property
+    def has_valid_postcode(self):
+        return self.postcode is not None
+
+    @property
+    def has_valid_last_line(self):
+        return (
+            self.allow_international_letters and self.international
+        ) or self.has_valid_postcode
+
+    @property
+    def has_invalid_characters(self):
+        return any(
+            line.startswith(tuple(self.INVALID_CHARACTERS_AT_START_OF_ADDRESS_LINE))
+            for line in self.normalised_lines
+        )
+
+    @property
+    def international(self):
+        return self.postage != Postage.UK
+
+    @property
+    def normalised(self):
+        return "\n".join(self.normalised_lines)
+
+    @property
+    def normalised_lines(self):
+        if self.international:
+            return self._lines_without_country + [self.country.canonical_name]
+
+        if self.postcode:
+            return self._lines_without_country[:-1] + [self.postcode]
+
+        return self._lines_without_country
+
+    @property
+    def postage(self):
+        return self.country.postage_zone
+
+    @property
+    def postcode(self):
+        if self.international:
+            return None
+        return format_postcode_or_none(self._lines_without_country[-1])
+
+    @property
+    def valid(self):
+        return (
+            self.has_valid_last_line
+            and self.has_enough_lines
+            and not self.has_too_many_lines
+            and not self.has_invalid_characters
+        )
+
+
+def normalise_postcode(postcode):
+    return remove_whitespace(postcode).upper()
+
+
+def is_a_real_uk_postcode(postcode):
+    standard = r"([A-Z]{1,2}[0-9][0-9A-Z]?[0-9][A-BD-HJLNP-UW-Z]{2})"
+    bfpo = r"(BFPO?(C\/O)?[0-9]{1,4})"
+    girobank = r"(GIR0AA)"
+    pattern = r"{}|{}|{}".format(standard, bfpo, girobank)
+
+    return bool(re.fullmatch(pattern, normalise_postcode(postcode)))
+
+
+def format_postcode_for_printing(postcode):
+    """
+    This function formats the postcode so that it is ready for automatic sorting by Royal Mail.
+    :param String postcode: A postcode that's already been validated by is_a_real_uk_postcode
+    """
+    postcode = normalise_postcode(postcode)
+    if "BFPOC/O" in postcode:
+        return postcode[:4] + " C/O " + postcode[7:]
+    elif "BFPO" in postcode:
+        return postcode[:4] + " " + postcode[4:]
+    return postcode[:-3] + " " + postcode[-3:]
+
+
+# When processing an address we look at the postcode twice when
+# normalising it, and once when validating it. So 8 is chosen because
+# it’s 3, doubled to give some headroom then rounded up to the nearest
+# power of 2
+@lru_cache(maxsize=8)
+def format_postcode_or_none(postcode):
+    if is_a_real_uk_postcode(postcode):
+        return format_postcode_for_printing(postcode)
diff --git a/notifications_utils/recipients.py b/notifications_utils/recipients.py
new file mode 100644
index 0000000000..68e2cb101f
--- /dev/null
+++ b/notifications_utils/recipients.py
@@ -0,0 +1,741 @@
+import csv
+import re
+import sys
+from collections import namedtuple
+from contextlib import suppress
+from functools import lru_cache
+from io import StringIO
+from itertools import islice
+
+import phonenumbers
+from flask import current_app
+from ordered_set import OrderedSet
+from phonenumbers.phonenumberutil import NumberParseException
+
+from notifications_utils.formatters import (
+    strip_all_whitespace,
+    strip_and_remove_obscure_whitespace,
+)
+from notifications_utils.insensitive_dict import InsensitiveDict
+from notifications_utils.international_billing_rates import INTERNATIONAL_BILLING_RATES
+from notifications_utils.postal_address import (
+    address_line_7_key,
+    address_lines_1_to_6_and_postcode_keys,
+    address_lines_1_to_7_keys,
+)
+from notifications_utils.template import Template
+
+from . import EMAIL_REGEX_PATTERN, hostname_part, tld_part
+
+us_prefix = "1"
+
+first_column_headings = {
+    "email": ["email address"],
+    "sms": ["phone number"],
+    "letter": [
+        line.replace("_", " ")
+        for line in address_lines_1_to_6_and_postcode_keys + [address_line_7_key]
+    ],
+}
+
+address_columns = InsensitiveDict.from_keys(first_column_headings["letter"])
+
+
+class RecipientCSV:
+    max_rows = 100_000
+
+    def __init__(
+        self,
+        file_data,
+        template,
+        max_errors_shown=20,
+        max_initial_rows_shown=10,
+        guestlist=None,
+        remaining_messages=sys.maxsize,
+        allow_international_sms=False,
+        allow_international_letters=False,
+        should_validate=True,
+    ):
+        self.file_data = strip_all_whitespace(file_data, extra_characters=",")
+        self.max_errors_shown = max_errors_shown
+        self.max_initial_rows_shown = max_initial_rows_shown
+        self.guestlist = guestlist
+        self.template = template
+        self.allow_international_sms = allow_international_sms
+        self.allow_international_letters = allow_international_letters
+        self.remaining_messages = remaining_messages
+        self.rows_as_list = None
+        self.should_validate = should_validate
+
+    def __len__(self):
+        if not hasattr(self, "_len"):
+            self._len = len(self.rows)
+        return self._len
+
+    def __getitem__(self, requested_index):
+        return self.rows[requested_index]
+
+    @property
+    def guestlist(self):
+        return self._guestlist
+
+    @guestlist.setter
+    def guestlist(self, value):
+        try:
+            self._guestlist = list(value)
+        except TypeError:
+            self._guestlist = []
+
+    @property
+    def template(self):
+        return self._template
+
+    @template.setter
+    def template(self, value):
+        if not isinstance(value, Template):
+            raise TypeError(
+                "template must be an instance of "
+                "notifications_utils.template.Template"
+            )
+        self._template = value
+        self.template_type = self._template.template_type
+        self.recipient_column_headers = first_column_headings[self.template_type]
+        self.placeholders = self._template.placeholders
+
+    @property
+    def placeholders(self):
+        return self._placeholders
+
+    @placeholders.setter
+    def placeholders(self, value):
+        try:
+            self._placeholders = list(value) + self.recipient_column_headers
+        except TypeError:
+            self._placeholders = self.recipient_column_headers
+        self.placeholders_as_column_keys = [
+            InsensitiveDict.make_key(placeholder) for placeholder in self._placeholders
+        ]
+        self.recipient_column_headers_as_column_keys = [
+            InsensitiveDict.make_key(placeholder)
+            for placeholder in self.recipient_column_headers
+        ]
+
+    @property
+    def has_errors(self):
+        return bool(
+            self.missing_column_headers
+            or self.duplicate_recipient_column_headers
+            or self.more_rows_than_can_send
+            or self.too_many_rows
+            or (not self.allowed_to_send_to)
+            or any(self.rows_with_errors)
+        )  # `or` is 3x faster than using `any()` here
+
+    @property
+    def allowed_to_send_to(self):
+        if self.template_type == "letter":
+            return True
+        if not self.guestlist:
+            return True
+        return all(
+            allowed_to_send_to(row.recipient, self.guestlist) for row in self.rows
+        )
+
+    @property
+    def rows(self):
+        if self.rows_as_list is None:
+            self.rows_as_list = list(self.get_rows())
+        return self.rows_as_list
+
+    @property
+    def _rows(self):
+        return csv.reader(
+            StringIO(self.file_data.strip()),
+            quoting=csv.QUOTE_MINIMAL,
+            skipinitialspace=True,
+        )
+
+    def get_rows(self):
+        column_headers = self._raw_column_headers  # this is for caching
+        length_of_column_headers = len(column_headers)
+
+        rows_as_lists_of_columns = self._rows
+
+        next(rows_as_lists_of_columns, None)  # skip the header row
+
+        for index, row in enumerate(rows_as_lists_of_columns):
+            if index >= self.max_rows:
+                yield None
+                continue
+
+            output_dict = {}
+
+            for column_name, column_value in zip(column_headers, row):
+                column_value = strip_and_remove_obscure_whitespace(column_value)
+
+                if (
+                    InsensitiveDict.make_key(column_name)
+                    in self.recipient_column_headers_as_column_keys
+                ):
+                    output_dict[column_name] = column_value or None
+                else:
+                    insert_or_append_to_dict(
+                        output_dict, column_name, column_value or None
+                    )
+
+            length_of_row = len(row)
+
+            if length_of_column_headers < length_of_row:
+                output_dict[None] = row[length_of_column_headers:]
+            elif length_of_column_headers > length_of_row:
+                for key in column_headers[length_of_row:]:
+                    insert_or_append_to_dict(output_dict, key, None)
+
+            yield Row(
+                output_dict,
+                index=index,
+                error_fn=self._get_error_for_field,
+                recipient_column_headers=self.recipient_column_headers,
+                placeholders=self.placeholders_as_column_keys,
+                template=self.template,
+                allow_international_letters=self.allow_international_letters,
+                validate_row=self.should_validate,
+            )
+
+    @property
+    def more_rows_than_can_send(self):
+        return len(self) > self.remaining_messages
+
+    @property
+    def too_many_rows(self):
+        return len(self) > self.max_rows
+
+    @property
+    def initial_rows(self):
+        return islice(self.rows, self.max_initial_rows_shown)
+
+    @property
+    def displayed_rows(self):
+        if any(self.rows_with_errors) and not self.missing_column_headers:
+            return self.initial_rows_with_errors
+        return self.initial_rows
+
+    def _filter_rows(self, attr):
+        return (row for row in self.rows if row and getattr(row, attr))
+
+    @property
+    def rows_with_errors(self):
+        return self._filter_rows("has_error")
+
+    @property
+    def rows_with_bad_recipients(self):
+        return self._filter_rows("has_bad_recipient")
+
+    @property
+    def rows_with_missing_data(self):
+        return self._filter_rows("has_missing_data")
+
+    @property
+    def rows_with_message_too_long(self):
+        return self._filter_rows("message_too_long")
+
+    @property
+    def rows_with_empty_message(self):
+        return self._filter_rows("message_empty")
+
+    @property
+    def initial_rows_with_errors(self):
+        return islice(self.rows_with_errors, self.max_errors_shown)
+
+    @property
+    def _raw_column_headers(self):
+        for row in self._rows:
+            return row
+        return []
+
+    @property
+    def column_headers(self):
+        return list(OrderedSet(self._raw_column_headers))
+
+    @property
+    def column_headers_as_column_keys(self):
+        return InsensitiveDict.from_keys(self.column_headers).keys()
+
+    @property
+    def missing_column_headers(self):
+        return set(
+            key
+            for key in self.placeholders
+            if (
+                InsensitiveDict.make_key(key) not in self.column_headers_as_column_keys
+                and not self.is_address_column(key)
+            )
+        )
+
+    @property
+    def duplicate_recipient_column_headers(self):
+        raw_recipient_column_headers = [
+            InsensitiveDict.make_key(column_header)
+            for column_header in self._raw_column_headers
+            if InsensitiveDict.make_key(column_header)
+            in self.recipient_column_headers_as_column_keys
+        ]
+
+        return OrderedSet(
+            (
+                column_header
+                for column_header in self._raw_column_headers
+                if raw_recipient_column_headers.count(
+                    InsensitiveDict.make_key(column_header)
+                )
+                > 1
+            )
+        )
+
+    def is_address_column(self, key):
+        return self.template_type == "letter" and key in address_columns
+
+    @property
+    def count_of_required_recipient_columns(self):
+        return 3 if self.template_type == "letter" else 1
+
+    @property
+    def has_recipient_columns(self):
+        if self.template_type == "letter":
+            sets_to_check = [
+                InsensitiveDict.from_keys(
+                    address_lines_1_to_6_and_postcode_keys
+                ).keys(),
+                InsensitiveDict.from_keys(address_lines_1_to_7_keys).keys(),
+            ]
+        else:
+            sets_to_check = [
+                self.recipient_column_headers_as_column_keys,
+            ]
+
+        for set_to_check in sets_to_check:
+            if (
+                len(
+                    # Work out which columns are shared between the possible
+                    # letter address columns and the columns in the user’s
+                    # spreadsheet (`&` means set intersection)
+                    set_to_check
+                    & self.column_headers_as_column_keys
+                )
+                >= self.count_of_required_recipient_columns
+            ):
+                return True
+
+        return False
+
+    def _get_error_for_field(self, key, value):  # noqa: C901
+        if self.is_address_column(key):
+            return
+
+        if (
+            InsensitiveDict.make_key(key)
+            in self.recipient_column_headers_as_column_keys
+        ):
+            if value in [None, ""] or isinstance(value, list):
+                if self.duplicate_recipient_column_headers:
+                    return None
+                else:
+                    return Cell.missing_field_error
+
+            try:
+                if self.template_type == "email":
+                    validate_email_address(value)
+                if self.template_type == "sms":
+                    validate_phone_number(
+                        value, international=self.allow_international_sms
+                    )
+            except (InvalidEmailError, InvalidPhoneError) as error:
+                return str(error)
+
+        if InsensitiveDict.make_key(key) not in self.placeholders_as_column_keys:
+            return
+
+        if value in [None, ""]:
+            return Cell.missing_field_error
+
+
+class Row(InsensitiveDict):
+    message_too_long = False
+    message_empty = False
+
+    def __init__(
+        self,
+        row_dict,
+        *,
+        index,
+        error_fn,
+        recipient_column_headers,
+        placeholders,
+        template,
+        allow_international_letters,
+        validate_row=True,
+    ):
+        # If we don't need to validate, then:
+        # by not setting template we avoid the template level validation (used to check message length)
+        # by not setting error_fn, we avoid the Cell.__init__ validation (used to check phone nums are valid,
+        # placeholders are present, etc)
+        if not validate_row:
+            template = None
+            error_fn = None
+
+        self.index = index
+        self.recipient_column_headers = recipient_column_headers
+        self.placeholders = placeholders
+        self.allow_international_letters = allow_international_letters
+
+        if template:
+            template.values = row_dict
+            self.template_type = template.template_type
+            # we do not validate email size for CSVs to avoid performance issues
+            if self.template_type == "email":
+                self.message_too_long = False
+            else:
+                self.message_too_long = template.is_message_too_long()
+            self.message_empty = template.is_message_empty()
+
+        super().__init__(
+            {
+                key: Cell(key, value, error_fn, self.placeholders)
+                for key, value in row_dict.items()
+            }
+        )
+
+    def __getitem__(self, key):
+        return super().__getitem__(key) if key in self else Cell()
+
+    def get(self, key, default=None):
+        if key not in self and default is not None:
+            return default
+        return self[key]
+
+    @property
+    def has_error(self):
+        return self.has_error_spanning_multiple_cells or any(
+            cell.error for cell in self.values()
+        )
+
+    @property
+    def has_bad_recipient(self):
+        if self.template_type == "letter":
+            return self.has_bad_postal_address
+        return self.get(self.recipient_column_headers[0]).recipient_error
+
+    @property
+    def has_bad_postal_address(self):
+        return self.template_type == "letter" and not self.as_postal_address.valid
+
+    @property
+    def has_error_spanning_multiple_cells(self):
+        return (
+            self.message_too_long or self.message_empty or self.has_bad_postal_address
+        )
+
+    @property
+    def has_missing_data(self):
+        return any(cell.error == Cell.missing_field_error for cell in self.values())
+
+    @property
+    def recipient(self):
+        columns = [self.get(column).data for column in self.recipient_column_headers]
+        return columns[0] if len(columns) == 1 else columns
+
+    @property
+    def as_postal_address(self):
+        from notifications_utils.postal_address import PostalAddress
+
+        return PostalAddress.from_personalisation(
+            self.recipient_and_personalisation,
+            allow_international_letters=self.allow_international_letters,
+        )
+
+    @property
+    def personalisation(self):
+        return InsensitiveDict(
+            {key: cell.data for key, cell in self.items() if key in self.placeholders}
+        )
+
+    @property
+    def recipient_and_personalisation(self):
+        return InsensitiveDict({key: cell.data for key, cell in self.items()})
+
+
+class Cell:
+    missing_field_error = "Missing"
+
+    def __init__(self, key=None, value=None, error_fn=None, placeholders=None):
+        self.data = value
+        self.error = error_fn(key, value) if error_fn else None
+        self.ignore = InsensitiveDict.make_key(key) not in (placeholders or [])
+
+    def __eq__(self, other):
+        if not other.__class__ == self.__class__:
+            return False
+        return all(
+            (
+                self.data == other.data,
+                self.error == other.error,
+                self.ignore == other.ignore,
+            )
+        )
+
+    @property
+    def recipient_error(self):
+        return self.error not in {None, self.missing_field_error}
+
+
+class InvalidEmailError(Exception):
+    def __init__(self, message=None):
+        super().__init__(message or "Not a valid email address")
+
+
+class InvalidPhoneError(InvalidEmailError):
+    pass
+
+
+class InvalidAddressError(InvalidEmailError):
+    pass
+
+
+def normalize_phone_number(phonenumber):
+    if isinstance(phonenumber, str):
+        phonenumber = phonenumbers.parse(phonenumber, "US")
+    return phonenumbers.format_number(phonenumber, phonenumbers.PhoneNumberFormat.E164)
+
+
+def is_us_phone_number(number):
+    try:
+        return _get_country_code(number) == us_prefix
+    except NumberParseException:
+        return False
+
+
+international_phone_info = namedtuple(
+    "PhoneNumber",
+    [
+        "international",
+        "country_prefix",
+        "billable_units",
+    ],
+)
+
+
+def get_international_phone_info(number):
+    number = validate_phone_number(number, international=True)
+    prefix = _get_country_code(number)
+
+    return international_phone_info(
+        international=(prefix != us_prefix),
+        country_prefix=prefix,
+        billable_units=get_billable_units_for_prefix(prefix),
+    )
+
+
+# NANP_COUNTRY_AREA_CODES are the list of area codes in the North American Numbering Plan
+# that have their own entry in international_billing_rates.yml.
+# Source: https://en.wikipedia.org/wiki/List_of_North_American_Numbering_Plan_area_codes
+_NANP_COUNTRY_AREA_CODES = [
+    "684",
+    "242",
+    "246",
+    "264",
+    "268",
+    "284",
+    "345",
+    "441",
+    "473",
+    "649",
+    "876",
+    "664",
+    "721",
+    "758",
+    "767",
+    "784",
+    "868",
+    "869",
+]
+
+
+def _get_country_code(number):
+    parsed = phonenumbers.parse(number, "US")
+    country_code = str(parsed.country_code)
+    if country_code == us_prefix:
+        area_code = str(parsed.national_number)[:3]
+        if area_code in _NANP_COUNTRY_AREA_CODES:
+            return f"{country_code}{area_code}"
+    return country_code
+
+
+def get_billable_units_for_prefix(prefix):
+    """Return the billable units for prefix. Hard-coded to 1 for now"""
+    return 1
+    # return INTERNATIONAL_BILLING_RATES[prefix]['billable_units']
+
+
+def use_numeric_sender(number):
+    prefix = _get_country_code(number)
+    return (
+        INTERNATIONAL_BILLING_RATES[(prefix or us_prefix)]["attributes"]["alpha"]
+        == "NO"
+    )
+
+
+def validate_us_phone_number(number):
+    try:
+        parsed = phonenumbers.parse(number, "US")
+        if not is_us_phone_number(number):
+            raise InvalidPhoneError("Not a US number")
+        if phonenumbers.is_valid_number(parsed):
+            return normalize_phone_number(parsed)
+        if len(str(parsed.national_number)) > 10:
+            raise InvalidPhoneError("Too many digits")
+        if len(str(parsed.national_number)) < 10:
+            raise InvalidPhoneError("Not enough digits")
+        if phonenumbers.is_possible_number(parsed):
+            raise InvalidPhoneError("Phone number range is not in use")
+        raise InvalidPhoneError("Phone number is not possible")
+    except NumberParseException as exc:
+        raise InvalidPhoneError(exc._msg) from exc
+
+
+def validate_phone_number(number, international=False):
+    if (not international) or is_us_phone_number(number):
+        return validate_us_phone_number(number)
+
+    try:
+        parsed = phonenumbers.parse(number, None)
+        if parsed.country_code != 1:
+            raise InvalidPhoneError("Invalid country code")
+        number = f"{parsed.country_code}{parsed.national_number}"
+        if len(number) < 8:
+            raise InvalidPhoneError("Not enough digits")
+        if len(number) > 15:
+            raise InvalidPhoneError("Too many digits")
+        return normalize_phone_number(parsed)
+    except NumberParseException as exc:
+        if exc._msg == "Could not interpret numbers after plus-sign.":
+            raise InvalidPhoneError("Not a valid country prefix") from exc
+        raise InvalidPhoneError(exc._msg) from exc
+
+
+validate_and_format_phone_number = validate_phone_number
+
+
+def try_validate_and_format_phone_number(number, international=None, log_msg=None):
+    """
+    For use in places where you shouldn't error if the phone number is invalid - for example if firetext pass us
+    something in
+    """
+    try:
+        return validate_and_format_phone_number(number, international)
+    except InvalidPhoneError as exc:
+        if log_msg:
+            current_app.logger.warning("{}: {}".format(log_msg, exc))
+        return number
+
+
+def _do_simple_email_checks(match, email_address):
+    # not an email
+    if not match:
+        raise InvalidEmailError
+
+    if len(email_address) > 320:
+        raise InvalidEmailError
+
+    # don't allow consecutive periods in either part
+    if ".." in email_address:
+        raise InvalidEmailError
+
+
+def validate_email_address(email_address):  # noqa (C901 too complex)
+    # almost exactly the same as by https://github.com/wtforms/wtforms/blob/master/wtforms/validators.py,
+    # with minor tweaks for SES compatibility - to avoid complications we are a lot stricter with the local part
+    # than neccessary - we don't allow any double quotes or semicolons to prevent SES Technical Failures
+    email_address = strip_and_remove_obscure_whitespace(email_address)
+    match = re.match(EMAIL_REGEX_PATTERN, email_address)
+
+    _do_simple_email_checks(match, email_address)
+
+    hostname = match.group(1)
+
+    # idna = "Internationalized domain name" - this encode/decode cycle converts unicode into its accurate ascii
+    # representation as the web uses. '例え.テスト'.encode('idna') == b'xn--r8jz45g.xn--zckzah'
+    try:
+        hostname = hostname.encode("idna").decode("ascii")
+    except UnicodeError:
+        raise InvalidEmailError
+
+    parts = hostname.split(".")
+
+    if len(hostname) > 253 or len(parts) < 2:
+        raise InvalidEmailError
+
+    for part in parts:
+        if not part or len(part) > 63 or not hostname_part.match(part):
+            raise InvalidEmailError
+
+    # if the part after the last . is not a valid TLD then bail out
+    if not tld_part.match(parts[-1]):
+        raise InvalidEmailError
+
+    return email_address
+
+
+def format_email_address(email_address):
+    return strip_and_remove_obscure_whitespace(email_address.lower())
+
+
+def validate_and_format_email_address(email_address):
+    return format_email_address(validate_email_address(email_address))
+
+
+@lru_cache(maxsize=32, typed=False)
+def format_recipient(recipient):
+    if not isinstance(recipient, str):
+        return ""
+    with suppress(InvalidPhoneError):
+        return validate_and_format_phone_number(recipient, international=True)
+    with suppress(InvalidEmailError):
+        return validate_and_format_email_address(recipient)
+    return recipient
+
+
+def format_phone_number_human_readable(phone_number):
+    try:
+        phone_number = validate_phone_number(phone_number, international=True)
+    except InvalidPhoneError:
+        # if there was a validation error, we want to shortcut out here, but still display the number on the front end
+        return phone_number
+    international_phone_info = get_international_phone_info(phone_number)
+
+    return phonenumbers.format_number(
+        phonenumbers.parse(phone_number, None),
+        (
+            phonenumbers.PhoneNumberFormat.INTERNATIONAL
+            if international_phone_info.international
+            else phonenumbers.PhoneNumberFormat.NATIONAL
+        ),
+    )
+
+
+def allowed_to_send_to(recipient, allowlist):
+    return format_recipient(recipient) in {format_recipient(x) for x in allowlist}
+
+
+def insert_or_append_to_dict(dict_, key, value):
+    if not (key or value):
+        # We don’t care about completely empty values so it’s faster to
+        # ignore them rather than working out how to store them
+        return
+
+    if dict_.get(key):
+        if isinstance(dict_[key], list):
+            dict_[key].append(value)
+        else:
+            dict_[key] = [dict_[key], value]
+    else:
+        dict_.update({key: value})
diff --git a/notifications_utils/request_helper.py b/notifications_utils/request_helper.py
new file mode 100644
index 0000000000..6c9edc8a76
--- /dev/null
+++ b/notifications_utils/request_helper.py
@@ -0,0 +1,123 @@
+from flask import abort, current_app, request
+from flask.wrappers import Request
+
+TRACE_ID_HEADER = "X-B3-TraceId"
+SPAN_ID_HEADER = "X-B3-SpanId"
+PARENT_SPAN_ID_HEADER = "X-B3-ParentSpanId"
+
+
+class NotifyRequest(Request):
+    """
+    A custom Request class, implementing extraction of zipkin headers used to trace request through cloudfoundry
+    as described here: https://docs.cloudfoundry.org/concepts/http-routing.html#zipkin-headers
+    """
+
+    @property
+    def request_id(self):
+        return self.trace_id
+
+    @property
+    def trace_id(self):
+        """
+        The "trace id" (in zipkin terms) assigned to this request, if present (None otherwise)
+        """
+        if not hasattr(self, "_trace_id"):
+            self._trace_id = self._get_header_value(TRACE_ID_HEADER)
+        return self._trace_id
+
+    @property
+    def span_id(self):
+        """
+        The "span id" (in zipkin terms) set in this request's header, if present (None otherwise)
+        """
+        if not hasattr(self, "_span_id"):
+            # note how we don't generate an id of our own. not being supplied a span id implies that we are running in
+            # an environment with no span-id-aware request router, and thus would have no intermediary to prevent the
+            # propagation of our span id all the way through all our onwards requests much like trace id. and the point
+            # of span id is to assign identifiers to each individual request.
+            self._span_id = self._get_header_value(SPAN_ID_HEADER)
+        return self._span_id
+
+    @property
+    def parent_span_id(self):
+        """
+        The "parent span id" (in zipkin terms) set in this request's header, if present (None otherwise)
+        """
+        if not hasattr(self, "_parent_span_id"):
+            self._parent_span_id = self._get_header_value(PARENT_SPAN_ID_HEADER)
+        return self._parent_span_id
+
+    def _get_header_value(self, header_name):
+        """
+        Returns value of the given header
+        """
+        if header_name in self.headers and self.headers[header_name]:
+            return self.headers[header_name]
+
+        return None
+
+
+class ResponseHeaderMiddleware(object):
+    def __init__(self, app):
+        self._app = app
+
+    def __call__(self, environ, start_response):
+        req = NotifyRequest(environ)
+
+        def rewrite_response_headers(status, headers, exc_info=None):
+            lower_existing_header_names = frozenset(
+                name.lower() for name, value in headers
+            )
+
+            if TRACE_ID_HEADER.lower() not in lower_existing_header_names:
+                headers.append((TRACE_ID_HEADER, str(req.trace_id)))
+
+            if SPAN_ID_HEADER.lower() not in lower_existing_header_names:
+                headers.append((SPAN_ID_HEADER, str(req.span_id)))
+
+            return start_response(status, headers, exc_info)
+
+        return self._app(environ, rewrite_response_headers)
+
+
+def init_app(app):
+    app.request_class = NotifyRequest
+    app.wsgi_app = ResponseHeaderMiddleware(app.wsgi_app)
+
+
+def check_proxy_header_before_request():
+    keys = [
+        current_app.config.get("ROUTE_SECRET_KEY_1"),
+        current_app.config.get("ROUTE_SECRET_KEY_2"),
+    ]
+    result, msg = _check_proxy_header_secret(request, keys)
+
+    if not result:
+        if current_app.config.get("CHECK_PROXY_HEADER", False):
+            current_app.logger.warning(msg)
+            abort(403)
+
+    # We need to return None to continue processing the request
+    # http://flask.pocoo.org/docs/0.12/api/#flask.Flask.before_request
+    return None
+
+
+def _check_proxy_header_secret(request, secrets, header="X-Custom-Forwarder"):
+    if header not in request.headers:
+        return False, "Header missing"
+
+    header_secret = request.headers.get(header)
+    if not header_secret:
+        return False, "Header exists but is empty"
+
+    # if there isn't any non-empty secret configured we fail closed
+    if not any(secrets):
+        return False, "Secrets are not configured"
+
+    for i, secret in enumerate(secrets):
+        if header_secret == secret:
+            return True, "Key used: {}".format(
+                i + 1
+            )  # add 1 to make it human-compatible
+
+    return False, "Header didn't match any keys"
diff --git a/notifications_utils/s3.py b/notifications_utils/s3.py
new file mode 100644
index 0000000000..cdcc70a5c6
--- /dev/null
+++ b/notifications_utils/s3.py
@@ -0,0 +1,87 @@
+import os
+import urllib
+
+import botocore
+from boto3 import Session
+from botocore.config import Config
+from flask import current_app
+
+AWS_CLIENT_CONFIG = Config(
+    # This config is required to enable S3 to connect to FIPS-enabled
+    # endpoints.  See https://aws.amazon.com/compliance/fips/ for more
+    # information.
+    s3={
+        "addressing_style": "virtual",
+    },
+    use_fips_endpoint=True,
+)
+
+default_access_key_id = os.environ.get("AWS_ACCESS_KEY_ID")
+default_secret_access_key = os.environ.get("AWS_SECRET_ACCESS_KEY")
+default_region = os.environ.get("AWS_REGION")
+
+
+def s3upload(
+    filedata,
+    region,
+    bucket_name,
+    file_location,
+    content_type="binary/octet-stream",
+    tags=None,
+    metadata=None,
+    access_key=default_access_key_id,
+    secret_key=default_secret_access_key,
+):
+    session = Session(
+        aws_access_key_id=access_key,
+        aws_secret_access_key=secret_key,
+        region_name=region,
+    )
+    _s3 = session.resource("s3", config=AWS_CLIENT_CONFIG)
+
+    key = _s3.Object(bucket_name, file_location)
+
+    put_args = {
+        "Body": filedata,
+        "ServerSideEncryption": "AES256",
+        "ContentType": content_type,
+    }
+
+    if tags:
+        tags = urllib.parse.urlencode(tags)
+        put_args["Tagging"] = tags
+
+    if metadata:
+        metadata = put_args["Metadata"] = metadata
+
+    try:
+        key.put(**put_args)
+    except botocore.exceptions.ClientError as e:
+        current_app.logger.error(
+            "Unable to upload file to S3 bucket {}".format(bucket_name)
+        )
+        raise e
+
+
+class S3ObjectNotFound(botocore.exceptions.ClientError):
+    pass
+
+
+def s3download(
+    bucket_name,
+    filename,
+    region=default_region,
+    access_key=default_access_key_id,
+    secret_key=default_secret_access_key,
+):
+    try:
+        session = Session(
+            aws_access_key_id=access_key,
+            aws_secret_access_key=secret_key,
+            region_name=region,
+        )
+        s3 = session.resource("s3", config=AWS_CLIENT_CONFIG)
+        key = s3.Object(bucket_name, filename)
+        return key.get()["Body"]
+    except botocore.exceptions.ClientError as error:
+        raise S3ObjectNotFound(error.response, error.operation_name)
diff --git a/notifications_utils/safe_string.py b/notifications_utils/safe_string.py
new file mode 100644
index 0000000000..be49c81a42
--- /dev/null
+++ b/notifications_utils/safe_string.py
@@ -0,0 +1,25 @@
+import re
+import unicodedata
+
+
+def make_string_safe(string, whitespace):
+    # strips accents, diacritics etc
+    string = "".join(
+        c
+        for c in unicodedata.normalize("NFD", string)
+        if unicodedata.category(c) != "Mn"
+    )
+    string = "".join(
+        word.lower() if word.isalnum() or word == whitespace else ""
+        for word in re.sub(r"\s+", whitespace, string.strip())
+    )
+    string = re.sub(r"\.{2,}", ".", string)
+    return string.strip(".")
+
+
+def make_string_safe_for_email_local_part(string):
+    return make_string_safe(string, whitespace=".")
+
+
+def make_string_safe_for_id(string):
+    return make_string_safe(string, whitespace="-")
diff --git a/notifications_utils/sanitise_text.py b/notifications_utils/sanitise_text.py
new file mode 100644
index 0000000000..3e9da07647
--- /dev/null
+++ b/notifications_utils/sanitise_text.py
@@ -0,0 +1,310 @@
+import ast
+import unicodedata
+
+from regex import regex
+
+
+class SanitiseText:
+    ALLOWED_CHARACTERS = set()
+
+    REPLACEMENT_CHARACTERS = {
+        "–": "-",  # EN DASH (U+2013)
+        "—": "-",  # EM DASH (U+2014)
+        "…": "...",  # HORIZONTAL ELLIPSIS (U+2026)
+        "‘": "'",  # LEFT SINGLE QUOTATION MARK (U+2018)
+        "’": "'",  # RIGHT SINGLE QUOTATION MARK (U+2019)
+        "“": '"',  # LEFT DOUBLE QUOTATION MARK (U+201C)
+        "”": '"',  # RIGHT DOUBLE QUOTATION MARK (U+201D)
+        "\u180E": "",  # Mongolian vowel separator
+        "\u200B": "",  # zero width space
+        "\u200C": "",  # zero width non-joiner
+        "\u200D": "",  # zero width joiner
+        "\u2060": "",  # word joiner
+        "\uFEFF": "",  # zero width non-breaking space
+        "\u00A0": " ",  # NON BREAKING WHITE SPACE (U+200B)
+        "\t": " ",  # TAB
+    }
+
+    @classmethod
+    def encode(cls, content):
+        return "".join(cls.encode_char(char) for char in content)
+
+    @classmethod
+    def get_non_compatible_characters(cls, content):
+        """
+        Given an input string, return a set of non compatible characters.
+
+        This follows the same rules as `cls.encode`, but returns just the characters that encode would replace with `?`
+        """
+        return set(
+            c
+            for c in content
+            if c not in cls.ALLOWED_CHARACTERS
+            and cls.is_extended_language(c) is False
+            and cls.downgrade_character(c) is None
+        )
+
+    @staticmethod
+    def get_unicode_char_from_codepoint(codepoint):
+        """
+        Given a unicode codepoint (eg 002E for '.', 0061 for 'a', etc), return that actual unicode character.
+
+        unicodedata.decomposition returns strings containing codepoints, so we need to eval them ourselves
+        """
+        # lets just make sure we aren't evaling anything weird
+        if not set(codepoint) <= set("0123456789ABCDEF") or not len(codepoint) == 4:
+            raise ValueError("{} is not a valid unicode codepoint".format(codepoint))
+        return ast.literal_eval('"\\u{}"'.format(codepoint))
+
+    @classmethod
+    def downgrade_character(cls, c):
+        """
+        Attempt to downgrade a non-compatible character to the allowed character set. May downgrade to multiple
+        characters, eg `… -> ...`
+
+        Will return None if character is either already valid or has no known downgrade
+        """
+        decomposed = unicodedata.decomposition(c)
+        if decomposed != "" and "<" not in decomposed:
+            # decomposition lists the unicode code points a character is made up of, if it's made up of multiple
+            # points. For example the á character returns '0061 0301', as in, the character a, followed by a combining
+            # acute accent. The decomposition might, however, also contain a decomposition mapping in angle brackets.
+            # For a full list of the types, see here: https://www.compart.com/en/unicode/decomposition.
+            # If it's got a mapping, we're not sure how best to downgrade it, so just see if it's in the
+            # REPLACEMENT_CHARACTERS map. If not, then it's probably a letter with a modifier, eg á
+            # ASSUMPTION: The first character of a combined unicode character (eg 'á' == '0061 0301')
+            # will be the ascii char
+            return cls.get_unicode_char_from_codepoint(decomposed.split()[0])
+        else:
+            # try and find a mapping (eg en dash -> hyphen ('–': '-')), else return None
+            return cls.REPLACEMENT_CHARACTERS.get(c)
+
+    @classmethod
+    def is_japanese(cls, value):
+        if regex.search(r"([\p{IsHan}\p{IsHiragana}\p{IsKatakana}]+)", value):
+            return True
+        return False
+
+    @classmethod
+    def is_chinese(cls, value):
+        # This range supports all "CJK Unified Ideoglyphs"
+        # It may be missing some rare/historic characters that are not in common use
+        if regex.search(r"[\u4e00-\u9fff]+", value) or value in [
+            "。",
+            "、",
+            "：",
+            "？",
+            "！",
+            ";",
+            "(",
+            ")",
+            "“",
+            "”",
+            "，",
+        ]:
+            return True
+        return False
+
+    @classmethod
+    def is_arabic(cls, value):
+        # For some reason, the python definition of Arabic (IsArabic) doesn't include
+        # some standard diacritics, so add them here.
+        if (
+            regex.search(r"\p{IsArabic}", value)
+            or regex.search(r"[\uFE70]+", value)
+            or regex.search(r"[\u064B]+", value)
+            or regex.search(r"[\u064F]+", value)
+        ):
+            return True
+        return False
+
+    @classmethod
+    def is_punjabi(cls, value):
+        # Gukmukhi script or Shahmukhi script
+
+        if regex.search(r"[\u0A00-\u0A7F]+", value):
+            return True
+        elif regex.search(r"[\u0600-\u06FF]+", value):
+            return True
+        elif regex.search(r"[\u0750-\u077F]+", value):
+            return True
+        elif regex.search(r"[\u08A0-\u08FF]+", value):
+            return True
+        elif regex.search(r"[\uFB50-\uFDFF]+", value):
+            return True
+        elif regex.search(r"[\uFE70-\uFEFF]+", value):
+            return True
+        elif regex.search(r"[\u0900-\u097F]+", value):
+            return True
+        return False
+
+    @classmethod
+    def _is_extended_language_group_one(cls, value):
+        if regex.search(r"\p{IsHangul}", value):  # Korean
+            return True
+        elif regex.search(r"\p{IsCyrillic}", value):
+            return True
+        elif SanitiseText.is_arabic(value):
+            return True
+        elif regex.search(r"\p{IsArmenian}", value):
+            return True
+        elif regex.search(r"\p{IsBengali}", value):
+            return True
+        elif SanitiseText.is_punjabi(value):
+            return True
+        return False
+
+    @classmethod
+    def _is_extended_language_group_two(cls, value):
+        if regex.search(r"\p{IsBuhid}", value):
+            return True
+        if regex.search(r"\p{IsCanadian_Aboriginal}", value):
+            return True
+        if regex.search(r"\p{IsCherokee}", value):
+            return True
+        if regex.search(r"\p{IsDevanagari}", value):
+            return True
+        if regex.search(r"\p{IsEthiopic}", value):
+            return True
+        if regex.search(r"\p{IsGeorgian}", value):
+            return True
+        return False
+
+    @classmethod
+    def _is_extended_language_group_three(cls, value):
+        if regex.search(r"\p{IsGreek}", value):
+            return True
+        if regex.search(r"\p{IsGujarati}", value):
+            return True
+        if regex.search(r"\p{IsHanunoo}", value):
+            return True
+        if regex.search(r"\p{IsHebrew}", value):
+            return True
+        if regex.search(r"\p{IsLimbu}", value):
+            return True
+        if regex.search(r"\p{IsKannada}", value):
+            return True
+        return False
+
+    @classmethod
+    def _is_extended_language_group_four(cls, value):
+        if regex.search(
+            r"([\p{IsKhmer}\p{IsLao}\p{IsMongolian}\p{IsMyanmar}\p{IsTibetan}\p{IsYi}]+)",
+            value,
+        ):
+            return True
+
+        if regex.search(
+            r"([\p{IsOgham}\p{IsOriya}\p{IsSinhala}\p{IsSyriac}\p{IsTagalog}]+)", value
+        ):
+            return True
+
+        if regex.search(
+            r"([\p{IsTagbanwa}\p{IsTaiLe}\p{IsTamil}\p{IsTelugu}\p{IsThaana}\p{IsThai}]+)",
+            value,
+        ):
+            return True
+
+        # Vietnamese
+        if regex.search(
+            r"\b\S*[AĂÂÁẮẤÀẰẦẢẲẨÃẴẪẠẶẬĐEÊÉẾÈỀẺỂẼỄẸỆIÍÌỈĨỊOÔƠÓỐỚÒỒỜỎỔỞÕỖỠỌỘỢUƯÚỨÙỪỦỬŨỮỤỰYÝỲỶỸỴAĂÂÁẮẤÀẰẦẢẲẨÃẴẪẠẶẬĐEÊÉẾÈỀẺỂẼỄẸỆIÍÌỈĨỊOÔƠÓỐỚÒỒỜỎỔỞÕỖỠỌỘỢUƯÚỨÙỪỦỬŨỮỤỰYÝỲỶỸỴAĂÂÁẮẤÀẰẦẢẲẨÃẴẪẠẶẬĐEÊÉẾÈỀẺỂẼỄẸỆIÍÌỈĨỊOÔƠÓỐỚÒỒỜỎỔỞÕỖỠỌỘỢUƯÚỨÙỪỦỬŨỮỤỰYÝỲỶỸỴAĂÂÁẮẤÀẰẦẢẲẨÃẴẪẠẶẬĐEÊÉẾÈỀẺỂẼỄẸỆIÍÌỈĨỊOÔƠÓỐỚÒỒỜỎỔỞÕỖỠỌỘỢUƯÚỨÙỪỦỬŨỮỤỰYÝỲỶỸỴAĂÂÁẮẤÀẰẦẢẲẨÃẴẪẠẶẬĐEÊÉẾÈỀẺỂẼỄẸỆIÍÌỈĨỊOÔƠÓỐỚÒỒỜỎỔỞÕỖỠỌỘỢUƯÚỨÙỪỦỬŨỮỤỰYÝỲỶỸỴAĂÂÁẮẤÀẰẦẢẲẨÃẴẪẠẶẬĐEÊÉẾÈỀẺỂẼỄẸỆIÍÌỈĨỊOÔƠÓỐỚÒỒỜỎỔỞÕỖỠỌỘỢUƯÚỨÙỪỦỬŨỮỤỰYÝỲỶỸỴđa-zA-Z]+\S*\b",  # noqa
+            value,
+        ):
+            return True
+
+        # Turkish
+        if regex.search(r"\b\S*[a-zA-ZçğışöüÇĞİŞÖÜ]+\S*\b", value):
+            return True
+
+        return False
+
+    @classmethod
+    def is_extended_language(cls, value):
+        """
+        Languages are combined in groups to handle cyclomatic complexity warnings
+        """
+        if cls._is_extended_language_group_one(value):
+            return True
+        if cls._is_extended_language_group_two(value):
+            return True
+        if cls._is_extended_language_group_three(value):
+            return True
+        if cls.is_japanese(value):
+            return True
+        if cls._is_extended_language_group_four(value):
+            return True
+        if cls.is_chinese(value):
+            return True
+
+        return False
+
+    @classmethod
+    def encode_char(cls, c):
+        """
+        Given a single unicode character, return a compatible character from the allowed set.
+        """
+        # char is a good character already - return that native character.
+        if c in cls.ALLOWED_CHARACTERS:
+            return c
+        elif cls.is_extended_language(c):
+            return c
+        else:
+            c = cls.downgrade_character(c)
+            return c if c is not None else "?"
+
+
+class SanitiseSMS(SanitiseText):
+    """
+    Given an input string, makes it GSM and Welsh character compatible. This involves removing all non-gsm characters by
+    applying the following rules
+    * characters within the GSM character set (https://en.wikipedia.org/wiki/GSM_03.38)
+      and extension character set are kept
+
+    * Welsh characters not included in the default GSM character set are kept
+
+    * characters with sensible downgrades are replaced in place
+        * characters with diacritics (accents, umlauts, cedillas etc) are replaced with their base character, eg é -> e
+        * en dash and em dash (– and —) are replaced with hyphen (-)
+        * left/right quotation marks (‘, ’, “, ”) are replaced with ' and "
+        * zero width spaces (sometimes used to stop eg "gov.uk" linkifying) are removed
+        * tabs are replaced with a single space
+
+    * any remaining unicode characters (eg chinese/cyrillic/glyphs/emoji) are replaced with ?
+    """
+
+    WELSH_DIACRITICS = set(
+        "àèìòùẁỳ"
+        "ÀÈÌÒÙẀỲ"  # grave
+        "áéíóúẃý"
+        "ÁÉÍÓÚẂÝ"  # acute
+        "äëïöüẅÿ"
+        "ÄËÏÖÜẄŸ"  # diaeresis
+        "âêîôûŵŷ"
+        "ÂÊÎÔÛŴŶ"  # carets
+    )
+
+    EXTENDED_GSM_CHARACTERS = set("^{}\\[~]|€")
+
+    GSM_CHARACTERS = (
+        set(
+            "@£$¥èéùìòÇ\nØø\rÅåΔ_ΦΓΛΩΠΨΣΘΞ\x1bÆæßÉ !\"#¤%&'()*+,-./0123456789:;<=>?"
+            + "¡ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÑܧ¿abcdefghijklmnopqrstuvwxyzäöñüà"
+        )
+        | EXTENDED_GSM_CHARACTERS
+    )
+
+    ALLOWED_CHARACTERS = GSM_CHARACTERS | WELSH_DIACRITICS
+    # some welsh characters are in GSM and some aren't - we need to distinguish between these for counting fragments
+    WELSH_NON_GSM_CHARACTERS = WELSH_DIACRITICS - GSM_CHARACTERS
+
+
+class SanitiseASCII(SanitiseText):
+    """
+    As SMS above, but the allowed characters are printable ascii, from character range 32 to 126 inclusive.
+    [chr(x) for x in range(32, 127)]
+    """
+
+    ALLOWED_CHARACTERS = set(
+        " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        + "[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+    )
diff --git a/notifications_utils/serialised_model.py b/notifications_utils/serialised_model.py
new file mode 100644
index 0000000000..8e925008e5
--- /dev/null
+++ b/notifications_utils/serialised_model.py
@@ -0,0 +1,61 @@
+from abc import ABC, abstractmethod
+
+
+class SerialisedModel(ABC):
+    """
+    A SerialisedModel takes a dictionary, typically created by
+    serialising a database object. It then takes the value of specified
+    keys from the dictionary and adds them to itself as properties, so
+    that it can be interacted with like any other object. It is cleaner
+    and safer than dealing with dictionaries directly because it
+    guarantees that:
+    - all of the ALLOWED_PROPERTIES are present in the underlying
+      dictionary
+    - any other abritrary properties of the underlying dictionary can’t
+      be accessed
+
+    If you are adding a new field to a model, you should ensure that
+    all sources of the cache data are updated to return that new field,
+    then clear the cache, before adding that field to the
+    ALLOWED_PROPERTIES list.
+    """
+
+    @property
+    @abstractmethod
+    def ALLOWED_PROPERTIES(self):
+        pass
+
+    def __init__(self, _dict):
+        for property in self.ALLOWED_PROPERTIES:
+            setattr(self, property, _dict[property])
+
+
+class SerialisedModelCollection(ABC):
+    """
+    A SerialisedModelCollection takes a list of dictionaries, typically
+    created by serialising database objects. When iterated over it
+    returns a model instance for each of the items in the list.
+    """
+
+    @property
+    @abstractmethod
+    def model(self):
+        pass
+
+    def __init__(self, items):
+        self.items = items
+
+    def __bool__(self):
+        return bool(self.items)
+
+    def __getitem__(self, index):
+        return self.model(self.items[index])
+
+    def __len__(self):
+        return len(self.items)
+
+    def __add__(self, other):
+        return list(self) + list(other)
+
+    def __radd__(self, other):
+        return list(other) + list(self)
diff --git a/notifications_utils/take.py b/notifications_utils/take.py
new file mode 100644
index 0000000000..ea46c39cfa
--- /dev/null
+++ b/notifications_utils/take.py
@@ -0,0 +1,3 @@
+class Take(str):
+    def then(self, func, *args, **kwargs):
+        return self.__class__(func(self, *args, **kwargs))
diff --git a/notifications_utils/template.py b/notifications_utils/template.py
new file mode 100644
index 0000000000..ec112173fb
--- /dev/null
+++ b/notifications_utils/template.py
@@ -0,0 +1,974 @@
+import math
+import re
+from abc import ABC, abstractmethod
+from datetime import datetime
+from functools import lru_cache
+from html import unescape
+from os import path
+
+from jinja2 import Environment, FileSystemLoader, select_autoescape
+from markupsafe import Markup
+
+from notifications_utils import (
+    LETTER_MAX_PAGE_COUNT,
+    MAGIC_SEQUENCE,
+    SMS_CHAR_COUNT_LIMIT,
+)
+from notifications_utils.countries.data import Postage
+from notifications_utils.field import Field, PlainTextField
+from notifications_utils.formatters import (
+    add_prefix,
+    add_trailing_newline,
+    autolink_urls,
+    escape_html,
+    formatted_list,
+    make_quotes_smart,
+    nl2br,
+    normalise_multiple_newlines,
+    normalise_whitespace,
+    normalise_whitespace_and_newlines,
+    remove_smart_quotes_from_email_addresses,
+    remove_whitespace_before_punctuation,
+    replace_hyphens_with_en_dashes,
+    replace_hyphens_with_non_breaking_hyphens,
+    sms_encode,
+    strip_leading_whitespace,
+    strip_unsupported_characters,
+    unlink_govuk_escaped,
+)
+from notifications_utils.insensitive_dict import InsensitiveDict
+from notifications_utils.markdown import (
+    notify_email_markdown,
+    notify_email_preheader_markdown,
+    notify_letter_preview_markdown,
+    notify_plain_text_email_markdown,
+)
+from notifications_utils.postal_address import PostalAddress, address_lines_1_to_7_keys
+from notifications_utils.sanitise_text import SanitiseSMS
+from notifications_utils.take import Take
+from notifications_utils.template_change import TemplateChange
+
+template_env = Environment(
+    autoescape=select_autoescape(),
+    loader=FileSystemLoader(
+        path.join(
+            path.dirname(path.abspath(__file__)),
+            "jinja_templates",
+        )
+    ),
+)
+
+
+class Template(ABC):
+    encoding = "utf-8"
+
+    def __init__(
+        self,
+        template,
+        values=None,
+        redact_missing_personalisation=False,
+    ):
+        if not isinstance(template, dict):
+            raise TypeError("Template must be a dict")
+        if values is not None and not isinstance(values, dict):
+            raise TypeError("Values must be a dict")
+        if template.get("template_type") != self.template_type:
+            raise TypeError(
+                f"Cannot initialise {self.__class__.__name__} "
+                f'with {template.get("template_type")} template_type'
+            )
+        self.id = template.get("id", None)
+        self.name = template.get("name", None)
+        self.content = template["content"]
+        self.values = values
+        self._template = template
+        self.redact_missing_personalisation = redact_missing_personalisation
+
+    def __repr__(self):
+        return '{}("{}", {})'.format(self.__class__.__name__, self.content, self.values)
+
+    @abstractmethod
+    def __str__(self):
+        pass
+
+    @property
+    def content_with_placeholders_filled_in(self):
+        return str(
+            Field(
+                self.content,
+                self.values,
+                html="passthrough",
+                redact_missing_personalisation=self.redact_missing_personalisation,
+                markdown_lists=True,
+            )
+        ).strip()
+
+    @property
+    def values(self):
+        if hasattr(self, "_values"):
+            return self._values
+        return {}
+
+    @values.setter
+    def values(self, value):
+        if not value:
+            self._values = {}
+        else:
+            placeholders = InsensitiveDict.from_keys(self.placeholders)
+            self._values = InsensitiveDict(value).as_dict_with_keys(
+                self.placeholders
+                | set(
+                    key
+                    for key in value.keys()
+                    if InsensitiveDict.make_key(key) not in placeholders.keys()
+                )
+            )
+
+    @property
+    def placeholders(self):
+        return get_placeholders(self.content)
+
+    @property
+    def missing_data(self):
+        return list(
+            placeholder
+            for placeholder in self.placeholders
+            if self.values.get(placeholder) is None
+        )
+
+    @property
+    def additional_data(self):
+        return self.values.keys() - self.placeholders
+
+    def get_raw(self, key, default=None):
+        return self._template.get(key, default)
+
+    def compare_to(self, new):
+        return TemplateChange(self, new)
+
+    @property
+    def content_count(self):
+        return len(self.content_with_placeholders_filled_in)
+
+    def is_message_empty(self):
+        if not self.content:
+            return True
+
+        if not self.content.startswith("((") or not self.content.endswith("))"):
+            # If the content doesn’t start or end with a placeholder we
+            # can guarantee it’s not empty, no matter what
+            # personalisation has been provided.
+            return False
+
+        return self.content_count == 0
+
+    def is_message_too_long(self):
+        return False
+
+
+class BaseSMSTemplate(Template):
+    template_type = "sms"
+
+    def __init__(
+        self,
+        template,
+        values=None,
+        prefix=None,
+        show_prefix=True,
+        sender=None,
+    ):
+        self.prefix = prefix
+        self.show_prefix = show_prefix
+        self.sender = sender
+        self._content_count = None
+        super().__init__(template, values)
+
+    @property
+    def values(self):
+        return super().values
+
+    @values.setter
+    def values(self, value):
+        # If we change the values of the template it’s possible the
+        # content count will have changed, so we need to reset the
+        # cached count.
+        if self._content_count is not None:
+            self._content_count = None
+
+        # Assigning to super().values doesn’t work here. We need to get
+        # the property object instead, which has the special method
+        # fset, which invokes the setter it as if we were
+        # assigning to it outside this class.
+        super(BaseSMSTemplate, type(self)).values.fset(self, value)
+
+    @property
+    def content_with_placeholders_filled_in(self):
+        # We always call SMSMessageTemplate.__str__ regardless of
+        # subclass, to avoid any HTML formatting. SMS templates differ
+        # in that the content can include the service name as a prefix.
+        # So historically we’ve returned the fully-formatted message,
+        # rather than some plain-text represenation of the content. To
+        # preserve compatibility for consumers of the API we maintain
+        # that behaviour by overriding this method here.
+        return SMSMessageTemplate.__str__(self)
+
+    @property
+    def prefix(self):
+        return self._prefix if self.show_prefix else None
+
+    @prefix.setter
+    def prefix(self, value):
+        self._prefix = value
+
+    @property
+    def content_count(self):
+        """
+        Return the number of characters in the message. Note that we don't distinguish between GSM and non-GSM
+        characters at this point, as `get_sms_fragment_count` handles that separately.
+
+        Also note that if values aren't provided, will calculate the raw length of the unsubstituted placeholders,
+        as in the message `foo ((placeholder))` has a length of 19.
+        """
+        if self._content_count is None:
+            self._content_count = len(self._get_unsanitised_content())
+        return self._content_count
+
+    @property
+    def content_count_without_prefix(self):
+        # subtract 2 extra characters to account for the colon and the space,
+        # added max zero in case the content is empty the __str__ methods strips the white space.
+        if self.prefix:
+            return max((self.content_count - len(self.prefix) - 2), 0)
+        else:
+            return self.content_count
+
+    @property
+    def fragment_count(self):
+        """
+        A fragment is up to 140 bytes, which could consist of 160 GSM chars, 140 ascii chars, or 70 ucs-2 chars,
+        or any combination thereof.
+
+        Since we are supporting more or less "all" languages, it doesn't seem like we really want to count chars,
+        and that counting bytes should suffice.
+        """
+
+        # check if all chars are in the GSM-7 character set
+        def gsm_check(x):
+            rule = re.compile(
+                r'^[\sa-zA-Z0-9_@?£!1$"¥#è?¤é%ù&ì\\ò(Ç)*:Ø+;ÄäøÆ,<LÖlöæ\-=ÑñÅß.>ÜüåÉ/§à¡¿\']+$'
+            )
+            gsm_match = rule.search(x)
+            if gsm_match is None:
+                return False
+            return True
+
+        message_str = self.content_with_placeholders_filled_in
+
+        content_len = len(message_str)
+
+        """
+        Checks for GSM-7 char set, calculates msg size, and
+        then fragments based on multipart message rules. ASCII
+        was not specifically called out as almost all messages will
+        switch from 7bit GSM to Unicode.
+
+        Calculations are based on https://messente.com/documentation/tools/sms-length-calculator
+        """
+        if gsm_check(message_str):
+            if content_len <= 160:
+                return math.ceil(content_len / 160)
+            else:
+                return math.ceil(content_len / 153)
+        else:
+            if content_len <= 70:
+                return math.ceil(content_len / 70)
+            else:
+                return math.ceil(content_len / 67)
+
+    def is_message_too_long(self):
+        """
+        Message is validated with out the prefix.
+        We have decided to be lenient and let the message go over the character limit. The SMS provider will
+        send messages well over our limit. There were some inconsistencies with how we were validating the
+        length of a message. This should be the method used anytime we want to reject a message for being too long.
+        """
+        return self.content_count_without_prefix > SMS_CHAR_COUNT_LIMIT
+
+    def is_message_empty(self):
+        return self.content_count_without_prefix == 0
+
+    def _get_unsanitised_content(self):
+        # This is faster to call than SMSMessageTemplate.__str__ if all
+        # you need to know is how many characters are in the message
+        if self.values:
+            values = self.values
+        else:
+            values = {key: MAGIC_SEQUENCE for key in self.placeholders}
+        return (
+            Take(PlainTextField(self.content, values, html="passthrough"))
+            .then(add_prefix, self.prefix)
+            .then(remove_whitespace_before_punctuation)
+            .then(normalise_whitespace_and_newlines)
+            .then(normalise_multiple_newlines)
+            .then(str.strip)
+            .then(str.replace, MAGIC_SEQUENCE, "")
+        )
+
+
+class SMSMessageTemplate(BaseSMSTemplate):
+    def __str__(self):
+        return sms_encode(self._get_unsanitised_content())
+
+
+class SMSBodyPreviewTemplate(BaseSMSTemplate):
+    def __init__(
+        self,
+        template,
+        values=None,
+    ):
+        super().__init__(template, values, show_prefix=False)
+
+    def __str__(self):
+        return Markup(
+            Take(
+                Field(
+                    self.content,
+                    self.values,
+                    html="escape",
+                    redact_missing_personalisation=True,
+                )
+            )
+            .then(sms_encode)
+            .then(remove_whitespace_before_punctuation)
+            .then(normalise_whitespace_and_newlines)
+            .then(normalise_multiple_newlines)
+            .then(str.strip)
+        )
+
+
+class SMSPreviewTemplate(BaseSMSTemplate):
+    jinja_template = template_env.get_template("sms_preview_template.jinja2")
+
+    def __init__(
+        self,
+        template,
+        values=None,
+        prefix=None,
+        show_prefix=True,
+        sender=None,
+        show_recipient=False,
+        show_sender=False,
+        downgrade_non_sms_characters=True,
+        redact_missing_personalisation=False,
+    ):
+        self.show_recipient = show_recipient
+        self.show_sender = show_sender
+        self.downgrade_non_sms_characters = downgrade_non_sms_characters
+        super().__init__(template, values, prefix, show_prefix, sender)
+        self.redact_missing_personalisation = redact_missing_personalisation
+
+    def __str__(self):
+        return Markup(
+            self.jinja_template.render(
+                {
+                    "sender": self.sender,
+                    "show_sender": self.show_sender,
+                    "recipient": Field(
+                        "((phone number))",
+                        self.values,
+                        with_brackets=False,
+                        html="escape",
+                    ),
+                    "show_recipient": self.show_recipient,
+                    "body": Take(
+                        Field(
+                            self.content,
+                            self.values,
+                            html="escape",
+                            redact_missing_personalisation=self.redact_missing_personalisation,
+                        )
+                    )
+                    .then(
+                        add_prefix,
+                        (
+                            (escape_html(self.prefix) or None)
+                            if self.show_prefix
+                            else None
+                        ),
+                    )
+                    .then(sms_encode if self.downgrade_non_sms_characters else str)
+                    .then(remove_whitespace_before_punctuation)
+                    .then(normalise_whitespace_and_newlines)
+                    .then(normalise_multiple_newlines)
+                    .then(nl2br)
+                    .then(
+                        autolink_urls,
+                        classes="govuk-link govuk-link--no-visited-state",
+                    ),
+                }
+            )
+        )
+
+
+class BaseBroadcastTemplate(BaseSMSTemplate):
+    template_type = "broadcast"
+
+    MAX_CONTENT_COUNT_GSM = 1_395
+    MAX_CONTENT_COUNT_UCS2 = 615
+
+    @property
+    def encoded_content_count(self):
+        if self.non_gsm_characters:
+            return self.content_count
+        return self.content_count + count_extended_gsm_chars(
+            self.content_with_placeholders_filled_in
+        )
+
+    @property
+    def non_gsm_characters(self):
+        return non_gsm_characters(self.content)
+
+    @property
+    def max_content_count(self):
+        if self.non_gsm_characters:
+            return self.MAX_CONTENT_COUNT_UCS2
+        return self.MAX_CONTENT_COUNT_GSM
+
+    @property
+    def content_too_long(self):
+        return self.encoded_content_count > self.max_content_count
+
+
+class BroadcastPreviewTemplate(BaseBroadcastTemplate, SMSPreviewTemplate):
+    jinja_template = template_env.get_template("broadcast_preview_template.jinja2")
+
+
+class BroadcastMessageTemplate(BaseBroadcastTemplate, SMSMessageTemplate):
+    @classmethod
+    def from_content(cls, content):
+        return cls(
+            template={
+                "template_type": cls.template_type,
+                "content": content,
+            },
+            values=None,  # events have already done interpolation of any personalisation
+        )
+
+    @classmethod
+    def from_event(cls, broadcast_event):
+        """
+        should be directly callable with the results of the BroadcastEvent.serialize() function from api/models.py
+        """
+        return cls.from_content(broadcast_event["transmitted_content"]["body"])
+
+    def __str__(self):
+        return (
+            Take(
+                Field(
+                    self.content.strip(),
+                    self.values,
+                    html="escape",
+                )
+            )
+            .then(sms_encode)
+            .then(remove_whitespace_before_punctuation)
+            .then(normalise_whitespace_and_newlines)
+            .then(normalise_multiple_newlines)
+        )
+
+
+class SubjectMixin:
+    def __init__(self, template, values=None, **kwargs):
+        self._subject = template["subject"]
+        super().__init__(template, values, **kwargs)
+
+    @property
+    def subject(self):
+        return Markup(
+            Take(
+                Field(
+                    self._subject,
+                    self.values,
+                    html="escape",
+                    redact_missing_personalisation=self.redact_missing_personalisation,
+                )
+            )
+            .then(do_nice_typography)
+            .then(normalise_whitespace)
+        )
+
+    @property
+    def placeholders(self):
+        return get_placeholders(self._subject) | super().placeholders
+
+
+class BaseEmailTemplate(SubjectMixin, Template):
+    template_type = "email"
+
+    @property
+    def html_body(self):
+        return (
+            Take(
+                Field(
+                    self.content,
+                    self.values,
+                    html="escape",
+                    markdown_lists=True,
+                    redact_missing_personalisation=self.redact_missing_personalisation,
+                )
+            )
+            .then(unlink_govuk_escaped)
+            .then(strip_unsupported_characters)
+            .then(add_trailing_newline)
+            .then(notify_email_markdown)
+            .then(do_nice_typography)
+        )
+
+    @property
+    def content_size_in_bytes(self):
+        return len(self.content_with_placeholders_filled_in.encode("utf8"))
+
+    def is_message_too_long(self):
+        """
+        SES rejects email messages bigger than 10485760 bytes (just over 10 MB per message (after base64 encoding)):
+        https://docs.aws.amazon.com/ses/latest/DeveloperGuide/quotas.html#limits-message
+
+        Base64 is apparently wasteful because we use just 64 different values per byte, whereas a byte can represent
+        256 different characters. That is, we use bytes (which are 8-bit words) as 6-bit words. There is
+        a waste of 2 bits for each 8 bits of transmission data. To send three bytes of information
+        (3 times 8 is 24 bits), you need to use four bytes (4 times 6 is again 24 bits). Thus the base64 version
+        of a file is 4/3 larger than it might be. So we use 33% more storage than we could.
+        https://lemire.me/blog/2019/01/30/what-is-the-space-overhead-of-base64-encoding/
+
+        That brings down our max safe size to 7.5 MB == 7500000 bytes before base64 encoding
+
+        But this is not the end! The message we send to SES is structured as follows:
+        "Message": {
+            'Subject': {
+                'Data': subject,
+            },
+            'Body': {'Text': {'Data': body}, 'Html': {'Data': html_body}}
+        },
+        Which means that we are sending the contents of email message twice in one request: once in plain text
+        and once with html tags. That means our plain text content needs to be much shorter to make sure we
+        fit within the limit, especially since HTML body can be much byte-heavier than plain text body.
+
+        Hence, we decided to put the limit at 1MB, which is equivalent of between 250 and 500 pages of text.
+        That's still an extremely long email, and should be sufficient for all normal use, while at the same
+        time giving us safe margin while sending the emails through Amazon SES.
+
+        EDIT: putting size up to 2MB as GOV.UK email digests are hitting the limit.
+        """
+        return self.content_size_in_bytes > 2000000
+
+
+class PlainTextEmailTemplate(BaseEmailTemplate):
+    def __str__(self):
+        return (
+            Take(
+                Field(
+                    self.content, self.values, html="passthrough", markdown_lists=True
+                )
+            )
+            .then(unlink_govuk_escaped)
+            .then(strip_unsupported_characters)
+            .then(add_trailing_newline)
+            .then(notify_plain_text_email_markdown)
+            .then(do_nice_typography)
+            .then(unescape)
+            .then(strip_leading_whitespace)
+            .then(add_trailing_newline)
+        )
+
+    @property
+    def subject(self):
+        return Markup(
+            Take(
+                Field(
+                    self._subject,
+                    self.values,
+                    html="passthrough",
+                    redact_missing_personalisation=self.redact_missing_personalisation,
+                )
+            )
+            .then(do_nice_typography)
+            .then(normalise_whitespace)
+        )
+
+
+class HTMLEmailTemplate(BaseEmailTemplate):
+    jinja_template = template_env.get_template("email_template.jinja2")
+
+    PREHEADER_LENGTH_IN_CHARACTERS = 256
+
+    def __init__(
+        self,
+        template,
+        values=None,
+        govuk_banner=True,
+        complete_html=True,
+        brand_logo=None,
+        brand_text=None,
+        brand_colour=None,
+        brand_banner=False,
+        brand_name=None,
+    ):
+        super().__init__(template, values)
+        self.govuk_banner = govuk_banner
+        self.complete_html = complete_html
+        self.brand_logo = brand_logo
+        self.brand_text = brand_text
+        self.brand_colour = brand_colour
+        self.brand_banner = brand_banner
+        self.brand_name = brand_name
+
+    @property
+    def preheader(self):
+        return " ".join(
+            Take(
+                Field(
+                    self.content,
+                    self.values,
+                    html="escape",
+                    markdown_lists=True,
+                )
+            )
+            .then(unlink_govuk_escaped)
+            .then(strip_unsupported_characters)
+            .then(add_trailing_newline)
+            .then(notify_email_preheader_markdown)
+            .then(do_nice_typography)
+            .split()
+        )[: self.PREHEADER_LENGTH_IN_CHARACTERS].strip()
+
+    def __str__(self):
+        return self.jinja_template.render(
+            {
+                "subject": self.subject,
+                "body": self.html_body,
+                "preheader": self.preheader,
+                "govuk_banner": self.govuk_banner,
+                "complete_html": self.complete_html,
+                "brand_logo": self.brand_logo,
+                "brand_text": self.brand_text,
+                "brand_colour": self.brand_colour,
+                "brand_banner": self.brand_banner,
+                "brand_name": self.brand_name,
+            }
+        )
+
+
+class EmailPreviewTemplate(BaseEmailTemplate):
+    jinja_template = template_env.get_template("email_preview_template.jinja2")
+
+    def __init__(
+        self,
+        template,
+        values=None,
+        from_name=None,
+        from_address=None,
+        reply_to=None,
+        show_recipient=True,
+        redact_missing_personalisation=False,
+    ):
+        super().__init__(
+            template,
+            values,
+            redact_missing_personalisation=redact_missing_personalisation,
+        )
+        self.from_name = from_name
+        self.from_address = from_address
+        self.reply_to = reply_to
+        self.show_recipient = show_recipient
+
+    def __str__(self):
+        return Markup(
+            self.jinja_template.render(
+                {
+                    "body": self.html_body,
+                    "subject": self.subject,
+                    "from_name": escape_html(self.from_name),
+                    "from_address": self.from_address,
+                    "reply_to": self.reply_to,
+                    "recipient": Field(
+                        "((email address))", self.values, with_brackets=False
+                    ),
+                    "show_recipient": self.show_recipient,
+                }
+            )
+        )
+
+    @property
+    def subject(self):
+        return (
+            Take(
+                Field(
+                    self._subject,
+                    self.values,
+                    html="escape",
+                    redact_missing_personalisation=self.redact_missing_personalisation,
+                )
+            )
+            .then(do_nice_typography)
+            .then(normalise_whitespace)
+        )
+
+
+class BaseLetterTemplate(SubjectMixin, Template):
+    template_type = "letter"
+
+    address_block = "\n".join(
+        f'(({line.replace("_", " ")}))' for line in address_lines_1_to_7_keys
+    )
+
+    def __init__(
+        self,
+        template,
+        values=None,
+        contact_block=None,
+        admin_base_url="http://localhost:6012",
+        logo_file_name=None,
+        redact_missing_personalisation=False,
+        date=None,
+    ):
+        self.contact_block = (contact_block or "").strip()
+        super().__init__(
+            template,
+            values,
+            redact_missing_personalisation=redact_missing_personalisation,
+        )
+        self.admin_base_url = admin_base_url
+        self.logo_file_name = logo_file_name
+        self.date = date or datetime.utcnow()
+
+    @property
+    def subject(self):
+        return (
+            Take(
+                Field(
+                    self._subject,
+                    self.values,
+                    redact_missing_personalisation=self.redact_missing_personalisation,
+                    html="escape",
+                )
+            )
+            .then(do_nice_typography)
+            .then(normalise_whitespace)
+        )
+
+    @property
+    def placeholders(self):
+        return get_placeholders(self.contact_block) | super().placeholders
+
+    @property
+    def postal_address(self):
+        return PostalAddress.from_personalisation(InsensitiveDict(self.values))
+
+    @property
+    def _address_block(self):
+        if (
+            self.postal_address.has_enough_lines
+            and not self.postal_address.has_too_many_lines
+        ):
+            return self.postal_address.normalised_lines
+
+        if "address line 7" not in self.values and "postcode" in self.values:
+            self.values["address line 7"] = self.values["postcode"]
+
+        return Field(
+            self.address_block,
+            self.values,
+            html="escape",
+            with_brackets=False,
+        ).splitlines()
+
+    @property
+    def _contact_block(self):
+        return (
+            Take(
+                Field(
+                    "\n".join(line.strip() for line in self.contact_block.split("\n")),
+                    self.values,
+                    redact_missing_personalisation=self.redact_missing_personalisation,
+                    html="escape",
+                )
+            )
+            .then(remove_whitespace_before_punctuation)
+            .then(nl2br)
+        )
+
+    @property
+    def _date(self):
+        return self.date.strftime("%-d %B %Y")
+
+    @property
+    def _message(self):
+        return (
+            Take(
+                Field(
+                    self.content,
+                    self.values,
+                    html="escape",
+                    markdown_lists=True,
+                    redact_missing_personalisation=self.redact_missing_personalisation,
+                )
+            )
+            .then(add_trailing_newline)
+            .then(notify_letter_preview_markdown)
+            .then(do_nice_typography)
+            .then(replace_hyphens_with_non_breaking_hyphens)
+        )
+
+
+class LetterPreviewTemplate(BaseLetterTemplate):
+    jinja_template = template_env.get_template("letter_pdf/preview.jinja2")
+
+    def __str__(self):
+        return Markup(
+            self.jinja_template.render(
+                {
+                    "admin_base_url": self.admin_base_url,
+                    "logo_file_name": self.logo_file_name,
+                    # logo_class should only ever be None, svg or png
+                    "logo_class": (
+                        self.logo_file_name.lower()[-3:]
+                        if self.logo_file_name
+                        else None
+                    ),
+                    "subject": self.subject,
+                    "message": self._message,
+                    "address": self._address_block,
+                    "contact_block": self._contact_block,
+                    "date": self._date,
+                }
+            )
+        )
+
+
+class LetterPrintTemplate(LetterPreviewTemplate):
+    jinja_template = template_env.get_template("letter_pdf/print.jinja2")
+
+
+class LetterImageTemplate(BaseLetterTemplate):
+    jinja_template = template_env.get_template("letter_image_template.jinja2")
+    first_page_number = 1
+    allowed_postage_types = (
+        Postage.FIRST,
+        Postage.SECOND,
+        Postage.EUROPE,
+        Postage.REST_OF_WORLD,
+    )
+
+    def __init__(
+        self,
+        template,
+        values=None,
+        image_url=None,
+        page_count=None,
+        contact_block=None,
+        postage=None,
+    ):
+        super().__init__(template, values, contact_block=contact_block)
+        if not image_url:
+            raise TypeError("image_url is required")
+        if not page_count:
+            raise TypeError("page_count is required")
+        if postage not in [None] + list(self.allowed_postage_types):
+            raise TypeError(
+                "postage must be None, {}".format(
+                    formatted_list(
+                        self.allowed_postage_types,
+                        conjunction="or",
+                        before_each="'",
+                        after_each="'",
+                    )
+                )
+            )
+        self.image_url = image_url
+        self.page_count = int(page_count)
+        self._postage = postage
+
+    @property
+    def postage(self):
+        if self.postal_address.international:
+            return self.postal_address.postage
+        return self._postage
+
+    @property
+    def last_page_number(self):
+        return min(self.page_count, LETTER_MAX_PAGE_COUNT) + self.first_page_number
+
+    @property
+    def page_numbers(self):
+        return list(range(self.first_page_number, self.last_page_number))
+
+    @property
+    def postage_description(self):
+        return {
+            Postage.FIRST: "first class",
+            Postage.SECOND: "second class",
+            Postage.EUROPE: "international",
+            Postage.REST_OF_WORLD: "international",
+        }.get(self.postage)
+
+    @property
+    def postage_class_value(self):
+        return {
+            Postage.FIRST: "letter-postage-first",
+            Postage.SECOND: "letter-postage-second",
+            Postage.EUROPE: "letter-postage-international",
+            Postage.REST_OF_WORLD: "letter-postage-international",
+        }.get(self.postage)
+
+    def __str__(self):
+        return Markup(
+            self.jinja_template.render(
+                {
+                    "image_url": self.image_url,
+                    "page_numbers": self.page_numbers,
+                    "address": self._address_block,
+                    "contact_block": self._contact_block,
+                    "date": self._date,
+                    "subject": self.subject,
+                    "message": self._message,
+                    "show_postage": bool(self.postage),
+                    "postage_description": self.postage_description,
+                    "postage_class_value": self.postage_class_value,
+                }
+            )
+        )
+
+
+def get_sms_fragment_count(character_count, non_gsm_characters):
+    if non_gsm_characters:
+        return 1 if character_count <= 70 else math.ceil(float(character_count) / 67)
+    else:
+        return 1 if character_count <= 160 else math.ceil(float(character_count) / 153)
+
+
+def non_gsm_characters(content):
+    """
+    Returns a set of all the non gsm characters in a text. this doesn't include characters that we will downgrade (eg
+    emoji, ellipsis, ñ, etc). This only includes welsh non gsm characters that will force the entire SMS to be encoded
+    with UCS-2.
+    """
+    return set(content) & set(SanitiseSMS.WELSH_NON_GSM_CHARACTERS)
+
+
+def count_extended_gsm_chars(content):
+    return sum(map(content.count, SanitiseSMS.EXTENDED_GSM_CHARACTERS))
+
+
+def do_nice_typography(value):
+    return (
+        Take(value)
+        .then(remove_whitespace_before_punctuation)
+        .then(make_quotes_smart)
+        .then(remove_smart_quotes_from_email_addresses)
+        .then(replace_hyphens_with_en_dashes)
+    )
+
+
+@lru_cache(maxsize=1024)
+def get_placeholders(content):
+    return Field(content).placeholders
diff --git a/notifications_utils/template_change.py b/notifications_utils/template_change.py
new file mode 100644
index 0000000000..e47a271f62
--- /dev/null
+++ b/notifications_utils/template_change.py
@@ -0,0 +1,31 @@
+from ordered_set import OrderedSet
+
+from notifications_utils.insensitive_dict import InsensitiveDict
+
+
+class TemplateChange:
+    def __init__(self, old_template, new_template):
+        self.old_placeholders = InsensitiveDict.from_keys(old_template.placeholders)
+        self.new_placeholders = InsensitiveDict.from_keys(new_template.placeholders)
+
+    @property
+    def has_different_placeholders(self):
+        return bool(self.new_placeholders.keys() ^ self.old_placeholders.keys())
+
+    @property
+    def placeholders_added(self):
+        return OrderedSet(
+            [
+                self.new_placeholders.get(key)
+                for key in self.new_placeholders.keys() - self.old_placeholders.keys()
+            ]
+        )
+
+    @property
+    def placeholders_removed(self):
+        return OrderedSet(
+            [
+                self.old_placeholders.get(key)
+                for key in self.old_placeholders.keys() - self.new_placeholders.keys()
+            ]
+        )
diff --git a/notifications_utils/timezones.py b/notifications_utils/timezones.py
new file mode 100644
index 0000000000..277a139f08
--- /dev/null
+++ b/notifications_utils/timezones.py
@@ -0,0 +1,16 @@
+import os
+
+import pytz
+from dateutil import parser
+
+local_timezone = pytz.timezone(os.getenv("TIMEZONE", "America/New_York"))
+
+
+def utc_string_to_aware_gmt_datetime(date):
+    """
+    Date can either be a string, naïve UTC datetime or an aware UTC datetime
+    Returns an aware local datetime, essentially the time you'd see on your clock
+    """
+    date = parser.parse(date)
+    forced_utc = date.replace(tzinfo=pytz.utc)
+    return forced_utc.astimezone(local_timezone)
diff --git a/notifications_utils/url_safe_token.py b/notifications_utils/url_safe_token.py
new file mode 100644
index 0000000000..502534809f
--- /dev/null
+++ b/notifications_utils/url_safe_token.py
@@ -0,0 +1,13 @@
+from itsdangerous import URLSafeTimedSerializer
+
+from notifications_utils.formatters import url_encode_full_stops
+
+
+def generate_token(payload, secret, salt):
+    return url_encode_full_stops(URLSafeTimedSerializer(secret).dumps(payload, salt))
+
+
+def check_token(token, secret, salt, max_age_seconds):
+    ser = URLSafeTimedSerializer(secret)
+    payload = ser.loads(token, max_age=max_age_seconds, salt=salt)
+    return payload
diff --git a/package-lock.json b/package-lock.json
index e8be05aa41..c96f68f8af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@uswds/uswds": "^3.4.1",
         "cbor-js": "0.1.0",
+        "chart.js": "^4.4.2",
         "govuk_frontend_toolkit": "8.1.0",
         "govuk-frontend": "2.13.0",
         "hogan": "1.0.2",
@@ -2527,6 +2528,11 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@kurkle/color": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz",
+      "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw=="
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3946,6 +3952,17 @@
         "node": ">=10"
       }
     },
+    "node_modules/chart.js": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz",
+      "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==",
+      "dependencies": {
+        "@kurkle/color": "^0.3.0"
+      },
+      "engines": {
+        "pnpm": ">=8"
+      }
+    },
     "node_modules/cheerio": {
       "version": "1.0.0-rc.12",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
diff --git a/package.json b/package.json
index f0bbc97f4f..b60893b57b 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
   "dependencies": {
     "@uswds/uswds": "^3.4.1",
     "cbor-js": "0.1.0",
+    "chart.js": "^4.4.2",
     "govuk_frontend_toolkit": "8.1.0",
     "govuk-frontend": "2.13.0",
     "hogan": "1.0.2",
diff --git a/poetry.lock b/poetry.lock
index d8475af7ec..7735e1e449 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
 
 [[package]]
 name = "ago"
@@ -171,17 +171,17 @@ files = [
 
 [[package]]
 name = "boto3"
-version = "1.34.94"
+version = "1.34.114"
 description = "The AWS SDK for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "boto3-1.34.94-py3-none-any.whl", hash = "sha256:bbb87d641c73462e53b1777083b55c8f13921618ad08757478a8122985c56c13"},
-    {file = "boto3-1.34.94.tar.gz", hash = "sha256:22f65b3c9b7a419f8f39c2dddc421e14fab8cbb3bd8a9d467e874237d39f59b1"},
+    {file = "boto3-1.34.114-py3-none-any.whl", hash = "sha256:4460958d2b0c53bd2195b23ed5d45db2350e514486fe8caeb38b285b30742280"},
+    {file = "boto3-1.34.114.tar.gz", hash = "sha256:eeb11bca9b19d12baf93436fb8a16b8b824f1f7e8b9bcc722607e862c46b1b08"},
 ]
 
 [package.dependencies]
-botocore = ">=1.34.94,<1.35.0"
+botocore = ">=1.34.114,<1.35.0"
 jmespath = ">=0.7.1,<2.0.0"
 s3transfer = ">=0.10.0,<0.11.0"
 
@@ -190,13 +190,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
 
 [[package]]
 name = "botocore"
-version = "1.34.94"
+version = "1.34.115"
 description = "Low-level, data-driven core of boto 3."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "botocore-1.34.94-py3-none-any.whl", hash = "sha256:f00a79002e0cb9d6895ecd0919c506402850177d7b6c4d2634fa2da362d95bcb"},
-    {file = "botocore-1.34.94.tar.gz", hash = "sha256:99b11be9a28f9051af4c96fa121e9c3f22a86d499abd773c9e868b2a38961bae"},
+    {file = "botocore-1.34.115-py3-none-any.whl", hash = "sha256:15b8ad1ee0e9cd57884fb0bcaf3a9551d2552e44a02c2ffb55ec583eebdb888e"},
+    {file = "botocore-1.34.115.tar.gz", hash = "sha256:a5d5e28b9c847b17a1ecb7660b46b83d9512b125f671e03e93d14bf6f0b274c2"},
 ]
 
 [package.dependencies]
@@ -462,63 +462,63 @@ files = [
 
 [[package]]
 name = "coverage"
-version = "7.5.1"
+version = "7.5.3"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "coverage-7.5.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c0884920835a033b78d1c73b6d3bbcda8161a900f38a488829a83982925f6c2e"},
-    {file = "coverage-7.5.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:39afcd3d4339329c5f58de48a52f6e4e50f6578dd6099961cf22228feb25f38f"},
-    {file = "coverage-7.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a7b0ceee8147444347da6a66be737c9d78f3353b0681715b668b72e79203e4a"},
-    {file = "coverage-7.5.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a9ca3f2fae0088c3c71d743d85404cec8df9be818a005ea065495bedc33da35"},
-    {file = "coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fd215c0c7d7aab005221608a3c2b46f58c0285a819565887ee0b718c052aa4e"},
-    {file = "coverage-7.5.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4bf0655ab60d754491004a5efd7f9cccefcc1081a74c9ef2da4735d6ee4a6223"},
-    {file = "coverage-7.5.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:61c4bf1ba021817de12b813338c9be9f0ad5b1e781b9b340a6d29fc13e7c1b5e"},
-    {file = "coverage-7.5.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:db66fc317a046556a96b453a58eced5024af4582a8dbdc0c23ca4dbc0d5b3146"},
-    {file = "coverage-7.5.1-cp310-cp310-win32.whl", hash = "sha256:b016ea6b959d3b9556cb401c55a37547135a587db0115635a443b2ce8f1c7228"},
-    {file = "coverage-7.5.1-cp310-cp310-win_amd64.whl", hash = "sha256:df4e745a81c110e7446b1cc8131bf986157770fa405fe90e15e850aaf7619bc8"},
-    {file = "coverage-7.5.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:796a79f63eca8814ca3317a1ea443645c9ff0d18b188de470ed7ccd45ae79428"},
-    {file = "coverage-7.5.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4fc84a37bfd98db31beae3c2748811a3fa72bf2007ff7902f68746d9757f3746"},
-    {file = "coverage-7.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6175d1a0559986c6ee3f7fccfc4a90ecd12ba0a383dcc2da30c2b9918d67d8a3"},
-    {file = "coverage-7.5.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1fc81d5878cd6274ce971e0a3a18a8803c3fe25457165314271cf78e3aae3aa2"},
-    {file = "coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:556cf1a7cbc8028cb60e1ff0be806be2eded2daf8129b8811c63e2b9a6c43bca"},
-    {file = "coverage-7.5.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9981706d300c18d8b220995ad22627647be11a4276721c10911e0e9fa44c83e8"},
-    {file = "coverage-7.5.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d7fed867ee50edf1a0b4a11e8e5d0895150e572af1cd6d315d557758bfa9c057"},
-    {file = "coverage-7.5.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ef48e2707fb320c8f139424a596f5b69955a85b178f15af261bab871873bb987"},
-    {file = "coverage-7.5.1-cp311-cp311-win32.whl", hash = "sha256:9314d5678dcc665330df5b69c1e726a0e49b27df0461c08ca12674bcc19ef136"},
-    {file = "coverage-7.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:5fa567e99765fe98f4e7d7394ce623e794d7cabb170f2ca2ac5a4174437e90dd"},
-    {file = "coverage-7.5.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b6cf3764c030e5338e7f61f95bd21147963cf6aa16e09d2f74f1fa52013c1206"},
-    {file = "coverage-7.5.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2ec92012fefebee89a6b9c79bc39051a6cb3891d562b9270ab10ecfdadbc0c34"},
-    {file = "coverage-7.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:16db7f26000a07efcf6aea00316f6ac57e7d9a96501e990a36f40c965ec7a95d"},
-    {file = "coverage-7.5.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:beccf7b8a10b09c4ae543582c1319c6df47d78fd732f854ac68d518ee1fb97fa"},
-    {file = "coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8748731ad392d736cc9ccac03c9845b13bb07d020a33423fa5b3a36521ac6e4e"},
-    {file = "coverage-7.5.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7352b9161b33fd0b643ccd1f21f3a3908daaddf414f1c6cb9d3a2fd618bf2572"},
-    {file = "coverage-7.5.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:7a588d39e0925f6a2bff87154752481273cdb1736270642aeb3635cb9b4cad07"},
-    {file = "coverage-7.5.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:68f962d9b72ce69ea8621f57551b2fa9c70509af757ee3b8105d4f51b92b41a7"},
-    {file = "coverage-7.5.1-cp312-cp312-win32.whl", hash = "sha256:f152cbf5b88aaeb836127d920dd0f5e7edff5a66f10c079157306c4343d86c19"},
-    {file = "coverage-7.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:5a5740d1fb60ddf268a3811bcd353de34eb56dc24e8f52a7f05ee513b2d4f596"},
-    {file = "coverage-7.5.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e2213def81a50519d7cc56ed643c9e93e0247f5bbe0d1247d15fa520814a7cd7"},
-    {file = "coverage-7.5.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5037f8fcc2a95b1f0e80585bd9d1ec31068a9bcb157d9750a172836e98bc7a90"},
-    {file = "coverage-7.5.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c3721c2c9e4c4953a41a26c14f4cef64330392a6d2d675c8b1db3b645e31f0e"},
-    {file = "coverage-7.5.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca498687ca46a62ae590253fba634a1fe9836bc56f626852fb2720f334c9e4e5"},
-    {file = "coverage-7.5.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cdcbc320b14c3e5877ee79e649677cb7d89ef588852e9583e6b24c2e5072661"},
-    {file = "coverage-7.5.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:57e0204b5b745594e5bc14b9b50006da722827f0b8c776949f1135677e88d0b8"},
-    {file = "coverage-7.5.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fe7502616b67b234482c3ce276ff26f39ffe88adca2acf0261df4b8454668b4"},
-    {file = "coverage-7.5.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9e78295f4144f9dacfed4f92935fbe1780021247c2fabf73a819b17f0ccfff8d"},
-    {file = "coverage-7.5.1-cp38-cp38-win32.whl", hash = "sha256:1434e088b41594baa71188a17533083eabf5609e8e72f16ce8c186001e6b8c41"},
-    {file = "coverage-7.5.1-cp38-cp38-win_amd64.whl", hash = "sha256:0646599e9b139988b63704d704af8e8df7fa4cbc4a1f33df69d97f36cb0a38de"},
-    {file = "coverage-7.5.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4cc37def103a2725bc672f84bd939a6fe4522310503207aae4d56351644682f1"},
-    {file = "coverage-7.5.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fc0b4d8bfeabd25ea75e94632f5b6e047eef8adaed0c2161ada1e922e7f7cece"},
-    {file = "coverage-7.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d0a0f5e06881ecedfe6f3dd2f56dcb057b6dbeb3327fd32d4b12854df36bf26"},
-    {file = "coverage-7.5.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9735317685ba6ec7e3754798c8871c2f49aa5e687cc794a0b1d284b2389d1bd5"},
-    {file = "coverage-7.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d21918e9ef11edf36764b93101e2ae8cc82aa5efdc7c5a4e9c6c35a48496d601"},
-    {file = "coverage-7.5.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c3e757949f268364b96ca894b4c342b41dc6f8f8b66c37878aacef5930db61be"},
-    {file = "coverage-7.5.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:79afb6197e2f7f60c4824dd4b2d4c2ec5801ceb6ba9ce5d2c3080e5660d51a4f"},
-    {file = "coverage-7.5.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d1d0d98d95dd18fe29dc66808e1accf59f037d5716f86a501fc0256455219668"},
-    {file = "coverage-7.5.1-cp39-cp39-win32.whl", hash = "sha256:1cc0fe9b0b3a8364093c53b0b4c0c2dd4bb23acbec4c9240b5f284095ccf7981"},
-    {file = "coverage-7.5.1-cp39-cp39-win_amd64.whl", hash = "sha256:dde0070c40ea8bb3641e811c1cfbf18e265d024deff6de52c5950677a8fb1e0f"},
-    {file = "coverage-7.5.1-pp38.pp39.pp310-none-any.whl", hash = "sha256:6537e7c10cc47c595828b8a8be04c72144725c383c4702703ff4e42e44577312"},
-    {file = "coverage-7.5.1.tar.gz", hash = "sha256:54de9ef3a9da981f7af93eafde4ede199e0846cd819eb27c88e2b712aae9708c"},
+    {file = "coverage-7.5.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a6519d917abb15e12380406d721e37613e2a67d166f9fb7e5a8ce0375744cd45"},
+    {file = "coverage-7.5.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:aea7da970f1feccf48be7335f8b2ca64baf9b589d79e05b9397a06696ce1a1ec"},
+    {file = "coverage-7.5.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:923b7b1c717bd0f0f92d862d1ff51d9b2b55dbbd133e05680204465f454bb286"},
+    {file = "coverage-7.5.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62bda40da1e68898186f274f832ef3e759ce929da9a9fd9fcf265956de269dbc"},
+    {file = "coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8b7339180d00de83e930358223c617cc343dd08e1aa5ec7b06c3a121aec4e1d"},
+    {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:25a5caf742c6195e08002d3b6c2dd6947e50efc5fc2c2205f61ecb47592d2d83"},
+    {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:05ac5f60faa0c704c0f7e6a5cbfd6f02101ed05e0aee4d2822637a9e672c998d"},
+    {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:239a4e75e09c2b12ea478d28815acf83334d32e722e7433471fbf641c606344c"},
+    {file = "coverage-7.5.3-cp310-cp310-win32.whl", hash = "sha256:a5812840d1d00eafae6585aba38021f90a705a25b8216ec7f66aebe5b619fb84"},
+    {file = "coverage-7.5.3-cp310-cp310-win_amd64.whl", hash = "sha256:33ca90a0eb29225f195e30684ba4a6db05dbef03c2ccd50b9077714c48153cac"},
+    {file = "coverage-7.5.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f81bc26d609bf0fbc622c7122ba6307993c83c795d2d6f6f6fd8c000a770d974"},
+    {file = "coverage-7.5.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7cec2af81f9e7569280822be68bd57e51b86d42e59ea30d10ebdbb22d2cb7232"},
+    {file = "coverage-7.5.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55f689f846661e3f26efa535071775d0483388a1ccfab899df72924805e9e7cd"},
+    {file = "coverage-7.5.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50084d3516aa263791198913a17354bd1dc627d3c1639209640b9cac3fef5807"},
+    {file = "coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:341dd8f61c26337c37988345ca5c8ccabeff33093a26953a1ac72e7d0103c4fb"},
+    {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ab0b028165eea880af12f66086694768f2c3139b2c31ad5e032c8edbafca6ffc"},
+    {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5bc5a8c87714b0c67cfeb4c7caa82b2d71e8864d1a46aa990b5588fa953673b8"},
+    {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:38a3b98dae8a7c9057bd91fbf3415c05e700a5114c5f1b5b0ea5f8f429ba6614"},
+    {file = "coverage-7.5.3-cp311-cp311-win32.whl", hash = "sha256:fcf7d1d6f5da887ca04302db8e0e0cf56ce9a5e05f202720e49b3e8157ddb9a9"},
+    {file = "coverage-7.5.3-cp311-cp311-win_amd64.whl", hash = "sha256:8c836309931839cca658a78a888dab9676b5c988d0dd34ca247f5f3e679f4e7a"},
+    {file = "coverage-7.5.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:296a7d9bbc598e8744c00f7a6cecf1da9b30ae9ad51c566291ff1314e6cbbed8"},
+    {file = "coverage-7.5.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:34d6d21d8795a97b14d503dcaf74226ae51eb1f2bd41015d3ef332a24d0a17b3"},
+    {file = "coverage-7.5.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e317953bb4c074c06c798a11dbdd2cf9979dbcaa8ccc0fa4701d80042d4ebf1"},
+    {file = "coverage-7.5.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:705f3d7c2b098c40f5b81790a5fedb274113373d4d1a69e65f8b68b0cc26f6db"},
+    {file = "coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1196e13c45e327d6cd0b6e471530a1882f1017eb83c6229fc613cd1a11b53cd"},
+    {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:015eddc5ccd5364dcb902eaecf9515636806fa1e0d5bef5769d06d0f31b54523"},
+    {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fd27d8b49e574e50caa65196d908f80e4dff64d7e592d0c59788b45aad7e8b35"},
+    {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:33fc65740267222fc02975c061eb7167185fef4cc8f2770267ee8bf7d6a42f84"},
+    {file = "coverage-7.5.3-cp312-cp312-win32.whl", hash = "sha256:7b2a19e13dfb5c8e145c7a6ea959485ee8e2204699903c88c7d25283584bfc08"},
+    {file = "coverage-7.5.3-cp312-cp312-win_amd64.whl", hash = "sha256:0bbddc54bbacfc09b3edaec644d4ac90c08ee8ed4844b0f86227dcda2d428fcb"},
+    {file = "coverage-7.5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f78300789a708ac1f17e134593f577407d52d0417305435b134805c4fb135adb"},
+    {file = "coverage-7.5.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b368e1aee1b9b75757942d44d7598dcd22a9dbb126affcbba82d15917f0cc155"},
+    {file = "coverage-7.5.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f836c174c3a7f639bded48ec913f348c4761cbf49de4a20a956d3431a7c9cb24"},
+    {file = "coverage-7.5.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:244f509f126dc71369393ce5fea17c0592c40ee44e607b6d855e9c4ac57aac98"},
+    {file = "coverage-7.5.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4c2872b3c91f9baa836147ca33650dc5c172e9273c808c3c3199c75490e709d"},
+    {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dd4b3355b01273a56b20c219e74e7549e14370b31a4ffe42706a8cda91f19f6d"},
+    {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f542287b1489c7a860d43a7d8883e27ca62ab84ca53c965d11dac1d3a1fab7ce"},
+    {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:75e3f4e86804023e991096b29e147e635f5e2568f77883a1e6eed74512659ab0"},
+    {file = "coverage-7.5.3-cp38-cp38-win32.whl", hash = "sha256:c59d2ad092dc0551d9f79d9d44d005c945ba95832a6798f98f9216ede3d5f485"},
+    {file = "coverage-7.5.3-cp38-cp38-win_amd64.whl", hash = "sha256:fa21a04112c59ad54f69d80e376f7f9d0f5f9123ab87ecd18fbb9ec3a2beed56"},
+    {file = "coverage-7.5.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f5102a92855d518b0996eb197772f5ac2a527c0ec617124ad5242a3af5e25f85"},
+    {file = "coverage-7.5.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d1da0a2e3b37b745a2b2a678a4c796462cf753aebf94edcc87dcc6b8641eae31"},
+    {file = "coverage-7.5.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8383a6c8cefba1b7cecc0149415046b6fc38836295bc4c84e820872eb5478b3d"},
+    {file = "coverage-7.5.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9aad68c3f2566dfae84bf46295a79e79d904e1c21ccfc66de88cd446f8686341"},
+    {file = "coverage-7.5.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e079c9ec772fedbade9d7ebc36202a1d9ef7291bc9b3a024ca395c4d52853d7"},
+    {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bde997cac85fcac227b27d4fb2c7608a2c5f6558469b0eb704c5726ae49e1c52"},
+    {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:990fb20b32990b2ce2c5f974c3e738c9358b2735bc05075d50a6f36721b8f303"},
+    {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3d5a67f0da401e105753d474369ab034c7bae51a4c31c77d94030d59e41df5bd"},
+    {file = "coverage-7.5.3-cp39-cp39-win32.whl", hash = "sha256:e08c470c2eb01977d221fd87495b44867a56d4d594f43739a8028f8646a51e0d"},
+    {file = "coverage-7.5.3-cp39-cp39-win_amd64.whl", hash = "sha256:1d2a830ade66d3563bb61d1e3c77c8def97b30ed91e166c67d0632c018f380f0"},
+    {file = "coverage-7.5.3-pp38.pp39.pp310-none-any.whl", hash = "sha256:3538d8fb1ee9bdd2e2692b3b18c22bb1c19ffbefd06880f5ac496e42d7bb3884"},
+    {file = "coverage-7.5.3.tar.gz", hash = "sha256:04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f"},
 ]
 
 [package.extras]
@@ -526,43 +526,43 @@ toml = ["tomli"]
 
 [[package]]
 name = "cryptography"
-version = "42.0.5"
+version = "42.0.7"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cryptography-42.0.5-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:a30596bae9403a342c978fb47d9b0ee277699fa53bbafad14706af51fe543d16"},
-    {file = "cryptography-42.0.5-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:b7ffe927ee6531c78f81aa17e684e2ff617daeba7f189f911065b2ea2d526dec"},
-    {file = "cryptography-42.0.5-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2424ff4c4ac7f6b8177b53c17ed5d8fa74ae5955656867f5a8affaca36a27abb"},
-    {file = "cryptography-42.0.5-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:329906dcc7b20ff3cad13c069a78124ed8247adcac44b10bea1130e36caae0b4"},
-    {file = "cryptography-42.0.5-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:b03c2ae5d2f0fc05f9a2c0c997e1bc18c8229f392234e8a0194f202169ccd278"},
-    {file = "cryptography-42.0.5-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f8837fe1d6ac4a8052a9a8ddab256bc006242696f03368a4009be7ee3075cdb7"},
-    {file = "cryptography-42.0.5-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:0270572b8bd2c833c3981724b8ee9747b3ec96f699a9665470018594301439ee"},
-    {file = "cryptography-42.0.5-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:b8cac287fafc4ad485b8a9b67d0ee80c66bf3574f655d3b97ef2e1082360faf1"},
-    {file = "cryptography-42.0.5-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:16a48c23a62a2f4a285699dba2e4ff2d1cff3115b9df052cdd976a18856d8e3d"},
-    {file = "cryptography-42.0.5-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:2bce03af1ce5a5567ab89bd90d11e7bbdff56b8af3acbbec1faded8f44cb06da"},
-    {file = "cryptography-42.0.5-cp37-abi3-win32.whl", hash = "sha256:b6cd2203306b63e41acdf39aa93b86fb566049aeb6dc489b70e34bcd07adca74"},
-    {file = "cryptography-42.0.5-cp37-abi3-win_amd64.whl", hash = "sha256:98d8dc6d012b82287f2c3d26ce1d2dd130ec200c8679b6213b3c73c08b2b7940"},
-    {file = "cryptography-42.0.5-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:5e6275c09d2badf57aea3afa80d975444f4be8d3bc58f7f80d2a484c6f9485c8"},
-    {file = "cryptography-42.0.5-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4985a790f921508f36f81831817cbc03b102d643b5fcb81cd33df3fa291a1a1"},
-    {file = "cryptography-42.0.5-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7cde5f38e614f55e28d831754e8a3bacf9ace5d1566235e39d91b35502d6936e"},
-    {file = "cryptography-42.0.5-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:7367d7b2eca6513681127ebad53b2582911d1736dc2ffc19f2c3ae49997496bc"},
-    {file = "cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:cd2030f6650c089aeb304cf093f3244d34745ce0cfcc39f20c6fbfe030102e2a"},
-    {file = "cryptography-42.0.5-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:a2913c5375154b6ef2e91c10b5720ea6e21007412f6437504ffea2109b5a33d7"},
-    {file = "cryptography-42.0.5-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:c41fb5e6a5fe9ebcd58ca3abfeb51dffb5d83d6775405305bfa8715b76521922"},
-    {file = "cryptography-42.0.5-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:3eaafe47ec0d0ffcc9349e1708be2aaea4c6dd4978d76bf6eb0cb2c13636c6fc"},
-    {file = "cryptography-42.0.5-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1b95b98b0d2af784078fa69f637135e3c317091b615cd0905f8b8a087e86fa30"},
-    {file = "cryptography-42.0.5-cp39-abi3-win32.whl", hash = "sha256:1f71c10d1e88467126f0efd484bd44bca5e14c664ec2ede64c32f20875c0d413"},
-    {file = "cryptography-42.0.5-cp39-abi3-win_amd64.whl", hash = "sha256:a011a644f6d7d03736214d38832e030d8268bcff4a41f728e6030325fea3e400"},
-    {file = "cryptography-42.0.5-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:9481ffe3cf013b71b2428b905c4f7a9a4f76ec03065b05ff499bb5682a8d9ad8"},
-    {file = "cryptography-42.0.5-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:ba334e6e4b1d92442b75ddacc615c5476d4ad55cc29b15d590cc6b86efa487e2"},
-    {file = "cryptography-42.0.5-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:ba3e4a42397c25b7ff88cdec6e2a16c2be18720f317506ee25210f6d31925f9c"},
-    {file = "cryptography-42.0.5-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:111a0d8553afcf8eb02a4fea6ca4f59d48ddb34497aa8706a6cf536f1a5ec576"},
-    {file = "cryptography-42.0.5-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:cd65d75953847815962c84a4654a84850b2bb4aed3f26fadcc1c13892e1e29f6"},
-    {file = "cryptography-42.0.5-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:e807b3188f9eb0eaa7bbb579b462c5ace579f1cedb28107ce8b48a9f7ad3679e"},
-    {file = "cryptography-42.0.5-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f12764b8fffc7a123f641d7d049d382b73f96a34117e0b637b80643169cec8ac"},
-    {file = "cryptography-42.0.5-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:37dd623507659e08be98eec89323469e8c7b4c1407c85112634ae3dbdb926fdd"},
-    {file = "cryptography-42.0.5.tar.gz", hash = "sha256:6fe07eec95dfd477eb9530aef5bead34fec819b3aaf6c5bd6d20565da607bfe1"},
+    {file = "cryptography-42.0.7-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:a987f840718078212fdf4504d0fd4c6effe34a7e4740378e59d47696e8dfb477"},
+    {file = "cryptography-42.0.7-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:bd13b5e9b543532453de08bcdc3cc7cebec6f9883e886fd20a92f26940fd3e7a"},
+    {file = "cryptography-42.0.7-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a79165431551042cc9d1d90e6145d5d0d3ab0f2d66326c201d9b0e7f5bf43604"},
+    {file = "cryptography-42.0.7-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a47787a5e3649008a1102d3df55424e86606c9bae6fb77ac59afe06d234605f8"},
+    {file = "cryptography-42.0.7-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:02c0eee2d7133bdbbc5e24441258d5d2244beb31da5ed19fbb80315f4bbbff55"},
+    {file = "cryptography-42.0.7-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:5e44507bf8d14b36b8389b226665d597bc0f18ea035d75b4e53c7b1ea84583cc"},
+    {file = "cryptography-42.0.7-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:7f8b25fa616d8b846aef64b15c606bb0828dbc35faf90566eb139aa9cff67af2"},
+    {file = "cryptography-42.0.7-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:93a3209f6bb2b33e725ed08ee0991b92976dfdcf4e8b38646540674fc7508e13"},
+    {file = "cryptography-42.0.7-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:e6b8f1881dac458c34778d0a424ae5769de30544fc678eac51c1c8bb2183e9da"},
+    {file = "cryptography-42.0.7-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:3de9a45d3b2b7d8088c3fbf1ed4395dfeff79d07842217b38df14ef09ce1d8d7"},
+    {file = "cryptography-42.0.7-cp37-abi3-win32.whl", hash = "sha256:789caea816c6704f63f6241a519bfa347f72fbd67ba28d04636b7c6b7da94b0b"},
+    {file = "cryptography-42.0.7-cp37-abi3-win_amd64.whl", hash = "sha256:8cb8ce7c3347fcf9446f201dc30e2d5a3c898d009126010cbd1f443f28b52678"},
+    {file = "cryptography-42.0.7-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:a3a5ac8b56fe37f3125e5b72b61dcde43283e5370827f5233893d461b7360cd4"},
+    {file = "cryptography-42.0.7-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:779245e13b9a6638df14641d029add5dc17edbef6ec915688f3acb9e720a5858"},
+    {file = "cryptography-42.0.7-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0d563795db98b4cd57742a78a288cdbdc9daedac29f2239793071fe114f13785"},
+    {file = "cryptography-42.0.7-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:31adb7d06fe4383226c3e963471f6837742889b3c4caa55aac20ad951bc8ffda"},
+    {file = "cryptography-42.0.7-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:efd0bf5205240182e0f13bcaea41be4fdf5c22c5129fc7ced4a0282ac86998c9"},
+    {file = "cryptography-42.0.7-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:a9bc127cdc4ecf87a5ea22a2556cab6c7eda2923f84e4f3cc588e8470ce4e42e"},
+    {file = "cryptography-42.0.7-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:3577d029bc3f4827dd5bf8bf7710cac13527b470bbf1820a3f394adb38ed7d5f"},
+    {file = "cryptography-42.0.7-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2e47577f9b18723fa294b0ea9a17d5e53a227867a0a4904a1a076d1646d45ca1"},
+    {file = "cryptography-42.0.7-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1a58839984d9cb34c855197043eaae2c187d930ca6d644612843b4fe8513c886"},
+    {file = "cryptography-42.0.7-cp39-abi3-win32.whl", hash = "sha256:e6b79d0adb01aae87e8a44c2b64bc3f3fe59515280e00fb6d57a7267a2583cda"},
+    {file = "cryptography-42.0.7-cp39-abi3-win_amd64.whl", hash = "sha256:16268d46086bb8ad5bf0a2b5544d8a9ed87a0e33f5e77dd3c3301e63d941a83b"},
+    {file = "cryptography-42.0.7-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:2954fccea107026512b15afb4aa664a5640cd0af630e2ee3962f2602693f0c82"},
+    {file = "cryptography-42.0.7-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:362e7197754c231797ec45ee081f3088a27a47c6c01eff2ac83f60f85a50fe60"},
+    {file = "cryptography-42.0.7-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4f698edacf9c9e0371112792558d2f705b5645076cc0aaae02f816a0171770fd"},
+    {file = "cryptography-42.0.7-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:5482e789294854c28237bba77c4c83be698be740e31a3ae5e879ee5444166582"},
+    {file = "cryptography-42.0.7-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e9b2a6309f14c0497f348d08a065d52f3020656f675819fc405fb63bbcd26562"},
+    {file = "cryptography-42.0.7-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d8e3098721b84392ee45af2dd554c947c32cc52f862b6a3ae982dbb90f577f14"},
+    {file = "cryptography-42.0.7-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c65f96dad14f8528a447414125e1fc8feb2ad5a272b8f68477abbcc1ea7d94b9"},
+    {file = "cryptography-42.0.7-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:36017400817987670037fbb0324d71489b6ead6231c9604f8fc1f7d008087c68"},
+    {file = "cryptography-42.0.7.tar.gz", hash = "sha256:ecbfbc00bf55888edda9868a4cf927205de8499e7fabe6c050322298382953f2"},
 ]
 
 [package.dependencies]
@@ -611,6 +611,25 @@ files = [
     {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"},
 ]
 
+[[package]]
+name = "detect-secrets"
+version = "1.5.0"
+description = "Tool for detecting secrets in the codebase"
+optional = false
+python-versions = "*"
+files = [
+    {file = "detect_secrets-1.5.0-py3-none-any.whl", hash = "sha256:e24e7b9b5a35048c313e983f76c4bd09dad89f045ff059e354f9943bf45aa060"},
+    {file = "detect_secrets-1.5.0.tar.gz", hash = "sha256:6bb46dcc553c10df51475641bb30fd69d25645cc12339e46c824c1e0c388898a"},
+]
+
+[package.dependencies]
+pyyaml = "*"
+requests = "*"
+
+[package.extras]
+gibberish = ["gibberish-detector"]
+word-list = ["pyahocorasick"]
+
 [[package]]
 name = "distlib"
 version = "0.3.8"
@@ -900,13 +919,13 @@ email = ["email-validator"]
 
 [[package]]
 name = "freezegun"
-version = "1.5.0"
+version = "1.5.1"
 description = "Let your Python tests travel through time"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "freezegun-1.5.0-py3-none-any.whl", hash = "sha256:ec3f4ba030e34eb6cf7e1e257308aee2c60c3d038ff35996d7475760c9ff3719"},
-    {file = "freezegun-1.5.0.tar.gz", hash = "sha256:200a64359b363aa3653d8aac289584078386c7c3da77339d257e46a01fb5c77c"},
+    {file = "freezegun-1.5.1-py3-none-any.whl", hash = "sha256:bf111d7138a8abe55ab48a71755673dbaa4ab87f4cff5634a4442dfec34c15f1"},
+    {file = "freezegun-1.5.1.tar.gz", hash = "sha256:b29dedfcda6d5e8e083ce71b2b542753ad48cfec44037b3fc79702e2980a89e9"},
 ]
 
 [package.dependencies]
@@ -1278,7 +1297,6 @@ files = [
     {file = "lxml-5.2.1-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c38d7b9a690b090de999835f0443d8aa93ce5f2064035dfc48f27f02b4afc3d0"},
     {file = "lxml-5.2.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5670fb70a828663cc37552a2a85bf2ac38475572b0e9b91283dc09efb52c41d1"},
     {file = "lxml-5.2.1-cp36-cp36m-manylinux_2_28_x86_64.whl", hash = "sha256:958244ad566c3ffc385f47dddde4145088a0ab893504b54b52c041987a8c1863"},
-    {file = "lxml-5.2.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b6241d4eee5f89453307c2f2bfa03b50362052ca0af1efecf9fef9a41a22bb4f"},
     {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:2a66bf12fbd4666dd023b6f51223aed3d9f3b40fef06ce404cb75bafd3d89536"},
     {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:9123716666e25b7b71c4e1789ec829ed18663152008b58544d95b008ed9e21e9"},
     {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:0c3f67e2aeda739d1cc0b1102c9a9129f7dc83901226cc24dd72ba275ced4218"},
@@ -1595,7 +1613,6 @@ files = [
     {file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5fbb160554e319f7b22ecf530a80a3ff496d38e8e07ae763b9e82fadfe96f273"},
     {file = "msgpack-1.0.8-cp39-cp39-win32.whl", hash = "sha256:f9af38a89b6a5c04b7d18c492c8ccf2aee7048aff1ce8437c4683bb5a1df893d"},
     {file = "msgpack-1.0.8-cp39-cp39-win_amd64.whl", hash = "sha256:ed59dd52075f8fc91da6053b12e8c89e37aa043f8986efd89e61fae69dc1b011"},
-    {file = "msgpack-1.0.8-py3-none-any.whl", hash = "sha256:24f727df1e20b9876fa6e95f840a2a2651e34c0ad147676356f4bf5fbb0206ca"},
     {file = "msgpack-1.0.8.tar.gz", hash = "sha256:95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3"},
 ]
 
@@ -1612,40 +1629,40 @@ files = [
 
 [[package]]
 name = "newrelic"
-version = "9.9.0"
+version = "9.10.0"
 description = "New Relic Python Agent"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
 files = [
-    {file = "newrelic-9.9.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:db32fa04d69bbb742401c124a6cec158e6237a21af4602dbf53e4630ea9dd068"},
-    {file = "newrelic-9.9.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:9dbf35914d0bbf1294d8eb6fa5357d072238c6c722726c2ee20b9c1e35b8253d"},
-    {file = "newrelic-9.9.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e6cb86aa2f7230ee9dcb5f9f8821c7090566419def5537a44240f978b680c4f7"},
-    {file = "newrelic-9.9.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:a91dea75f8c202a6a553339a1997983224465555a3f8d7294b24de1e2bee5f05"},
-    {file = "newrelic-9.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dac3b74bd801513e8221f05a01a294405eda7f4922fce5b174e5e33c222ae09d"},
-    {file = "newrelic-9.9.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a257995d832858cf7c56bcfb1911f3379f9d3e795d7357f56f035f1b60339ea0"},
-    {file = "newrelic-9.9.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:04cd3fc7087513a4786908a9b0a7475db154c888ac9d2de251f8abb93353a4a7"},
-    {file = "newrelic-9.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:26713f779cf23bb29c6b408436167059d0c8ee1475810dc1b0efe858fe578f25"},
-    {file = "newrelic-9.9.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf3c13d264cd089d467e9848fb6875907940202d22475b506a70683f04ef82af"},
-    {file = "newrelic-9.9.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a57ff176818037983589c15b6dca03841fcef1429c279f5948800caa333fb476"},
-    {file = "newrelic-9.9.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:63b230dd5d093874c0137eddc738cb028e17326d2a8a98cbc12c665bbdf6ec67"},
-    {file = "newrelic-9.9.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4cf5d85a4a8e8de6e0aeb7a76afad9264d0c0dc459bc3f1a8b02a0e48a9a26da"},
-    {file = "newrelic-9.9.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de2ac509f8730fc6f6819f13a9ebbe52865397d526ca4dbe963a0e9865bb0500"},
-    {file = "newrelic-9.9.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8304317ff27bb50fd94f1e6e8c3ae0c59151ee85de2ea0269dbe7e982512c45"},
-    {file = "newrelic-9.9.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b773ee74d869bf632ce1e12903cc8e7ae8b5697ef9ae97169ed263a5d3a87f76"},
-    {file = "newrelic-9.9.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4356690cbc9e5e662defa2af15aba05901cf9b285a8d02aeb90718e84dd6d779"},
-    {file = "newrelic-9.9.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4e12ead3602ca2c188528fde444f8ab953b504b095d70265303bbf132908eb7"},
-    {file = "newrelic-9.9.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b64a61f2f228b70f91c06a0bd82e2645c6b75ddbd50587f94a67c89ef6d5d854"},
-    {file = "newrelic-9.9.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b60f66132a42ec8c67fd26b8082cc3a0626192283dc9b5716a66203a58f10d30"},
-    {file = "newrelic-9.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:834ce8de7550bc444aed6c2afc1436c04485998e46f429e41b89d66ab85f0fbb"},
-    {file = "newrelic-9.9.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:57451807f600331a94ad1ec66e3981523b0516d5b2dd9fd078e7f3d6c9228913"},
-    {file = "newrelic-9.9.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f48898e268dcaa14aa1b6d5c8b8d10f3f4396589a37be10a06bb5ba262ef0541"},
-    {file = "newrelic-9.9.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2ffcbdb706de1bbaa36acd0c9b487a08895a420020bcf775be2d80c7df29b56c"},
-    {file = "newrelic-9.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5b40155f9712e75c00d03cdec8272f6cf8eaa05ea2ed22bb5ecc96ed86017b47"},
-    {file = "newrelic-9.9.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:47efe8fc4dc14b0f265d635639f94ef5a071b5e5ebbf41ecf0946fce071c49e6"},
-    {file = "newrelic-9.9.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df6198259dae01212b39079add58e0ef7311cf01734adea51fec4d2f7a9fafec"},
-    {file = "newrelic-9.9.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f0d8c8f66aba3629f0f17a1d2314beb2984ad7c485dd318ef2d5f257c040981d"},
-    {file = "newrelic-9.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1743df0e72bf559b61112763a71c35e5d456a509ba4dde2bdbaa88d894f1812a"},
-    {file = "newrelic-9.9.0.tar.gz", hash = "sha256:2182673a01f04a0ed4a0bb3f49e8fa869044c37558c8f409c96de13105f58a57"},
+    {file = "newrelic-9.10.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:a4d4e5670082225ca7ef0ee986ef8e6588f4e530a05d43d66f9368459c0b1f18"},
+    {file = "newrelic-9.10.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:f4605bc4feb114235e242dfe260b75ec85d0894f5400aa7f30e75fbbc0423b3f"},
+    {file = "newrelic-9.10.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d3be6c97d007ceb142f908f5ab2444807b44dc600a0b7f3254dc685b5b03fd10"},
+    {file = "newrelic-9.10.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:4e573d49c1543a488d6567906a9b2cb0c748cdbf80724c322b06874f8e47c789"},
+    {file = "newrelic-9.10.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ae0515f7ab19f1a5dd14e31506420d1b86014c5e1340c2a210833248bc765dae"},
+    {file = "newrelic-9.10.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:acf5cdcafd2971933ad2f9e836284957f4a3eababe88f063cf53b1b1f67f1a16"},
+    {file = "newrelic-9.10.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5d18236bf4a80fca4eb1db03448ed72bf8e16b84b3a4ed5fcc29bb91c2d05d54"},
+    {file = "newrelic-9.10.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:744c815f15ec06e441c11a6c57042d2eca8c41401c11de6f47b3e105d952b9bd"},
+    {file = "newrelic-9.10.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:524ed5bfa09d330746b45e0087765da994ca34802cce032063041e404e58414c"},
+    {file = "newrelic-9.10.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8ad9cd5459b8c620ab7a876bd5d920c3ef2943948d1262a42289d4f8d16dadab"},
+    {file = "newrelic-9.10.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:4404c649b5e6165dcdd59091092c19b292a43cc96520d5ffd718b628fb866096"},
+    {file = "newrelic-9.10.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e2576bbec0b640d9b76454dcfd5b2f03078e0bb062a7ea3952a8db7b9972c352"},
+    {file = "newrelic-9.10.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77537a020ce84033f39210e46cc43bb3927cec3fb4b34b5c4df802e96fddaedf"},
+    {file = "newrelic-9.10.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2236f70b8c6aa79635f2175e7315d032f3a80dfd65ad9c9ed12a921f5df4c655"},
+    {file = "newrelic-9.10.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b8201a33caf7632b2e55e3f9687584ad6956aaf5751485cdb2bad7c428a9b400"},
+    {file = "newrelic-9.10.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:6ed4bc2c9a44dfe59958eeecf1f327f0a0fb6324b5e609515bc511944d12db74"},
+    {file = "newrelic-9.10.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1cc3ddb26c0615ba4e18f87453bca57f0688a43d2fcdd50e2771a77515cfc3ba"},
+    {file = "newrelic-9.10.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:09912303e04bee6aa1fe1c671e87b4e8e55461081a96210895828798f5ba8c3f"},
+    {file = "newrelic-9.10.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:40368dca0d423efe40b210686d7018787d4365a24ee1deca136b3b7c9d850325"},
+    {file = "newrelic-9.10.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:56f4c309a07a2c66243b12d18056c32aa704735469741495642c31be4a1c77fa"},
+    {file = "newrelic-9.10.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4d68fc707d896dc7da8d6939bcc1f995bf9e463c2b911fc63250a10e1502a234"},
+    {file = "newrelic-9.10.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7cd462804a6ede617fb3b4b126e9083b3ee8b4ed1250f7cc12299ebacb785432"},
+    {file = "newrelic-9.10.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ceef4fef2a5cffb69e9e1742bd18a35625ca62c3856c7016c22be68ec876753d"},
+    {file = "newrelic-9.10.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:1f11d9c17b50982fcc39de71f6592a61920ec5e5c29b9105edc9f8fb7f2480b9"},
+    {file = "newrelic-9.10.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf6757d422954e61082715dbba4208cae17bf3720006bc337c3f87f19ede2876"},
+    {file = "newrelic-9.10.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ae84bacfdc60792bd04e681027cc5c58e6737a04c652e9be2eda84abe21f57f5"},
+    {file = "newrelic-9.10.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:667722cf1f4ed9f6cd99f4fbe247fc2bdb941935528e14a93659ba2c651dc889"},
+    {file = "newrelic-9.10.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d0c18210648889416da3de61aa282248e012cb507ba9841511407f922fff9a52"},
+    {file = "newrelic-9.10.0.tar.gz", hash = "sha256:02db25b0fd2fc835efe4a7f1c92dbc5bbb95125341aba07152041aa6a5666cda"},
 ]
 
 [package.extras]
@@ -1667,12 +1684,12 @@ setuptools = "*"
 
 [[package]]
 name = "notifications-python-client"
-version = "9.0.0"
+version = "9.1.0"
 description = "Python API client for GOV.UK Notify."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "notifications_python_client-9.0.0-py3-none-any.whl", hash = "sha256:664a5b5da2aa1a00efa8106bfa4855db04da95d79586e5edfb0411637d20d2d9"},
+    {file = "notifications_python_client-9.1.0-py3-none-any.whl", hash = "sha256:43b8f738dfa81ae3aa656d91e361dbc51316194f8b9a430706b03347fa7a01bc"},
 ]
 
 [package.dependencies]
@@ -1680,62 +1697,6 @@ docopt = ">=0.3.0"
 PyJWT = ">=1.5.1"
 requests = ">=2.0.0"
 
-[[package]]
-name = "notifications-utils"
-version = "0.5.1"
-description = ""
-optional = false
-python-versions = "^3.12.2"
-files = []
-develop = false
-
-[package.dependencies]
-async-timeout = "^4.0.2"
-bleach = "^6.1.0"
-blinker = "^1.7.0"
-boto3 = "^1.34.83"
-botocore = "^1.34.92"
-cachetools = "^5.3.0"
-certifi = "^2024.2.2"
-cffi = "^1.16.0"
-charset-normalizer = "^3.1.0"
-click = "^8.1.7"
-cryptography = "^42.0.4"
-flask = "^3.0.3"
-flask-redis = "^0.4.0"
-geojson = "^3.0.1"
-govuk-bank-holidays = "^0.14"
-idna = "^3.7"
-itsdangerous = "^2.1.2"
-jinja2 = "^3.1.3"
-jmespath = "^1.0.1"
-markupsafe = "^2.1.5"
-mistune = "==0.8.4"
-numpy = "^1.24.2"
-ordered-set = "^4.1.0"
-phonenumbers = "^8.13.35"
-pycparser = "^2.21"
-python-dateutil = "^2.8.2"
-python-json-logger = "^2.0.7"
-pytz = "^2024.1"
-pyyaml = "^6.0"
-redis = "^5.0.3"
-regex = "^2023.12.25"
-requests = "^2.31.0"
-s3transfer = "^0.10.1"
-shapely = "^2.0.4"
-six = "^1.16.0"
-smartypants = "^2.0.1"
-urllib3 = "^2.2.1"
-webencodings = "^0.5.1"
-werkzeug = "^3.0.1"
-
-[package.source]
-type = "git"
-url = "https://github.com/GSA/notifications-utils.git"
-reference = "HEAD"
-resolved_reference = "e047ba3e37f9fd885baafe6944a4910285a506fb"
-
 [[package]]
 name = "numpy"
 version = "1.26.4"
@@ -1861,13 +1822,13 @@ files = [
 
 [[package]]
 name = "phonenumbers"
-version = "8.13.35"
+version = "8.13.37"
 description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers."
 optional = false
 python-versions = "*"
 files = [
-    {file = "phonenumbers-8.13.35-py2.py3-none-any.whl", hash = "sha256:58286a8e617bd75f541e04313b28c36398be6d4443a778c85e9617a93c391310"},
-    {file = "phonenumbers-8.13.35.tar.gz", hash = "sha256:64f061a967dcdae11e1c59f3688649e697b897110a33bb74d5a69c3e35321245"},
+    {file = "phonenumbers-8.13.37-py2.py3-none-any.whl", hash = "sha256:4ea00ef5012422c08c7955c21131e7ae5baa9a3ef52cf2d561e963f023006b80"},
+    {file = "phonenumbers-8.13.37.tar.gz", hash = "sha256:bd315fed159aea0516f7c367231810fe8344d5bec26156b88fa18374c11d1cf2"},
 ]
 
 [[package]]
@@ -1995,13 +1956,13 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "3.7.0"
+version = "3.7.1"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 optional = false
 python-versions = ">=3.9"
 files = [
-    {file = "pre_commit-3.7.0-py2.py3-none-any.whl", hash = "sha256:5eae9e10c2b5ac51577c3452ec0a490455c45a0533f7960f993a0d01e59decab"},
-    {file = "pre_commit-3.7.0.tar.gz", hash = "sha256:e209d61b8acdcf742404408531f0c37d49d2c734fd7cff2d6076083d191cb060"},
+    {file = "pre_commit-3.7.1-py2.py3-none-any.whl", hash = "sha256:fae36fd1d7ad7d6a5a1c0b0d5adb2ed1a3bda5a21bf6c3e5372073d7a11cd4c5"},
+    {file = "pre_commit-3.7.1.tar.gz", hash = "sha256:8ca3ad567bc78a4972a3f1a477e94a79d4597e8140a6e0b651c5e33899c3654a"},
 ]
 
 [package.dependencies]
@@ -2264,13 +2225,13 @@ certifi = "*"
 
 [[package]]
 name = "pytest"
-version = "8.2.0"
+version = "8.2.1"
 description = "pytest: simple powerful testing with Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pytest-8.2.0-py3-none-any.whl", hash = "sha256:1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233"},
-    {file = "pytest-8.2.0.tar.gz", hash = "sha256:d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f"},
+    {file = "pytest-8.2.1-py3-none-any.whl", hash = "sha256:faccc5d332b8c3719f40283d0d44aa5cf101cec36f88cde9ed8f2bc0538612b1"},
+    {file = "pytest-8.2.1.tar.gz", hash = "sha256:5046e5b46d8e4cac199c373041f26be56fdb81eb4e67dc11d4e10811fc3408fd"},
 ]
 
 [package.dependencies]
@@ -2532,115 +2493,101 @@ ocsp = ["cryptography (>=36.0.1)", "pyopenssl (==20.0.1)", "requests (>=2.26.0)"
 
 [[package]]
 name = "regex"
-version = "2023.12.25"
+version = "2024.5.15"
 description = "Alternative regular expression module, to replace re."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0694219a1d54336fd0445ea382d49d36882415c0134ee1e8332afd1529f0baa5"},
-    {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b014333bd0217ad3d54c143de9d4b9a3ca1c5a29a6d0d554952ea071cff0f1f8"},
-    {file = "regex-2023.12.25-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d865984b3f71f6d0af64d0d88f5733521698f6c16f445bb09ce746c92c97c586"},
-    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e0eabac536b4cc7f57a5f3d095bfa557860ab912f25965e08fe1545e2ed8b4c"},
-    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c25a8ad70e716f96e13a637802813f65d8a6760ef48672aa3502f4c24ea8b400"},
-    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9b6d73353f777630626f403b0652055ebfe8ff142a44ec2cf18ae470395766e"},
-    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9cc99d6946d750eb75827cb53c4371b8b0fe89c733a94b1573c9dd16ea6c9e4"},
-    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88d1f7bef20c721359d8675f7d9f8e414ec5003d8f642fdfd8087777ff7f94b5"},
-    {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cb3fe77aec8f1995611f966d0c656fdce398317f850d0e6e7aebdfe61f40e1cd"},
-    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7aa47c2e9ea33a4a2a05f40fcd3ea36d73853a2aae7b4feab6fc85f8bf2c9704"},
-    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:df26481f0c7a3f8739fecb3e81bc9da3fcfae34d6c094563b9d4670b047312e1"},
-    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c40281f7d70baf6e0db0c2f7472b31609f5bc2748fe7275ea65a0b4601d9b392"},
-    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d94a1db462d5690ebf6ae86d11c5e420042b9898af5dcf278bd97d6bda065423"},
-    {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ba1b30765a55acf15dce3f364e4928b80858fa8f979ad41f862358939bdd1f2f"},
-    {file = "regex-2023.12.25-cp310-cp310-win32.whl", hash = "sha256:150c39f5b964e4d7dba46a7962a088fbc91f06e606f023ce57bb347a3b2d4630"},
-    {file = "regex-2023.12.25-cp310-cp310-win_amd64.whl", hash = "sha256:09da66917262d9481c719599116c7dc0c321ffcec4b1f510c4f8a066f8768105"},
-    {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:1b9d811f72210fa9306aeb88385b8f8bcef0dfbf3873410413c00aa94c56c2b6"},
-    {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d902a43085a308cef32c0d3aea962524b725403fd9373dea18110904003bac97"},
-    {file = "regex-2023.12.25-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d166eafc19f4718df38887b2bbe1467a4f74a9830e8605089ea7a30dd4da8887"},
-    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7ad32824b7f02bb3c9f80306d405a1d9b7bb89362d68b3c5a9be53836caebdb"},
-    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:636ba0a77de609d6510235b7f0e77ec494d2657108f777e8765efc060094c98c"},
-    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0fda75704357805eb953a3ee15a2b240694a9a514548cd49b3c5124b4e2ad01b"},
-    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f72cbae7f6b01591f90814250e636065850c5926751af02bb48da94dfced7baa"},
-    {file = "regex-2023.12.25-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db2a0b1857f18b11e3b0e54ddfefc96af46b0896fb678c85f63fb8c37518b3e7"},
-    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7502534e55c7c36c0978c91ba6f61703faf7ce733715ca48f499d3dbbd7657e0"},
-    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e8c7e08bb566de4faaf11984af13f6bcf6a08f327b13631d41d62592681d24fe"},
-    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:283fc8eed679758de38fe493b7d7d84a198b558942b03f017b1f94dda8efae80"},
-    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f44dd4d68697559d007462b0a3a1d9acd61d97072b71f6d1968daef26bc744bd"},
-    {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:67d3ccfc590e5e7197750fcb3a2915b416a53e2de847a728cfa60141054123d4"},
-    {file = "regex-2023.12.25-cp311-cp311-win32.whl", hash = "sha256:68191f80a9bad283432385961d9efe09d783bcd36ed35a60fb1ff3f1ec2efe87"},
-    {file = "regex-2023.12.25-cp311-cp311-win_amd64.whl", hash = "sha256:7d2af3f6b8419661a0c421584cfe8aaec1c0e435ce7e47ee2a97e344b98f794f"},
-    {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8a0ccf52bb37d1a700375a6b395bff5dd15c50acb745f7db30415bae3c2b0715"},
-    {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c3c4a78615b7762740531c27cf46e2f388d8d727d0c0c739e72048beb26c8a9d"},
-    {file = "regex-2023.12.25-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ad83e7545b4ab69216cef4cc47e344d19622e28aabec61574b20257c65466d6a"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7a635871143661feccce3979e1727c4e094f2bdfd3ec4b90dfd4f16f571a87a"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d498eea3f581fbe1b34b59c697512a8baef88212f92e4c7830fcc1499f5b45a5"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:43f7cd5754d02a56ae4ebb91b33461dc67be8e3e0153f593c509e21d219c5060"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51f4b32f793812714fd5307222a7f77e739b9bc566dc94a18126aba3b92b98a3"},
-    {file = "regex-2023.12.25-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba99d8077424501b9616b43a2d208095746fb1284fc5ba490139651f971d39d9"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4bfc2b16e3ba8850e0e262467275dd4d62f0d045e0e9eda2bc65078c0110a11f"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8c2c19dae8a3eb0ea45a8448356ed561be843b13cbc34b840922ddf565498c1c"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:60080bb3d8617d96f0fb7e19796384cc2467447ef1c491694850ebd3670bc457"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b77e27b79448e34c2c51c09836033056a0547aa360c45eeeb67803da7b0eedaf"},
-    {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:518440c991f514331f4850a63560321f833979d145d7d81186dbe2f19e27ae3d"},
-    {file = "regex-2023.12.25-cp312-cp312-win32.whl", hash = "sha256:e2610e9406d3b0073636a3a2e80db05a02f0c3169b5632022b4e81c0364bcda5"},
-    {file = "regex-2023.12.25-cp312-cp312-win_amd64.whl", hash = "sha256:cc37b9aeebab425f11f27e5e9e6cf580be7206c6582a64467a14dda211abc232"},
-    {file = "regex-2023.12.25-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:da695d75ac97cb1cd725adac136d25ca687da4536154cdc2815f576e4da11c69"},
-    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d126361607b33c4eb7b36debc173bf25d7805847346dd4d99b5499e1fef52bc7"},
-    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4719bb05094d7d8563a450cf8738d2e1061420f79cfcc1fa7f0a44744c4d8f73"},
-    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5dd58946bce44b53b06d94aa95560d0b243eb2fe64227cba50017a8d8b3cd3e2"},
-    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22a86d9fff2009302c440b9d799ef2fe322416d2d58fc124b926aa89365ec482"},
-    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2aae8101919e8aa05ecfe6322b278f41ce2994c4a430303c4cd163fef746e04f"},
-    {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e692296c4cc2873967771345a876bcfc1c547e8dd695c6b89342488b0ea55cd8"},
-    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:263ef5cc10979837f243950637fffb06e8daed7f1ac1e39d5910fd29929e489a"},
-    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:d6f7e255e5fa94642a0724e35406e6cb7001c09d476ab5fce002f652b36d0c39"},
-    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:88ad44e220e22b63b0f8f81f007e8abbb92874d8ced66f32571ef8beb0643b2b"},
-    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:3a17d3ede18f9cedcbe23d2daa8a2cd6f59fe2bf082c567e43083bba3fb00347"},
-    {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d15b274f9e15b1a0b7a45d2ac86d1f634d983ca40d6b886721626c47a400bf39"},
-    {file = "regex-2023.12.25-cp37-cp37m-win32.whl", hash = "sha256:ed19b3a05ae0c97dd8f75a5d8f21f7723a8c33bbc555da6bbe1f96c470139d3c"},
-    {file = "regex-2023.12.25-cp37-cp37m-win_amd64.whl", hash = "sha256:a6d1047952c0b8104a1d371f88f4ab62e6275567d4458c1e26e9627ad489b445"},
-    {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b43523d7bc2abd757119dbfb38af91b5735eea45537ec6ec3a5ec3f9562a1c53"},
-    {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:efb2d82f33b2212898f1659fb1c2e9ac30493ac41e4d53123da374c3b5541e64"},
-    {file = "regex-2023.12.25-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b7fca9205b59c1a3d5031f7e64ed627a1074730a51c2a80e97653e3e9fa0d415"},
-    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:086dd15e9435b393ae06f96ab69ab2d333f5d65cbe65ca5a3ef0ec9564dfe770"},
-    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e81469f7d01efed9b53740aedd26085f20d49da65f9c1f41e822a33992cb1590"},
-    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:34e4af5b27232f68042aa40a91c3b9bb4da0eeb31b7632e0091afc4310afe6cb"},
-    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9852b76ab558e45b20bf1893b59af64a28bd3820b0c2efc80e0a70a4a3ea51c1"},
-    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ff100b203092af77d1a5a7abe085b3506b7eaaf9abf65b73b7d6905b6cb76988"},
-    {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cc038b2d8b1470364b1888a98fd22d616fba2b6309c5b5f181ad4483e0017861"},
-    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:094ba386bb5c01e54e14434d4caabf6583334090865b23ef58e0424a6286d3dc"},
-    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5cd05d0f57846d8ba4b71d9c00f6f37d6b97d5e5ef8b3c3840426a475c8f70f4"},
-    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:9aa1a67bbf0f957bbe096375887b2505f5d8ae16bf04488e8b0f334c36e31360"},
-    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:98a2636994f943b871786c9e82bfe7883ecdaba2ef5df54e1450fa9869d1f756"},
-    {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:37f8e93a81fc5e5bd8db7e10e62dc64261bcd88f8d7e6640aaebe9bc180d9ce2"},
-    {file = "regex-2023.12.25-cp38-cp38-win32.whl", hash = "sha256:d78bd484930c1da2b9679290a41cdb25cc127d783768a0369d6b449e72f88beb"},
-    {file = "regex-2023.12.25-cp38-cp38-win_amd64.whl", hash = "sha256:b521dcecebc5b978b447f0f69b5b7f3840eac454862270406a39837ffae4e697"},
-    {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f7bc09bc9c29ebead055bcba136a67378f03d66bf359e87d0f7c759d6d4ffa31"},
-    {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e14b73607d6231f3cc4622809c196b540a6a44e903bcfad940779c80dffa7be7"},
-    {file = "regex-2023.12.25-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9eda5f7a50141291beda3edd00abc2d4a5b16c29c92daf8d5bd76934150f3edc"},
-    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc6bb9aa69aacf0f6032c307da718f61a40cf970849e471254e0e91c56ffca95"},
-    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:298dc6354d414bc921581be85695d18912bea163a8b23cac9a2562bbcd5088b1"},
-    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2f4e475a80ecbd15896a976aa0b386c5525d0ed34d5c600b6d3ebac0a67c7ddf"},
-    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:531ac6cf22b53e0696f8e1d56ce2396311254eb806111ddd3922c9d937151dae"},
-    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22f3470f7524b6da61e2020672df2f3063676aff444db1daa283c2ea4ed259d6"},
-    {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:89723d2112697feaa320c9d351e5f5e7b841e83f8b143dba8e2d2b5f04e10923"},
-    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0ecf44ddf9171cd7566ef1768047f6e66975788258b1c6c6ca78098b95cf9a3d"},
-    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:905466ad1702ed4acfd67a902af50b8db1feeb9781436372261808df7a2a7bca"},
-    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:4558410b7a5607a645e9804a3e9dd509af12fb72b9825b13791a37cd417d73a5"},
-    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:7e316026cc1095f2a3e8cc012822c99f413b702eaa2ca5408a513609488cb62f"},
-    {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3b1de218d5375cd6ac4b5493e0b9f3df2be331e86520f23382f216c137913d20"},
-    {file = "regex-2023.12.25-cp39-cp39-win32.whl", hash = "sha256:11a963f8e25ab5c61348d090bf1b07f1953929c13bd2309a0662e9ff680763c9"},
-    {file = "regex-2023.12.25-cp39-cp39-win_amd64.whl", hash = "sha256:e693e233ac92ba83a87024e1d32b5f9ab15ca55ddd916d878146f4e3406b5c91"},
-    {file = "regex-2023.12.25.tar.gz", hash = "sha256:29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5"},
+    {file = "regex-2024.5.15-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a81e3cfbae20378d75185171587cbf756015ccb14840702944f014e0d93ea09f"},
+    {file = "regex-2024.5.15-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7b59138b219ffa8979013be7bc85bb60c6f7b7575df3d56dc1e403a438c7a3f6"},
+    {file = "regex-2024.5.15-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a0bd000c6e266927cb7a1bc39d55be95c4b4f65c5be53e659537537e019232b1"},
+    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5eaa7ddaf517aa095fa8da0b5015c44d03da83f5bd49c87961e3c997daed0de7"},
+    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba68168daedb2c0bab7fd7e00ced5ba90aebf91024dea3c88ad5063c2a562cca"},
+    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6e8d717bca3a6e2064fc3a08df5cbe366369f4b052dcd21b7416e6d71620dca1"},
+    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1337b7dbef9b2f71121cdbf1e97e40de33ff114801263b275aafd75303bd62b5"},
+    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f9ebd0a36102fcad2f03696e8af4ae682793a5d30b46c647eaf280d6cfb32796"},
+    {file = "regex-2024.5.15-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9efa1a32ad3a3ea112224897cdaeb6aa00381627f567179c0314f7b65d354c62"},
+    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:1595f2d10dff3d805e054ebdc41c124753631b6a471b976963c7b28543cf13b0"},
+    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:b802512f3e1f480f41ab5f2cfc0e2f761f08a1f41092d6718868082fc0d27143"},
+    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:a0981022dccabca811e8171f913de05720590c915b033b7e601f35ce4ea7019f"},
+    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:19068a6a79cf99a19ccefa44610491e9ca02c2be3305c7760d3831d38a467a6f"},
+    {file = "regex-2024.5.15-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:1b5269484f6126eee5e687785e83c6b60aad7663dafe842b34691157e5083e53"},
+    {file = "regex-2024.5.15-cp310-cp310-win32.whl", hash = "sha256:ada150c5adfa8fbcbf321c30c751dc67d2f12f15bd183ffe4ec7cde351d945b3"},
+    {file = "regex-2024.5.15-cp310-cp310-win_amd64.whl", hash = "sha256:ac394ff680fc46b97487941f5e6ae49a9f30ea41c6c6804832063f14b2a5a145"},
+    {file = "regex-2024.5.15-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f5b1dff3ad008dccf18e652283f5e5339d70bf8ba7c98bf848ac33db10f7bc7a"},
+    {file = "regex-2024.5.15-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c6a2b494a76983df8e3d3feea9b9ffdd558b247e60b92f877f93a1ff43d26656"},
+    {file = "regex-2024.5.15-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a32b96f15c8ab2e7d27655969a23895eb799de3665fa94349f3b2fbfd547236f"},
+    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10002e86e6068d9e1c91eae8295ef690f02f913c57db120b58fdd35a6bb1af35"},
+    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ec54d5afa89c19c6dd8541a133be51ee1017a38b412b1321ccb8d6ddbeb4cf7d"},
+    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:10e4ce0dca9ae7a66e6089bb29355d4432caed736acae36fef0fdd7879f0b0cb"},
+    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e507ff1e74373c4d3038195fdd2af30d297b4f0950eeda6f515ae3d84a1770f"},
+    {file = "regex-2024.5.15-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d1f059a4d795e646e1c37665b9d06062c62d0e8cc3c511fe01315973a6542e40"},
+    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0721931ad5fe0dda45d07f9820b90b2148ccdd8e45bb9e9b42a146cb4f695649"},
+    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:833616ddc75ad595dee848ad984d067f2f31be645d603e4d158bba656bbf516c"},
+    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:287eb7f54fc81546346207c533ad3c2c51a8d61075127d7f6d79aaf96cdee890"},
+    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:19dfb1c504781a136a80ecd1fff9f16dddf5bb43cec6871778c8a907a085bb3d"},
+    {file = "regex-2024.5.15-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:119af6e56dce35e8dfb5222573b50c89e5508d94d55713c75126b753f834de68"},
+    {file = "regex-2024.5.15-cp311-cp311-win32.whl", hash = "sha256:1c1c174d6ec38d6c8a7504087358ce9213d4332f6293a94fbf5249992ba54efa"},
+    {file = "regex-2024.5.15-cp311-cp311-win_amd64.whl", hash = "sha256:9e717956dcfd656f5055cc70996ee2cc82ac5149517fc8e1b60261b907740201"},
+    {file = "regex-2024.5.15-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:632b01153e5248c134007209b5c6348a544ce96c46005d8456de1d552455b014"},
+    {file = "regex-2024.5.15-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e64198f6b856d48192bf921421fdd8ad8eb35e179086e99e99f711957ffedd6e"},
+    {file = "regex-2024.5.15-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:68811ab14087b2f6e0fc0c2bae9ad689ea3584cad6917fc57be6a48bbd012c49"},
+    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8ec0c2fea1e886a19c3bee0cd19d862b3aa75dcdfb42ebe8ed30708df64687a"},
+    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d0c0c0003c10f54a591d220997dd27d953cd9ccc1a7294b40a4be5312be8797b"},
+    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2431b9e263af1953c55abbd3e2efca67ca80a3de8a0437cb58e2421f8184717a"},
+    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a605586358893b483976cffc1723fb0f83e526e8f14c6e6614e75919d9862cf"},
+    {file = "regex-2024.5.15-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:391d7f7f1e409d192dba8bcd42d3e4cf9e598f3979cdaed6ab11288da88cb9f2"},
+    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9ff11639a8d98969c863d4617595eb5425fd12f7c5ef6621a4b74b71ed8726d5"},
+    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:4eee78a04e6c67e8391edd4dad3279828dd66ac4b79570ec998e2155d2e59fd5"},
+    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:8fe45aa3f4aa57faabbc9cb46a93363edd6197cbc43523daea044e9ff2fea83e"},
+    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:d0a3d8d6acf0c78a1fff0e210d224b821081330b8524e3e2bc5a68ef6ab5803d"},
+    {file = "regex-2024.5.15-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c486b4106066d502495b3025a0a7251bf37ea9540433940a23419461ab9f2a80"},
+    {file = "regex-2024.5.15-cp312-cp312-win32.whl", hash = "sha256:c49e15eac7c149f3670b3e27f1f28a2c1ddeccd3a2812cba953e01be2ab9b5fe"},
+    {file = "regex-2024.5.15-cp312-cp312-win_amd64.whl", hash = "sha256:673b5a6da4557b975c6c90198588181029c60793835ce02f497ea817ff647cb2"},
+    {file = "regex-2024.5.15-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:87e2a9c29e672fc65523fb47a90d429b70ef72b901b4e4b1bd42387caf0d6835"},
+    {file = "regex-2024.5.15-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c3bea0ba8b73b71b37ac833a7f3fd53825924165da6a924aec78c13032f20850"},
+    {file = "regex-2024.5.15-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:bfc4f82cabe54f1e7f206fd3d30fda143f84a63fe7d64a81558d6e5f2e5aaba9"},
+    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5bb9425fe881d578aeca0b2b4b3d314ec88738706f66f219c194d67179337cb"},
+    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:64c65783e96e563103d641760664125e91bd85d8e49566ee560ded4da0d3e704"},
+    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cf2430df4148b08fb4324b848672514b1385ae3807651f3567871f130a728cc3"},
+    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5397de3219a8b08ae9540c48f602996aa6b0b65d5a61683e233af8605c42b0f2"},
+    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:455705d34b4154a80ead722f4f185b04c4237e8e8e33f265cd0798d0e44825fa"},
+    {file = "regex-2024.5.15-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2b6f1b3bb6f640c1a92be3bbfbcb18657b125b99ecf141fb3310b5282c7d4ed"},
+    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:3ad070b823ca5890cab606c940522d05d3d22395d432f4aaaf9d5b1653e47ced"},
+    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:5b5467acbfc153847d5adb21e21e29847bcb5870e65c94c9206d20eb4e99a384"},
+    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:e6662686aeb633ad65be2a42b4cb00178b3fbf7b91878f9446075c404ada552f"},
+    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:2b4c884767504c0e2401babe8b5b7aea9148680d2e157fa28f01529d1f7fcf67"},
+    {file = "regex-2024.5.15-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:3cd7874d57f13bf70078f1ff02b8b0aa48d5b9ed25fc48547516c6aba36f5741"},
+    {file = "regex-2024.5.15-cp38-cp38-win32.whl", hash = "sha256:e4682f5ba31f475d58884045c1a97a860a007d44938c4c0895f41d64481edbc9"},
+    {file = "regex-2024.5.15-cp38-cp38-win_amd64.whl", hash = "sha256:d99ceffa25ac45d150e30bd9ed14ec6039f2aad0ffa6bb87a5936f5782fc1569"},
+    {file = "regex-2024.5.15-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:13cdaf31bed30a1e1c2453ef6015aa0983e1366fad2667657dbcac7b02f67133"},
+    {file = "regex-2024.5.15-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cac27dcaa821ca271855a32188aa61d12decb6fe45ffe3e722401fe61e323cd1"},
+    {file = "regex-2024.5.15-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7dbe2467273b875ea2de38ded4eba86cbcbc9a1a6d0aa11dcf7bd2e67859c435"},
+    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:64f18a9a3513a99c4bef0e3efd4c4a5b11228b48aa80743be822b71e132ae4f5"},
+    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d347a741ea871c2e278fde6c48f85136c96b8659b632fb57a7d1ce1872547600"},
+    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1878b8301ed011704aea4c806a3cadbd76f84dece1ec09cc9e4dc934cfa5d4da"},
+    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4babf07ad476aaf7830d77000874d7611704a7fcf68c9c2ad151f5d94ae4bfc4"},
+    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:35cb514e137cb3488bce23352af3e12fb0dbedd1ee6e60da053c69fb1b29cc6c"},
+    {file = "regex-2024.5.15-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cdd09d47c0b2efee9378679f8510ee6955d329424c659ab3c5e3a6edea696294"},
+    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:72d7a99cd6b8f958e85fc6ca5b37c4303294954eac1376535b03c2a43eb72629"},
+    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:a094801d379ab20c2135529948cb84d417a2169b9bdceda2a36f5f10977ebc16"},
+    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:c0c18345010870e58238790a6779a1219b4d97bd2e77e1140e8ee5d14df071aa"},
+    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:16093f563098448ff6b1fa68170e4acbef94e6b6a4e25e10eae8598bb1694b5d"},
+    {file = "regex-2024.5.15-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:e38a7d4e8f633a33b4c7350fbd8bad3b70bf81439ac67ac38916c4a86b465456"},
+    {file = "regex-2024.5.15-cp39-cp39-win32.whl", hash = "sha256:71a455a3c584a88f654b64feccc1e25876066c4f5ef26cd6dd711308aa538694"},
+    {file = "regex-2024.5.15-cp39-cp39-win_amd64.whl", hash = "sha256:cab12877a9bdafde5500206d1020a584355a97884dfd388af3699e9137bf7388"},
+    {file = "regex-2024.5.15.tar.gz", hash = "sha256:d3ee02d9e5f482cc8309134a91eeaacbdd2261ba111b0fef3748eeb4913e6a2c"},
 ]
 
 [[package]]
 name = "requests"
-version = "2.31.0"
+version = "2.32.3"
 description = "Python HTTP for Humans."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
-    {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
+    {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"},
+    {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"},
 ]
 
 [package.dependencies]
@@ -3016,4 +2963,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12.2"
-content-hash = "794a77ce83a38682d5a7def4212fe212cbec48573b4fdd1e2dad3c4669fa98ac"
+content-hash = "dbfc0e66e41f6da3845785157b95ef70193bc66c91b53fe0afb0eac0a1ea5490"
diff --git a/pyproject.toml b/pyproject.toml
index 04102164e5..59c1a23b50 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,8 +23,7 @@ humanize = "~=4.9"
 itsdangerous = "~=2.2"
 jinja2 = "~=3.1"
 newrelic = "*"
-notifications-python-client = "==9.0.0"
-notifications-utils = {git = "https://github.com/GSA/notifications-utils.git"}
+notifications-python-client = "==9.1.0"
 pyexcel = "==0.7.0"
 pyexcel-io = "==0.6.6"
 pyexcel-ods3 = "==0.6.1"
@@ -38,13 +37,45 @@ rtreelib = "==0.2.0"
 werkzeug = "^3.0.3"
 wtforms = "~=3.1"
 markdown = "^3.5.2"
+async-timeout = "^4.0.3"
+bleach = "^6.1.0"
+boto3 = "^1.34.113"
+botocore = "^1.34.115"
+cachetools = "^5.3.3"
+cffi = "^1.16.0"
+cryptography = "^42.0.7"
+flask-redis = "^0.4.0"
+geojson = "^3.1.0"
+jmespath = "^1.0.1"
+mistune = "0.8.4"
+numpy = "^1.26.4"
+ordered-set = "^4.1.0"
+phonenumbers = "^8.13.37"
+pycparser = "^2.22"
+python-json-logger = "^2.0.7"
+redis = "^5.0.4"
+regex = "^2024.5.15"
+s3transfer = "^0.10.1"
+shapely = "^2.0.4"
+smartypants = "^2.0.1"
+certifi = "^2024.2.2"
+charset-normalizer = "^3.3.2"
+click = "^8.1.7"
+idna = "^3.7"
+markupsafe = "^2.1.5"
+python-dateutil = "^2.9.0.post0"
+pyyaml = "^6.0.1"
+requests = "^2.32.3"
+six = "^1.16.0"
+urllib3 = "^2.2.1"
+webencodings = "^0.5.1"
 
 
 [tool.poetry.group.dev.dependencies]
 bandit = "*"
 black = "^24.2.0"
 coverage = "*"
-freezegun = "^1.4.0"
+freezegun = "^1.5.1"
 flake8 = "^7.0.0"
 flake8-bugbear = "^24.1.17"
 flake8-print = "^5.0.0"
@@ -52,8 +83,8 @@ flake8-pytest-style = "^1.7.2"
 isort = "^5.13.2"
 jinja2-cli = {version = "==0.8.2", extras = ["yaml"]}
 pip-audit = "*"
-pre-commit = "^3.6.0"
-pytest = "^8.1.1"
+pre-commit = "^3.7.1"
+pytest = "^8.2.1"
 pytest-env = "^1.1.3"
 pytest-mock = "^3.14.0"
 pytest-playwright = "^0.5.0"
@@ -61,6 +92,7 @@ pytest-xdist = "^3.5.0"
 radon = "^6.0.1"
 requests-mock = "^1.11.0"
 vulture = "^2.11"
+detect-secrets = "^1.5.0"
 
 
 [build-system]
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index 986bfc34e9..4ee5a817f5 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -23,11 +23,7 @@ def test_non_logged_in_user_can_see_homepage(
         "main.sign_in",
     )
 
-    assert page.select_one("meta[name=description]")["content"].strip() == (
-        "Notify.gov lets you send text messages to your users. "
-        "Try it now if you work in federal, state, or local government."
-    )
-
+    assert page.select_one("meta[name=description]") is not None
     # This area is hidden for the pilot
     # assert normalize_spaces(page.select_one('#whos-using-notify').text) == (
     #     'Who’s using Notify.gov '  # Hiding this next area for the pilot
@@ -114,7 +110,7 @@ def test_static_pages(
 
     # Check the page loads when user is signed in
     page = request()
-    assert not page.select_one("meta[name=description]")
+    assert page.select_one("meta[name=description]")
 
     # Check it still works when they don’t have a recent service
     with client_request.session_transaction() as session:
diff --git a/tests/app/main/views/test_new_password.py b/tests/app/main/views/test_new_password.py
index 3684801dee..89c8fef9e8 100644
--- a/tests/app/main/views/test_new_password.py
+++ b/tests/app/main/views/test_new_password.py
@@ -5,8 +5,8 @@
 from flask import url_for
 from freezegun import freeze_time
 from itsdangerous import SignatureExpired
-from notifications_utils.url_safe_token import generate_token
 
+from notifications_utils.url_safe_token import generate_token
 from tests.conftest import SERVICE_ONE_ID, url_for_endpoint_with_token
 
 
diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py
index cf4fba5a24..688ab1623c 100644
--- a/tests/app/main/views/test_register.py
+++ b/tests/app/main/views/test_register.py
@@ -5,8 +5,7 @@
 import pytest
 from flask import url_for
 
-from app.main.forms import RegisterUserForm
-from app.main.views.register import _handle_login_dot_gov_invite
+from app.main.views.register import check_invited_user_email_address_matches_expected
 from app.models.user import User
 from tests.conftest import normalize_spaces
 
@@ -382,85 +381,26 @@ def test_cannot_register_with_sms_auth_and_missing_mobile_number(
     assert err.attrs["data-error-label"] == "mobile_number"
 
 
-def test_handle_login_dot_gov_invite_bad_email(client_request, mocker):
+def test_check_invited_user_email_address_matches_expected(mocker):
+    mock_flash = mocker.patch("app.main.views.register.flash")
+    mock_abort = mocker.patch("app.main.views.register.abort")
 
-    mocker.patch(
-        "app.main.views.register.sign_in._get_access_token",
-        return_value="access token",
-    )
+    check_invited_user_email_address_matches_expected("fake@fake.gov", "Fake@Fake.GOV")
+    mock_flash.assert_not_called()
+    mock_abort.assert_not_called()
 
-    mocker.patch(
-        "app.main.views.register.sign_in._get_user_email_and_uuid",
-        return_value=["fake@fake.gov", "12345"],
-    )
-
-    mocker.patch(
-        "app.main.views.register.get_invited_user_email_address",
-        return_value="boo@fake.gov",
-    )
 
+def test_check_invited_user_email_address_doesnt_match_expected(mocker):
     mock_flash = mocker.patch("app.main.views.register.flash")
-
     mock_abort = mocker.patch("app.main.views.register.abort")
 
-    mocker.patch("app.main.views.register.invited_user_accept_invite")
-
-    invite_data = {"service_id": "service", "invited_user_id": "invited_user"}
-    invite_data = json.dumps(invite_data)
-    invite_data = invite_data.encode("utf8")
-    invite_data = base64.b64encode(invite_data)
-    invite_data = invite_data.decode("utf8")
-    _handle_login_dot_gov_invite("code", invite_data, RegisterUserForm())
+    check_invited_user_email_address_matches_expected("real@fake.gov", "Fake@Fake.GOV")
     mock_flash.assert_called_once_with(
         "You cannot accept an invite for another person."
     )
     mock_abort.assert_called_once_with(403)
 
 
-def test_handle_login_dot_gov_invite_good_email(client_request, mocker):
-
-    mocker.patch(
-        "app.main.views.register.sign_in._get_access_token",
-        return_value="access token",
-    )
-
-    mocker.patch(
-        "app.main.views.register.sign_in._get_user_email_and_uuid",
-        return_value=["fake@fake.gov", "12345"],
-    )
-
-    mocker.patch(
-        "app.main.views.register.get_invited_user_email_address",
-        return_value="fake@fake.gov",
-    )
-
-    mocker.patch(
-        "app.main.views.register.user_api_client.get_user_by_uuid_or_email",
-        return_value={"id": "abc"},
-    )
-
-    mock_user = mocker.patch(
-        "app.main.views.register.User.add_to_service",
-    )
-
-    mock_accept = mocker.patch("app.main.views.register.invited_user_accept_invite")
-
-    invite_data = {
-        "service_id": "service",
-        "invited_user_id": "invited_user",
-        "permissions": ["manage_everything"],
-        "folder_permissions": [],
-        "from_user_id": "xyz",
-    }
-    invite_data = json.dumps(invite_data)
-    invite_data = invite_data.encode("utf8")
-    invite_data = base64.b64encode(invite_data)
-    invite_data = invite_data.decode("utf8")
-    _handle_login_dot_gov_invite("code", invite_data, RegisterUserForm())
-    mock_accept.assert_called_once()
-    mock_user.assert_called_once_with("service", ["manage_everything"], [], "xyz")
-
-
 def decode_invite_data(state):
     state = state.encode("utf8")
     state = base64.b64decode(state)
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index ab35dd29be..449259d8d8 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -12,11 +12,11 @@
 import pytest
 from flask import url_for
 from notifications_python_client.errors import HTTPError
-from notifications_utils.recipients import RecipientCSV
-from notifications_utils.template import SMSPreviewTemplate
 from xlrd.biffh import XLRDError
 from xlrd.xldate import XLDateAmbiguous, XLDateError, XLDateNegative, XLDateTooLarge
 
+from notifications_utils.recipients import RecipientCSV
+from notifications_utils.template import SMSPreviewTemplate
 from tests import validate_route_permission, validate_route_permission_with_client
 from tests.conftest import (
     SERVICE_ONE_ID,
diff --git a/tests/app/main/views/test_user_profile.py b/tests/app/main/views/test_user_profile.py
index a9a78f4979..7e444478c7 100644
--- a/tests/app/main/views/test_user_profile.py
+++ b/tests/app/main/views/test_user_profile.py
@@ -3,8 +3,8 @@
 
 import pytest
 from flask import url_for
-from notifications_utils.url_safe_token import generate_token
 
+from notifications_utils.url_safe_token import generate_token
 from tests.conftest import (
     create_api_user_active,
     create_user,
diff --git a/tests/app/utils/test_templates.py b/tests/app/utils/test_templates.py
index 6061f954cd..557611156a 100644
--- a/tests/app/utils/test_templates.py
+++ b/tests/app/utils/test_templates.py
@@ -1,7 +1,7 @@
 import pytest
-from notifications_utils.template import Template
 
 from app.utils.templates import get_sample_template
+from notifications_utils.template import Template
 
 
 @pytest.mark.parametrize("template_type", ["sms", "email"])
diff --git a/tests/conftest.py b/tests/conftest.py
index fe1ee0c02a..00451bdf75 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -12,9 +12,9 @@
 from dotenv import load_dotenv
 from flask import Flask, url_for
 from notifications_python_client.errors import HTTPError
-from notifications_utils.url_safe_token import generate_token
 
 from app import create_app
+from notifications_utils.url_safe_token import generate_token
 
 from . import (
     TestClient,
diff --git a/tests/notifications_utils/__init__.py b/tests/notifications_utils/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/notifications_utils/clients/antivirus/test_antivirus_client.py b/tests/notifications_utils/clients/antivirus/test_antivirus_client.py
new file mode 100644
index 0000000000..e19327e552
--- /dev/null
+++ b/tests/notifications_utils/clients/antivirus/test_antivirus_client.py
@@ -0,0 +1,71 @@
+import io
+
+import pytest
+import requests
+
+from notifications_utils.clients.antivirus.antivirus_client import (
+    AntivirusClient,
+    AntivirusError,
+)
+
+
+@pytest.fixture()
+def antivirus(app, mocker):
+    client = AntivirusClient()
+    app.config["ANTIVIRUS_API_HOST"] = "https://antivirus"
+    app.config["ANTIVIRUS_API_KEY"] = "test-antivirus-key"
+    client.init_app(app)
+    return client
+
+
+def test_scan_document(antivirus, rmock):
+    document = io.BytesIO(b"filecontents")
+    rmock.request(
+        "POST",
+        "https://antivirus/scan",
+        json={"ok": True},
+        request_headers={
+            "Authorization": "Bearer test-antivirus-key",
+        },
+        status_code=200,
+    )
+
+    resp = antivirus.scan(document)
+
+    assert resp
+    assert "filecontents" in rmock.last_request.text
+    assert document.tell() == 0
+
+
+def test_should_raise_for_status(antivirus, rmock):
+    with pytest.raises(AntivirusError) as excinfo:
+        _test_one_statement_for_status(antivirus, rmock)
+
+    assert excinfo.value.message == "Antivirus error"
+    assert excinfo.value.status_code == 400
+
+
+def _test_one_statement_for_status(antivirus, rmock):
+    rmock.request(
+        "POST",
+        "https://antivirus/scan",
+        json={"error": "Antivirus error"},
+        status_code=400,
+    )
+
+    antivirus.scan(io.BytesIO(b"document"))
+
+
+def test_should_raise_for_connection_errors(antivirus, rmock):
+    with pytest.raises(AntivirusError) as excinfo:
+        _test_one_statement_for_connection_errors(antivirus, rmock)
+
+    assert excinfo.value.message == "connection error"
+    assert excinfo.value.status_code == 503
+
+
+def _test_one_statement_for_connection_errors(antivirus, rmock):
+    rmock.request(
+        "POST", "https://antivirus/scan", exc=requests.exceptions.ConnectTimeout
+    )
+    antivirus.scan(io.BytesIO(b"document"))
diff --git a/tests/notifications_utils/clients/encryption/test_encryption_client.py b/tests/notifications_utils/clients/encryption/test_encryption_client.py
new file mode 100644
index 0000000000..c392ba5295
--- /dev/null
+++ b/tests/notifications_utils/clients/encryption/test_encryption_client.py
@@ -0,0 +1,88 @@
+import pytest
+
+from notifications_utils.clients.encryption.encryption_client import (
+    Encryption,
+    EncryptionError,
+)
+
+
+@pytest.fixture()
+def encryption_client(app):
+    client = Encryption()
+
+    app.config["SECRET_KEY"] = "test-notify-secret-key"
+    app.config["DANGEROUS_SALT"] = "test-notify-salt"
+
+    client.init_app(app)
+
+    return client
+
+
+def test_should_ensure_shared_salt_security(app):
+    client = Encryption()
+    app.config["SECRET_KEY"] = "test-notify-secret-key"
+    app.config["DANGEROUS_SALT"] = "too-short"
+    with pytest.raises(EncryptionError):
+        client.init_app(app)
+
+
+def test_should_ensure_custom_salt_security(encryption_client):
+    with pytest.raises(EncryptionError):
+        encryption_client.encrypt("this", salt="too-short")
+
+
+def test_should_encrypt_strings(encryption_client):
+    encrypted = encryption_client.encrypt("this")
+    assert encrypted != "this"
+    assert isinstance(encrypted, str)
+
+
+def test_should_encrypt_dicts(encryption_client):
+    to_encrypt = {"hello": "world"}
+    encrypted = encryption_client.encrypt(to_encrypt)
+    assert encrypted != to_encrypt
+    assert encryption_client.decrypt(encrypted) == to_encrypt
+
+
+def test_encryption_is_nondeterministic(encryption_client):
+    first_run = encryption_client.encrypt("this")
+    second_run = encryption_client.encrypt("this")
+    assert first_run != second_run
+
+
+def test_should_decrypt_content(encryption_client):
+    encrypted = encryption_client.encrypt("this")
+    assert encryption_client.decrypt(encrypted) == "this"
+
+
+def test_should_decrypt_content_with_custom_salt(encryption_client):
+    salt = "different-salt-value"
+    encrypted = encryption_client.encrypt("this", salt=salt)
+    assert encryption_client.decrypt(encrypted, salt=salt) == "this"
+
+
+def test_should_verify_decryption(encryption_client):
+    encrypted = encryption_client.encrypt("this")
+    with pytest.raises(EncryptionError):
+        encryption_client.decrypt(encrypted, salt="different-salt-value")
+
+
+def test_should_sign_and_serialize_string(encryption_client):
+    signed = encryption_client.sign("this")
+    assert signed != "this"
+
+
+def test_should_verify_signature_and_deserialize_string(encryption_client):
+    signed = encryption_client.sign("this")
+    assert encryption_client.verify_signature(signed) == "this"
+
+
+def test_should_raise_encryption_error_on_bad_salt(encryption_client):
+    signed = encryption_client.sign("this")
+    with pytest.raises(EncryptionError):
+        encryption_client.verify_signature(signed, salt="different-salt-value")
+
+
+def test_should_sign_and_serialize_json(encryption_client):
+    signed = encryption_client.sign({"this": "that"})
+    assert encryption_client.verify_signature(signed) == {"this": "that"}
diff --git a/tests/notifications_utils/clients/redis/test_redis_client.py b/tests/notifications_utils/clients/redis/test_redis_client.py
new file mode 100644
index 0000000000..536cce9670
--- /dev/null
+++ b/tests/notifications_utils/clients/redis/test_redis_client.py
@@ -0,0 +1,223 @@
+import uuid
+from datetime import datetime
+from unittest.mock import Mock, call
+
+import pytest
+from freezegun import freeze_time
+
+from notifications_utils.clients.redis.redis_client import RedisClient, prepare_value
+
+
+@pytest.fixture()
+def mocked_redis_pipeline():
+    return Mock()
+
+
+@pytest.fixture()
+def delete_mock():
+    return Mock(return_value=4)
+
+
+@pytest.fixture()
+def mocked_redis_client(app, mocked_redis_pipeline, delete_mock, mocker):
+    app.config["REDIS_ENABLED"] = True
+
+    redis_client = RedisClient()
+    redis_client.init_app(app)
+
+    mocker.patch.object(redis_client.redis_store, "get", return_value=100)
+    mocker.patch.object(redis_client.redis_store, "set")
+    mocker.patch.object(redis_client.redis_store, "incr")
+    mocker.patch.object(redis_client.redis_store, "delete")
+    mocker.patch.object(
+        redis_client.redis_store, "pipeline", return_value=mocked_redis_pipeline
+    )
+
+    mocker.patch.object(
+        redis_client, "scripts", {"delete-keys-by-pattern": delete_mock}
+    )
+
+    mocker.patch.object(
+        redis_client.redis_store,
+        "hgetall",
+        return_value={b"template-1111": b"8", b"template-2222": b"8"},
+    )
+
+    return redis_client
+
+
+@pytest.fixture()
+def failing_redis_client(mocked_redis_client, delete_mock):
+    # nota bene: using KeyError because flake8 thinks Exception
+    # and BaseException are too broad
+    mocked_redis_client.redis_store.get.side_effect = KeyError("get failed")
+    mocked_redis_client.redis_store.set.side_effect = KeyError("set failed")
+    mocked_redis_client.redis_store.incr.side_effect = KeyError("incr failed")
+    mocked_redis_client.redis_store.pipeline.side_effect = KeyError("pipeline failed")
+    mocked_redis_client.redis_store.delete.side_effect = KeyError("delete failed")
+    delete_mock.side_effect = KeyError("delete by pattern failed")
+    return mocked_redis_client
+
+
+def test_should_not_raise_exception_if_raise_set_to_false(
+    app, caplog, failing_redis_client, mocker
+):
+    mock_logger = mocker.patch("flask.Flask.logger")
+
+    assert failing_redis_client.get("get_key") is None
+    assert failing_redis_client.set("set_key", "set_value") is None
+    assert failing_redis_client.incr("incr_key") is None
+    assert failing_redis_client.exceeded_rate_limit("rate_limit_key", 100, 100) is False
+    assert failing_redis_client.delete("delete_key") is None
+    assert failing_redis_client.delete("a", "b", "c") is None
+    assert failing_redis_client.delete_by_pattern("pattern") == 0
+
+    assert mock_logger.mock_calls == [
+        call.exception("Redis error performing get on get_key"),
+        call.exception("Redis error performing set on set_key"),
+        call.exception("Redis error performing incr on incr_key"),
+        call.exception("Redis error performing rate-limit-pipeline on rate_limit_key"),
+        call.exception("Redis error performing delete on delete_key"),
+        call.exception("Redis error performing delete on a, b, c"),
+        call.exception("Redis error performing delete-by-pattern on pattern"),
+    ]
+
+
+def test_should_raise_exception_if_raise_set_to_true(
+    app,
+    failing_redis_client,
+):
+    with pytest.raises(KeyError) as e:
+        failing_redis_client.get("test", raise_exception=True)
+    assert str(e.value) == "'get failed'"
+
+    with pytest.raises(KeyError) as e:
+        failing_redis_client.set("test", "test", raise_exception=True)
+    assert str(e.value) == "'set failed'"
+
+    with pytest.raises(KeyError) as e:
+        failing_redis_client.incr("test", raise_exception=True)
+    assert str(e.value) == "'incr failed'"
+
+    with pytest.raises(KeyError) as e:
+        failing_redis_client.exceeded_rate_limit("test", 100, 200, raise_exception=True)
+    assert str(e.value) == "'pipeline failed'"
+
+    with pytest.raises(KeyError) as e:
+        failing_redis_client.delete("test", raise_exception=True)
+    assert str(e.value) == "'delete failed'"
+
+    with pytest.raises(KeyError) as e:
+        failing_redis_client.delete_by_pattern("pattern", raise_exception=True)
+    assert str(e.value) == "'delete by pattern failed'"
+
+
+def test_should_not_call_if_not_enabled(mocked_redis_client, delete_mock):
+    mocked_redis_client.active = False
+
+    assert mocked_redis_client.get("get_key") is None
+    assert mocked_redis_client.set("set_key", "set_value") is None
+    assert mocked_redis_client.incr("incr_key") is None
+    assert mocked_redis_client.exceeded_rate_limit("rate_limit_key", 100, 100) is False
+    assert mocked_redis_client.delete("delete_key") is None
+    assert mocked_redis_client.delete_by_pattern("pattern") == 0
+
+    mocked_redis_client.redis_store.get.assert_not_called()
+    mocked_redis_client.redis_store.set.assert_not_called()
+    mocked_redis_client.redis_store.incr.assert_not_called()
+    mocked_redis_client.redis_store.delete.assert_not_called()
+    mocked_redis_client.redis_store.pipeline.assert_not_called()
+    delete_mock.assert_not_called()
+
+
+def test_should_call_set_if_enabled(mocked_redis_client):
+    mocked_redis_client.set("key", "value")
+    mocked_redis_client.redis_store.set.assert_called_with(
+        "key", "value", None, None, False, False
+    )
+
+
+def test_should_call_get_if_enabled(mocked_redis_client):
+    assert mocked_redis_client.get("key") == 100
+    mocked_redis_client.redis_store.get.assert_called_with("key")
+
+
+@freeze_time("2001-01-01 12:00:00.000000")
+def test_exceeded_rate_limit_should_add_correct_calls_to_the_pipe(
+    mocked_redis_client, mocked_redis_pipeline
+):
+    mocked_redis_client.exceeded_rate_limit("key", 100, 100)
+    assert mocked_redis_client.redis_store.pipeline.called
+    mocked_redis_pipeline.zadd.assert_called_with("key", {978350400.0: 978350400.0})
+    mocked_redis_pipeline.zremrangebyscore.assert_called_with(
+        "key", "-inf", 978350300.0
+    )
+    mocked_redis_pipeline.zcard.assert_called_with("key")
+    mocked_redis_pipeline.expire.assert_called_with("key", 100)
+    assert mocked_redis_pipeline.execute.called
+
+
+@freeze_time("2001-01-01 12:00:00.000000")
+def test_exceeded_rate_limit_should_fail_request_if_over_limit(
+    mocked_redis_client, mocked_redis_pipeline
+):
+    mocked_redis_pipeline.execute.return_value = [True, True, 100, True]
+    assert mocked_redis_client.exceeded_rate_limit("key", 99, 100)
+
+
+@freeze_time("2001-01-01 12:00:00.000000")
+def test_exceeded_rate_limit_should_allow_request_if_not_over_limit(
+    mocked_redis_client, mocked_redis_pipeline
+):
+    mocked_redis_pipeline.execute.return_value = [True, True, 100, True]
+    assert not mocked_redis_client.exceeded_rate_limit("key", 101, 100)
+
+
+@freeze_time("2001-01-01 12:00:00.000000")
+def test_exceeded_rate_limit_not_exceeded(mocked_redis_client, mocked_redis_pipeline):
+    mocked_redis_pipeline.execute.return_value = [True, True, 80, True]
+    assert not mocked_redis_client.exceeded_rate_limit("key", 90, 100)
+
+
+def test_exceeded_rate_limit_should_not_call_if_not_enabled(
+    mocked_redis_client, mocked_redis_pipeline
+):
+    mocked_redis_client.active = False
+
+    assert not mocked_redis_client.exceeded_rate_limit("key", 100, 100)
+    assert not mocked_redis_client.redis_store.pipeline.called
+
+
+def test_delete(mocked_redis_client):
+    key = "hash-key"
+    mocked_redis_client.delete(key)
+    mocked_redis_client.redis_store.delete.assert_called_with(key)
+
+
+def test_delete_multi(mocked_redis_client):
+    mocked_redis_client.delete("a", "b", "c")
+    mocked_redis_client.redis_store.delete.assert_called_with("a", "b", "c")
+
+
+@pytest.mark.parametrize(
+    ("input", "output"),
+    [
+        (b"asdf", b"asdf"),
+        ("asdf", "asdf"),
+        (0, 0),
+        (1.2, 1.2),
+        (uuid.UUID(int=0), "00000000-0000-0000-0000-000000000000"),
+        pytest.param({"a": 1}, None, marks=pytest.mark.xfail(raises=ValueError)),
+        pytest.param(
+            datetime.utcnow(), None, marks=pytest.mark.xfail(raises=ValueError)
+        ),
+    ],
+)
+def test_prepare_value(input, output):
+    assert prepare_value(input) == output
+
+
+def test_delete_by_pattern(mocked_redis_client, delete_mock):
+    ret = mocked_redis_client.delete_by_pattern("foo")
+    assert ret == 4
+    delete_mock.assert_called_once_with(args=["foo"])
diff --git a/tests/notifications_utils/clients/redis/test_request_cache.py b/tests/notifications_utils/clients/redis/test_request_cache.py
new file mode 100644
index 0000000000..472d9398b6
--- /dev/null
+++ b/tests/notifications_utils/clients/redis/test_request_cache.py
@@ -0,0 +1,190 @@
+import pytest
+
+from notifications_utils.clients.redis import RequestCache
+from notifications_utils.clients.redis.redis_client import RedisClient
+
+
+@pytest.fixture()
+def mocked_redis_client(app):
+    app.config["REDIS_ENABLED"] = True
+    redis_client = RedisClient()
+    redis_client.init_app(app)
+    return redis_client
+
+
+@pytest.fixture()
+def cache(mocked_redis_client):
+    return RequestCache(mocked_redis_client)
+
+
+@pytest.mark.parametrize(
+    ("args", "kwargs", "expected_cache_key"),
+    [
+        ([1, 2, 3], {}, "1-2-3-None-None-None"),
+        ([1, 2, 3, 4, 5, 6], {}, "1-2-3-4-5-6"),
+        ([1, 2, 3], {"x": 4, "y": 5, "z": 6}, "1-2-3-4-5-6"),
+        ([1, 2, 3, 4], {"y": 5}, "1-2-3-4-5-None"),
+    ],
+)
+def test_set(
+    mocker,
+    mocked_redis_client,
+    cache,
+    args,
+    kwargs,
+    expected_cache_key,
+):
+    mock_redis_set = mocker.patch.object(
+        mocked_redis_client,
+        "set",
+    )
+    mock_redis_get = mocker.patch.object(
+        mocked_redis_client,
+        "get",
+        return_value=None,
+    )
+
+    @cache.set("{a}-{b}-{c}-{x}-{y}-{z}")
+    def foo(a, b, c, x=None, y=None, z=None):
+        return "bar"
+
+    assert foo(*args, **kwargs) == "bar"
+
+    mock_redis_get.assert_called_once_with(expected_cache_key)
+
+    mock_redis_set.assert_called_once_with(
+        expected_cache_key,
+        '"bar"',
+        ex=604_800,
+    )
+
+
+@pytest.mark.parametrize(
+    ("cache_set_call", "expected_redis_client_ttl"),
+    [
+        (0, 0),
+        (1, 1),
+        (1.111, 1),
+        ("2000", 2_000),
+    ],
+)
+def test_set_with_custom_ttl(
+    mocker,
+    mocked_redis_client,
+    cache,
+    cache_set_call,
+    expected_redis_client_ttl,
+):
+    mock_redis_set = mocker.patch.object(
+        mocked_redis_client,
+        "set",
+    )
+    mocker.patch.object(
+        mocked_redis_client,
+        "get",
+        return_value=None,
+    )
+
+    @cache.set("foo", ttl_in_seconds=cache_set_call)
+    def foo():
+        return "bar"
+
+    foo()
+
+    mock_redis_set.assert_called_once_with(
+        "foo",
+        '"bar"',
+        ex=expected_redis_client_ttl,
+    )
+
+
+def test_raises_if_key_doesnt_match_arguments(cache):
+    @cache.set("{baz}")
+    def foo(bar):
+        pass
+
+    with pytest.raises(KeyError):
+        foo(1)
+
+    with pytest.raises(KeyError):
+        foo()
+
+
+def test_get(mocker, mocked_redis_client, cache):
+    mock_redis_get = mocker.patch.object(
+        mocked_redis_client,
+        "get",
+        return_value=b'"bar"',
+    )
+
+    @cache.set("{a}-{b}-{c}")
+    def foo(a, b, c):
+        # This function should not be called because the cache has
+        # returned a value
+        raise RuntimeError
+
+    assert foo(1, 2, 3) == "bar"
+
+    mock_redis_get.assert_called_once_with("1-2-3")
+
+
+def test_delete(mocker, mocked_redis_client, cache):
+    mock_redis_delete = mocker.patch.object(
+        mocked_redis_client,
+        "delete",
+    )
+
+    @cache.delete("{a}-{b}-{c}")
+    def foo(a, b, c):
+        return "bar"
+
+    assert foo(1, 2, 3) == "bar"
+
+    mock_redis_delete.assert_called_once_with("1-2-3")
+
+
+def test_delete_even_if_call_raises(mocker, mocked_redis_client, cache):
+    mock_redis_delete = mocker.patch.object(
+        mocked_redis_client,
+        "delete",
+    )
+
+    @cache.delete("bar")
+    def foo():
+        raise RuntimeError
+
+    with pytest.raises(RuntimeError):
+        foo()
+
+    mock_redis_delete.assert_called_once_with("bar")
+
+
+def test_delete_by_pattern(mocker, mocked_redis_client, cache):
+    mock_redis_delete = mocker.patch.object(
+        mocked_redis_client,
+        "delete_by_pattern",
+    )
+
+    @cache.delete_by_pattern("{a}-{b}-{c}-???")
+    def foo(a, b, c):
+        return "bar"
+
+    assert foo(1, 2, 3) == "bar"
+
+    mock_redis_delete.assert_called_once_with("1-2-3-???")
+
+
+def test_delete_by_pattern_even_if_call_raises(mocker, mocked_redis_client, cache):
+    mock_redis_delete = mocker.patch.object(
+        mocked_redis_client,
+        "delete_by_pattern",
+    )
+
+    @cache.delete_by_pattern("bar-???")
+    def foo():
+        raise RuntimeError
+
+    with pytest.raises(RuntimeError):
+        foo()
+
+    mock_redis_delete.assert_called_once_with("bar-???")
diff --git a/tests/notifications_utils/clients/test_redis.py b/tests/notifications_utils/clients/test_redis.py
new file mode 100644
index 0000000000..5d813b938d
--- /dev/null
+++ b/tests/notifications_utils/clients/test_redis.py
@@ -0,0 +1,7 @@
+from notifications_utils.clients.redis import rate_limit_cache_key
+
+
+def test_rate_limit_cache_key(sample_service):
+    assert rate_limit_cache_key(sample_service.id, "TEST") == "{}-TEST".format(
+        sample_service.id
+    )
diff --git a/tests/notifications_utils/clients/zendesk/test_zendesk_client.py b/tests/notifications_utils/clients/zendesk/test_zendesk_client.py
new file mode 100644
index 0000000000..d89bf466fc
--- /dev/null
+++ b/tests/notifications_utils/clients/zendesk/test_zendesk_client.py
@@ -0,0 +1,227 @@
+from base64 import b64decode
+
+import pytest
+
+from notifications_utils.clients.zendesk.zendesk_client import (
+    NotifySupportTicket,
+    ZendeskClient,
+    ZendeskError,
+)
+
+
+@pytest.fixture()
+def zendesk_client(app):
+    client = ZendeskClient()
+
+    app.config["ZENDESK_API_KEY"] = "testkey"
+
+    client.init_app(app)
+
+    return client
+
+
+def test_zendesk_client_send_ticket_to_zendesk(zendesk_client, app, mocker, rmock):
+    rmock.request(
+        "POST",
+        ZendeskClient.ZENDESK_TICKET_URL,
+        status_code=201,
+        json={
+            "ticket": {
+                "id": 12345,
+                "subject": "Something is wrong",
+            }
+        },
+    )
+    mock_logger = mocker.patch.object(app.logger, "info")
+
+    ticket = NotifySupportTicket("subject", "message", "incident")
+    zendesk_client.send_ticket_to_zendesk(ticket)
+
+    assert rmock.last_request.headers["Authorization"][:6] == "Basic "
+    b64_auth = rmock.last_request.headers["Authorization"][6:]
+    assert (
+        b64decode(b64_auth.encode()).decode()
+        == "zd-api-notify@digital.cabinet-office.gov.uk/token:testkey"
+    )
+    assert rmock.last_request.json() == ticket.request_data
+    mock_logger.assert_called_once_with("Zendesk create ticket 12345 succeeded")
+
+
+def test_zendesk_client_send_ticket_to_zendesk_error(
+    zendesk_client, app, mocker, rmock
+):
+    rmock.request(
+        "POST", ZendeskClient.ZENDESK_TICKET_URL, status_code=401, json={"foo": "bar"}
+    )
+
+    mock_logger = mocker.patch.object(app.logger, "error")
+
+    ticket = NotifySupportTicket("subject", "message", "incident")
+
+    with pytest.raises(ZendeskError):
+        zendesk_client.send_ticket_to_zendesk(ticket)
+
+    mock_logger.assert_called_with(
+        "Zendesk create ticket request failed with 401 '{'foo': 'bar'}'"
+    )
+
+
+@pytest.mark.parametrize(
+    ("p1_arg", "expected_tags", "expected_priority"),
+    [
+        (
+            {},
+            ["govuk_notify_support"],
+            "normal",
+        ),
+        (
+            {
+                "p1": False,
+            },
+            ["govuk_notify_support"],
+            "normal",
+        ),
+        (
+            {
+                "p1": True,
+            },
+            ["govuk_notify_emergency"],
+            "urgent",
+        ),
+    ],
+)
+def test_notify_support_ticket_request_data(p1_arg, expected_tags, expected_priority):
+    notify_ticket_form = NotifySupportTicket("subject", "message", "question", **p1_arg)
+
+    assert notify_ticket_form.request_data == {
+        "ticket": {
+            "subject": "subject",
+            "comment": {
+                "body": "message",
+                "public": True,
+            },
+            "group_id": NotifySupportTicket.NOTIFY_GROUP_ID,
+            "organization_id": NotifySupportTicket.NOTIFY_ORG_ID,
+            "ticket_form_id": NotifySupportTicket.NOTIFY_TICKET_FORM_ID,
+            "priority": expected_priority,
+            "tags": expected_tags,
+            "type": "question",
+            "custom_fields": [
+                {"id": "1900000744994", "value": "notify_ticket_type_non_technical"},
+                {"id": "360022836500", "value": []},
+                {"id": "360022943959", "value": None},
+                {"id": "360022943979", "value": None},
+                {"id": "1900000745014", "value": None},
+            ],
+        }
+    }
+
+
+def test_notify_support_ticket_request_data_with_message_hidden_from_requester():
+    notify_ticket_form = NotifySupportTicket(
+        "subject", "message", "problem", requester_sees_message_content=False
+    )
+
+    assert notify_ticket_form.request_data["ticket"]["comment"]["public"] is False
+
+
+@pytest.mark.parametrize(
+    ("name", "zendesk_name"), [("Name", "Name"), (None, "(no name supplied)")]
+)
+def test_notify_support_ticket_request_data_with_user_name_and_email(
+    name, zendesk_name
+):
+    notify_ticket_form = NotifySupportTicket(
+        "subject", "message", "question", user_name=name, user_email="user@example.com"
+    )
+
+    assert (
+        notify_ticket_form.request_data["ticket"]["requester"]["email"]
+        == "user@example.com"
+    )
+    assert (
+        notify_ticket_form.request_data["ticket"]["requester"]["name"] == zendesk_name
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "custom_fields",
+        "tech_ticket_tag",
+        "categories",
+        "org_id",
+        "org_type",
+        "service_id",
+    ),
+    [
+        (
+            {"technical_ticket": True},
+            "notify_ticket_type_technical",
+            [],
+            None,
+            None,
+            None,
+        ),
+        (
+            {"technical_ticket": False},
+            "notify_ticket_type_non_technical",
+            [],
+            None,
+            None,
+            None,
+        ),
+        (
+            {"ticket_categories": ["notify_billing", "notify_bug"]},
+            "notify_ticket_type_non_technical",
+            ["notify_billing", "notify_bug"],
+            None,
+            None,
+            None,
+        ),
+        (
+            {"org_id": "1234", "org_type": "local"},
+            "notify_ticket_type_non_technical",
+            [],
+            "1234",
+            "notify_org_type_local",
+            None,
+        ),
+        (
+            {"service_id": "abcd", "org_type": "nhs"},
+            "notify_ticket_type_non_technical",
+            [],
+            None,
+            "notify_org_type_nhs",
+            "abcd",
+        ),
+    ],
+)
+def test_notify_support_ticket_request_data_custom_fields(
+    custom_fields,
+    tech_ticket_tag,
+    categories,
+    org_id,
+    org_type,
+    service_id,
+):
+    notify_ticket_form = NotifySupportTicket(
+        "subject", "message", "question", **custom_fields
+    )
+
+    assert notify_ticket_form.request_data["ticket"]["custom_fields"] == [
+        {"id": "1900000744994", "value": tech_ticket_tag},
+        {"id": "360022836500", "value": categories},
+        {"id": "360022943959", "value": org_id},
+        {"id": "360022943979", "value": org_type},
+        {"id": "1900000745014", "value": service_id},
+    ]
+
+
+def test_notify_support_ticket_request_data_email_ccs():
+    notify_ticket_form = NotifySupportTicket(
+        "subject", "message", "question", email_ccs=["someone@example.com"]
+    )
+
+    assert notify_ticket_form.request_data["ticket"]["email_ccs"] == [
+        {"user_email": "someone@example.com", "action": "put"},
+    ]
diff --git a/tests/notifications_utils/conftest.py b/tests/notifications_utils/conftest.py
new file mode 100644
index 0000000000..0b8f3bce87
--- /dev/null
+++ b/tests/notifications_utils/conftest.py
@@ -0,0 +1,45 @@
+import pytest
+import requests_mock
+from flask import Flask
+
+from notifications_utils import request_helper
+
+
+class FakeService:
+    id = "1234"
+
+
+@pytest.fixture()
+def app():
+    flask_app = Flask(__name__)
+    ctx = flask_app.app_context()
+    ctx.push()
+
+    yield flask_app
+
+    ctx.pop()
+
+
+@pytest.fixture()
+def celery_app(mocker):
+    app = Flask(__name__)
+    app.config["CELERY"] = {"broker_url": "foo"}
+    app.config["NOTIFY_TRACE_ID_HEADER"] = "Ex-Notify-Request-Id"
+    request_helper.init_app(app)
+
+    ctx = app.app_context()
+    ctx.push()
+
+    yield app
+    ctx.pop()
+
+
+@pytest.fixture(scope="session")
+def sample_service():
+    return FakeService()
+
+
+@pytest.fixture()
+def rmock():
+    with requests_mock.mock() as rmock:
+        yield rmock
diff --git a/tests/notifications_utils/country_synonyms.py b/tests/notifications_utils/country_synonyms.py
new file mode 100644
index 0000000000..0c035a4c22
--- /dev/null
+++ b/tests/notifications_utils/country_synonyms.py
@@ -0,0 +1,1937 @@
+ALL = (
+    ("al'iraq", "Iraq"),
+    ("aljazā'ir", "Algeria"),
+    ("amelikahuipu'ia", "United States"),
+    ("cote d'ivoire", "Ivory Coast"),
+    ("coted'ivoire", "Ivory Coast"),
+    ("democratic people's republic of koread", "North Korea"),
+    ("democraticpeople'srepublicofkoread", "North Korea"),
+    ("ityop'ia", "Ethiopia"),
+    ("lao people's democratic republic", "Laos"),
+    ("laopeople'sdemocraticrepublic", "Laos"),
+    ("o'zbekstan", "Uzbekistan"),
+    ("people's democratic republic of algeriaalgerie", "Algeria"),
+    ("people's republic of bangladesh", "Bangladesh"),
+    ("people's republic of china", "China"),
+    ("people'sdemocraticrepublicofalgeriaalgerie", "Algeria"),
+    ("people'srepublicofbangladesh", "Bangladesh"),
+    ("people'srepublicofchina", "China"),
+    ("republic of cote d'ivoire", "Ivory Coast"),
+    ("republicofcoted'ivoire", "Ivory Coast"),
+    ("sak'art'velo", "Georgia"),
+    ("socialist people's libyan arab", "Libya"),
+    ("socialistpeople'slibyanarab", "Libya"),
+    ("the democratic people's republic of korea", "North Korea"),
+    ("the lao people's democratic republic", "Laos"),
+    ("the people's democratic republic of algeria", "Algeria"),
+    ("the people's republic of bangladesh", "Bangladesh"),
+    ("the people's republic of china", "China"),
+    ("the republic of cote d'ivoire", "Ivory Coast"),
+    ("thedemocraticpeople'srepublicofkorea", "North Korea"),
+    ("thelaopeople'sdemocraticrepublic", "Laos"),
+    ("thepeople'sdemocraticrepublicofalgeria", "Algeria"),
+    ("thepeople'srepublicofbangladesh", "Bangladesh"),
+    ("thepeople'srepublicofchina", "China"),
+    ("therepublicofcoted'ivoire", "Ivory Coast"),
+    ("timor lorosa'e", "East Timor"),
+    ("timorlorosa'e", "East Timor"),
+    ("yisra'el", "Israel"),
+    ("\u200e", "Iraq"),
+    ("aaland", "Åland Islands"),
+    ("abudhabi", "Abu Dhabi"),
+    ("abyssinia", "Ethiopia"),
+    ("ad", "Andorra"),
+    ("ae", "United Arab Emirates"),
+    ("aeaj", "Ajman"),
+    ("aeaz", "Abu Dhabi"),
+    ("aedu", "Dubai"),
+    ("aefu", "Fujairah"),
+    ("aerk", "Ras al-Khaimah"),
+    ("aeroes", "Faroe Islands"),
+    ("aesh", "Sharjah"),
+    ("aeuq", "Umm al-Quwain"),
+    ("af", "Afghanistan"),
+    ("afganastan", "Afghanistan"),
+    ("afganestan", "Afghanistan"),
+    ("afganhistan", "Afghanistan"),
+    ("afganistan", "Afghanistan"),
+    ("afghanestan", "Afghanistan"),
+    ("afghanlstan", "Afghanistan"),
+    ("afghistan", "Afghanistan"),
+    ("aforika borwa", "South Africa"),
+    ("aforikaborwa", "South Africa"),
+    ("afrika borwa", "South Africa"),
+    ("afrika dzonga", "South Africa"),
+    ("afrikaborwa", "South Africa"),
+    ("afrikadzonga", "South Africa"),
+    ("afurika tshipembe", "South Africa"),
+    ("afurikatshipembe", "South Africa"),
+    ("ag", "Antigua and Barbuda"),
+    ("agawec", "Mauritania"),
+    ("ahvenanmaa", "Åland Islands"),
+    ("ai", "Anguilla"),
+    ("aigeria", "Algeria"),
+    ("al itihaad al islamiya", "Somalia"),
+    ("al", "Albania"),
+    ("alabnia", "Albania"),
+    ("aland", "Åland Islands"),
+    ("albana", "Albania"),
+    ("albanian", "Albania"),
+    ("albanija", "Albania"),
+    ("albaḥrayn", "Bahrain"),
+    ("albenia", "Albania"),
+    ("albiana", "Albania"),
+    ("alegeria", "Algeria"),
+    ("algeir", "Algeria"),
+    ("algeirs", "Algeria"),
+    ("algers", "Algeria"),
+    ("algieria", "Algeria"),
+    ("algiers", "Algeria"),
+    ("alibania", "Albania"),
+    ("aliraq", "Iraq"),
+    ("alitihaad alislamiya", "Somalia"),
+    ("alitihaadalislamiya", "Somalia"),
+    ("almamlaka al‘arabiyyah as sa‘ūdiyyah", "Saudi Arabia"),
+    ("almamlakaal‘arabiyyahassa‘ūdiyyah", "Saudi Arabia"),
+    ("almaɣréb", "Morocco"),
+    ("alyaman", "Yemen"),
+    ("al’imārat al‘arabiyyah almuttaḥidah", "United Arab Emirates"),
+    ("al’imāratal‘arabiyyahalmuttaḥidah", "United Arab Emirates"),
+    ("al’urdun", "Jordan"),
+    ("am", "Armenia"),
+    ("ameeri", "United States"),
+    ("ameica", "United States"),
+    ("amerca", "United States"),
+    ("amercia", "United States"),
+    ("ameria", "United States"),
+    ("america", "United States"),
+    ("american virgin islands", "United States Virgin Islands"),
+    ("americansamoa", "American Samoa"),
+    ("americanvirginislands", "United States Virgin Islands"),
+    ("americia", "United States"),
+    ("amerika sāmoa", "Samoa"),
+    ("amerikasāmoa", "Samoa"),
+    ("amerruk", "Morocco"),
+    ("amrica", "United States"),
+    ("angolo", "Angola"),
+    ("anmerica", "United States"),
+    ("annam", "Vietnam"),
+    ("antiguaandbarbuda", "Antigua and Barbuda"),
+    ("ao", "Angola"),
+    ("aorōkin m̧ajeļ", "Marshall Islands"),
+    ("aorōkinm̧ajeļ", "Marshall Islands"),
+    ("aotearoa", "New Zealand"),
+    ("aq", "Antarctica"),
+    ("ar", "Argentina"),
+    ("arab emir ates", "United Arab Emirates"),
+    ("arab emirates", "United Arab Emirates"),
+    ("arab republic of egypt", "Egypt"),
+    ("arabemirates", "United Arab Emirates"),
+    ("arabrepublicofegypt", "Egypt"),
+    ("argenina", "Argentina"),
+    ("argentiha", "Argentina"),
+    ("argentine republic", "Argentina"),
+    ("argentine", "Argentina"),
+    ("argentinerepublic", "Argentina"),
+    ("argentinia", "Argentina"),
+    ("argentna", "Argentina"),
+    ("arima", "Armenia"),
+    ("arminia", "Armenia"),
+    ("as", "American Samoa"),
+    ("ascension island", "Ascension"),
+    ("ascensionisland", "Ascension"),
+    ("assudan", "Sudan"),
+    ("at", "Austria"),
+    ("au", "Australia"),
+    ("ausralia", "Australia"),
+    ("austalia", "Australia"),
+    ("austraila", "Australia"),
+    ("austrailia", "Australia"),
+    ("australa", "Australia"),
+    ("australla", "Australia"),
+    ("austrilia", "Australia"),
+    ("austrlia", "Australia"),
+    ("autralia", "Australia"),
+    ("avstralia", "Australia"),
+    ("avstria", "Australia"),
+    ("aw", "Aruba"),
+    ("ax", "Åland Islands"),
+    ("ayiti", "Haiti"),
+    ("az", "Azerbaijan"),
+    ("azebaijan", "Azerbaijan"),
+    ("azeraijan", "Azerbaijan"),
+    ("azerbaijani republic", "Azerbaijan"),
+    ("azerbaijanirepublic", "Azerbaijan"),
+    ("azerbaijann", "Azerbaijan"),
+    ("azerbaisan", "Azerbaijan"),
+    ("azerbaizan", "Azerbaijan"),
+    ("azerbajan", "Azerbaijan"),
+    ("azerbajdzhan republic", "Azerbaijan"),
+    ("azerbajdzhan", "Azerbaijan"),
+    ("azerbajdzhanrepublic", "Azerbaijan"),
+    ("azerbaycan", "Azerbaijan"),
+    ("azerbayjan", "Azerbaijan"),
+    ("azerbeyjan", "Azerbaijan"),
+    ("azerbpijan", "Azerbaijan"),
+    ("azərbaycan", "Azerbaijan"),
+    ("aşşūmāl", "Somalia"),
+    ("ba", "Bosnia and Herzegovina"),
+    ("bailiwick of guernsey", "United Kingdom"),
+    ("bailiwick of jersey", "United Kingdom"),
+    ("bailiwickofguernsey", "United Kingdom"),
+    ("bailiwickofjersey", "United Kingdom"),
+    ("bakerisland", "Baker Island"),
+    ("bangla desh", "Bangladesh"),
+    ("basutoland", "Lesotho"),
+    ("bat", "British Antarctic Territory"),
+    ("bb", "Barbados"),
+    ("bd", "Bangladesh"),
+    ("be", "Belgium"),
+    ("belau", "Palau"),
+    ("belgie", "Belgium"),
+    ("belgien", "Belgium"),
+    ("belgique", "Belgium"),
+    ("belgië", "Belgium"),
+    ("belguim", "Belgium"),
+    ("bermudas", "Bermuda"),
+    ("bf", "Burkina Faso"),
+    ("bg", "Bulgaria"),
+    ("bh", "Bahrain"),
+    ("bharat", "India"),
+    ("bharôt", "India"),
+    ("bharôtô", "India"),
+    ("bhārat", "India"),
+    ("bhārata", "India"),
+    ("bhāratadēsam", "India"),
+    ("bhāratam", "India"),
+    ("bi", "Burundi"),
+    ("bielaruś", "Belarus"),
+    ("bih", "Bosnia and Herzegovina"),
+    ("bj", "Benin"),
+    ("bl", "Saint Barthélemy"),
+    ("bm", "Bermuda"),
+    ("bn", "Brunei"),
+    ("bo", "Bolivia"),
+    ("bolivarian republic of venezuela", "Venezuela"),
+    ("bolivarianrepublicofvenezuela", "Venezuela"),
+    ("bosna i hercegovina", "Bosnia and Herzegovina"),
+    ("bosnaihercegovina", "Bosnia and Herzegovina"),
+    ("bosniaandherzegovina", "Bosnia and Herzegovina"),
+    ("bosniaherzegovina", "Bosnia and Herzegovina"),
+    ("bouvetisland", "Bouvet Island"),
+    ("bqbo", "Bonaire"),
+    ("bqsa", "Saba"),
+    ("bqse", "Sint Eustatius"),
+    ("br", "Brazil"),
+    ("brasil", "Brazil"),
+    ("brazzaville", "Congo"),
+    ("british guiana", "Guyana"),
+    ("british honduras", "Belize"),
+    ("britishantarcticterritory", "British Antarctic Territory"),
+    ("britishguiana", "Guyana"),
+    ("britishhonduras", "Belize"),
+    ("britishindianoceanterritory", "British Indian Ocean Territory"),
+    ("britishvirginislands", "British Virgin Islands"),
+    ("brunei darussalam", "Brunei"),
+    ("bruneidarussalam", "Brunei"),
+    ("bs", "The Bahamas"),
+    ("bt", "Bhutan"),
+    ("bugaria", "Bulgaria"),
+    ("bukchosŏn", "North Korea"),
+    ("bulagar", "Bulgaria"),
+    ("bulgariya", "Bulgaria"),
+    ("buliwya", "Bolivia"),
+    ("bundesrepublik", "Germany"),
+    ("burkina fasoupper", "Burkina Faso"),
+    ("burkinafaso", "Burkina Faso"),
+    ("burkinafasoupper", "Burkina Faso"),
+    ("bv", "Bouvet Island"),
+    ("bvi", "British Virgin Islands"),
+    ("bw", "Botswana"),
+    ("by", "Belarus"),
+    ("byelarus", "Belarus"),
+    ("byelorussia", "Belarus"),
+    ("bz", "Belize"),
+    ("bārata", "India"),
+    ("bălgarija", "Bulgaria"),
+    ("ca", "Canada"),
+    ("cabo verde", "Cape Verde"),
+    ("cabo", "Cape Verde"),
+    ("caboverde", "Cape Verde"),
+    ("cameroun", "Cameroon"),
+    ("canadaigua", "Canada"),
+    ("candada", "Canada"),
+    ("capeverde", "Cape Verde"),
+    ("car", "Central African Republic"),
+    ("cathay", "China"),
+    ("caymanislands", "Cayman Islands"),
+    ("cc", "Cocos (Keeling) Islands"),
+    ("cd", "Congo (Democratic Republic)"),
+    ("central africa", "Central African Republic"),
+    ("centralafrica", "Central African Republic"),
+    ("centralafricanrepublic", "Central African Republic"),
+    ("ceska", "Czechia"),
+    ("ceylon", "Sri Lanka"),
+    ("cf", "Central African Republic"),
+    ("cg", "Congo"),
+    ("ch", "Switzerland"),
+    ("chinese taipei", "Taiwan"),
+    ("chinesetaipei", "Taiwan"),
+    ("christmasisland", "Christmas Island"),
+    ("ci", "Ivory Coast"),
+    ("citta del vaticano", "Vatican City"),
+    ("cittadelvaticano", "Vatican City"),
+    ("ck", "Cook Islands"),
+    ("cl", "Chile"),
+    ("cm", "Cameroon"),
+    ("cn", "China"),
+    ("co", "Colombia"),
+    ("coasta rica", "Costa Rica"),
+    ("coastarica", "Costa Rica"),
+    ("cocos(keeling)islands", "Cocos (Keeling) Islands"),
+    ("collectivity of saint martin", "Saint-Martin (French part)"),
+    ("collectivityofsaintmartin", "Saint-Martin (French part)"),
+    ("commonwealth of australia", "Australia"),
+    ("commonwealth of bahamas", "The Bahamas"),
+    ("commonwealth of dominica", "Dominica"),
+    ("commonwealth of puerto rico", "Puerto Rico"),
+    ("commonwealth of the northern mariana islands", "Northern Mariana Islands"),
+    ("commonwealthofaustralia", "Australia"),
+    ("commonwealthofbahamas", "The Bahamas"),
+    ("commonwealthofdominica", "Dominica"),
+    ("commonwealthofpuertorico", "Puerto Rico"),
+    ("commonwealthofthenorthernmarianaislands", "Northern Mariana Islands"),
+    ("comores", "Comoros"),
+    ("congo(democraticrepublic)", "Congo (Democratic Republic)"),
+    ("congobrazzaville", "Congo (Democratic Republic)"),
+    ("cookislands", "Cook Islands"),
+    ("cooperative republic of guyana", "Guyana"),
+    ("cooperativerepublicofguyana", "Guyana"),
+    ("costa rico", "Costa Rica"),
+    ("costarica", "Costa Rica"),
+    ("costarico", "Costa Rica"),
+    ("cote divoire", "Ivory Coast"),
+    ("cotedivoire", "Ivory Coast"),
+    ("country of curaçao", "Curaçao"),
+    ("countryofcuraçao", "Curaçao"),
+    ("cr", "Costa Rica"),
+    ("crna gora", "Montenegro"),
+    ("crnagora", "Montenegro"),
+    ("cs", "Czechia"),
+    ("cu", "Cuba"),
+    ("curacao", "Curaçao"),
+    ("cv", "Cape Verde"),
+    ("cw", "Curaçao"),
+    ("cx", "Christmas Island"),
+    ("cy", "Cyprus"),
+    ("cz", "Czechia"),
+    ("czech republic", "Czechia"),
+    ("czechoslav", "Czechia"),
+    ("czechoslovak republic", "Czechia"),
+    ("czechoslovakrepublic", "Czechia"),
+    ("czechrepublic", "Czechia"),
+    ("dahomey", "Benin"),
+    ("danmark", "Denmark"),
+    ("dawlat ulkuwayt", "Kuwait"),
+    ("dawlatulkuwayt", "Kuwait"),
+    ("dd", "Germany"),
+    ("de", "Germany"),
+    ("democratic republic of sao tome and principe", "Sao Tome and Principe"),
+    ("democratic republic of the congo", "Congo (Democratic Republic)"),
+    ("democratic republic of timorlestetimor", "East Timor"),
+    ("democratic socialist republic of sri lanka", "Sri Lanka"),
+    ("democraticrepublicofsaotomeandprincipe", "Sao Tome and Principe"),
+    ("democraticrepublicofthecongo", "Congo (Democratic Republic)"),
+    ("democraticrepublicoftimorlestetimor", "East Timor"),
+    ("democraticsocialistrepublicofsrilanka", "Sri Lanka"),
+    ("deutschland", "Germany"),
+    ("dhivehi raajje", "Maldives"),
+    ("dhivehiraajje", "Maldives"),
+    ("dj", "Djibouti"),
+    ("dk", "Denmark"),
+    ("dm", "Dominica"),
+    ("do", "Dominican Republic"),
+    ("dominicanrepublic", "Dominican Republic"),
+    ("dominique", "Dominica"),
+    ("dprk", "North Korea"),
+    ("druk yul", "Bhutan"),
+    ("drukyul", "Bhutan"),
+    ("ducie and oeno islands", "Pitcairn, Henderson, Ducie and Oeno Islands"),
+    ("ducieandoenoislands", "Pitcairn, Henderson, Ducie and Oeno Islands"),
+    ("dutch east indies", "Indonesia"),
+    ("dutcheastindies", "Indonesia"),
+    ("dz", "Algeria"),
+    ("dzayer", "Algeria"),
+    ("e civitate vaticana", "Vatican City"),
+    ("east pakistan", "Bangladesh"),
+    ("eastern samoa", "American Samoa"),
+    ("easternsamoa", "American Samoa"),
+    ("eastgermany", "Germany"),
+    ("eastpakistan", "Bangladesh"),
+    ("easttimor", "East Timor"),
+    ("ec", "Ecuador"),
+    ("ecivitatevaticana", "Vatican City"),
+    ("ee", "Estonia"),
+    ("eesti", "Estonia"),
+    ("eg", "Egypt"),
+    ("egpyt", "Egypt"),
+    ("egyot", "Egypt"),
+    ("egyt", "Egypt"),
+    ("eh", "Western Sahara"),
+    ("eire", "Ireland"),
+    ("ellada", "Greece"),
+    ("ellan vannin", "United Kingdom"),
+    ("ellanvannin", "United Kingdom"),
+    ("ellas", "Greece"),
+    ("ellice islands", "Tuvalu"),
+    ("elliceislands", "Tuvalu"),
+    ("elmeɣrib", "Morocco"),
+    ("elsalvador", "El Salvador"),
+    ("emirate of abu dhabi", "Abu Dhabi"),
+    ("emirate of ajman", "Ajman"),
+    ("emirate of dubai", "Dubai"),
+    ("emirate of fujairah", "Fujairah"),
+    ("emirate of ras alkhaimah", "Ras al-Khaimah"),
+    ("emirate of sharjah", "Sharjah"),
+    ("emirate of umm alquwain", "Umm al-Quwain"),
+    ("emirateofabudhabi", "Abu Dhabi"),
+    ("emirateofajman", "Ajman"),
+    ("emirateofdubai", "Dubai"),
+    ("emirateoffujairah", "Fujairah"),
+    ("emirateofrasalkhaimah", "Ras al-Khaimah"),
+    ("emirateofsharjah", "Sharjah"),
+    ("emirateofummalquwain", "Umm al-Quwain"),
+    ("equatorialguinea", "Equatorial Guinea"),
+    ("er", "Eritrea"),
+    ("ertra", "Eritrea"),
+    ("es", "Spain"),
+    ("esce", "Ceuta"),
+    ("esml", "Melilla"),
+    ("espainia", "Spain"),
+    ("espanha", "Spain"),
+    ("espanya", "Spain"),
+    ("españa", "Spain"),
+    ("estados unidos", "United States"),
+    ("estadosunidos", "United States"),
+    ("esthonia", "Estonia"),
+    ("et", "Ethiopia"),
+    ("ethopi", "Ethiopia"),
+    ("falklandislands", "Falkland Islands"),
+    ("faroeislands", "Faroe Islands"),
+    ("faroes", "Faroe Islands"),
+    ("federal democratic republic of ethiopia", "Ethiopia"),
+    ("federal democratic republic of nepal", "Nepal"),
+    ("federal islamic republic of the comoros", "Comoros"),
+    ("federal republic of germany", "Germany"),
+    ("federal republic of nigeria", "Nigeria"),
+    ("federal republic of somalia", "Somalia"),
+    ("federal republic of somaliaaiai", "Somalia"),
+    ("federaldemocraticrepublicofethiopia", "Ethiopia"),
+    ("federaldemocraticrepublicofnepal", "Nepal"),
+    ("federalislamicrepublicofthecomoros", "Comoros"),
+    ("federalrepublicofgermany", "Germany"),
+    ("federalrepublicofnigeria", "Nigeria"),
+    ("federalrepublicofsomalia", "Somalia"),
+    ("federalrepublicofsomaliaaiai", "Somalia"),
+    ("federated states of micronesia", "Micronesia"),
+    ("federatedstatesofmicronesia", "Micronesia"),
+    ("federation of malaysia", "Malaysia"),
+    ("federation of saint christopher and nevis", "St Kitts and Nevis"),
+    ("federationofmalaysia", "Malaysia"),
+    ("federationofsaintchristopherandnevis", "St Kitts and Nevis"),
+    ("federative republic of brazil", "Brazil"),
+    ("federativerepublicofbrazil", "Brazil"),
+    ("fi", "Finland"),
+    ("fj", "Fiji"),
+    ("fk", "Falkland Islands"),
+    ("fm", "Micronesia"),
+    ("fo", "Faroe Islands"),
+    ("fr", "France"),
+    ("french congo", "Congo"),
+    ("french guinea", "Guinea"),
+    ("french oceania", "French Polynesia"),
+    ("french republic", "France"),
+    ("french sudan", "Mali"),
+    ("frenchcongo", "Congo"),
+    ("frenchguiana", "French Guiana"),
+    ("frenchguinea", "Guinea"),
+    ("frenchoceania", "French Polynesia"),
+    ("frenchpolynesia", "French Polynesia"),
+    ("frenchrepublic", "France"),
+    ("frenchsouthernterritories", "French Southern Territories"),
+    ("frenchsudan", "Mali"),
+    ("frg", "Germany"),
+    ("friendly islands", "Tonga"),
+    ("friendlyislands", "Tonga"),
+    ("færøerne", "Faroe Islands"),
+    ("føroyar", "Faroe Islands"),
+    ("ga", "Gabon"),
+    ("gabonese republic", "Gabon"),
+    ("gaboneserepublic", "Gabon"),
+    ("gabun", "Gabon"),
+    ("gabuuti", "Djibouti"),
+    ("gd", "Grenada"),
+    ("ge", "Georgia"),
+    ("genus argentina", "Argentina"),
+    ("genusargentina", "Argentina"),
+    ("germany democratic republic", "Germany"),
+    ("germanydemocraticrepublic", "Germany"),
+    ("gf", "French Guiana"),
+    ("gg", "United Kingdom"),
+    ("gh", "Ghana"),
+    ("gi", "Gibraltar"),
+    ("gine", "Guinea"),
+    ("gl", "Greenland"),
+    ("gm", "The Gambia"),
+    ("gn", "Guinea"),
+    ("gold coast", "Ghana"),
+    ("goldcoast", "Ghana"),
+    ("gp", "Guadeloupe"),
+    ("gq", "Equatorial Guinea"),
+    ("gr", "Greece"),
+    ("grand duchy of luxembourg", "Luxembourg"),
+    ("grandduchyofluxembourg", "Luxembourg"),
+    ("gronland", "Greenland"),
+    ("grønland", "Greenland"),
+    ("gs", "South Georgia and South Sandwich Islands"),
+    ("gt", "Guatemala"),
+    ("gu", "Guam"),
+    ("guinea ecuatorial", "Equatorial Guinea"),
+    ("guineaecuatorial", "Equatorial Guinea"),
+    ("guinée", "Guinea"),
+    ("guyane", "French Guiana"),
+    ("guåhån", "Guam"),
+    ("gw", "Guinea-Bissau"),
+    ("gy", "Guyana"),
+    ("hanguk", "South Korea"),
+    ("hashemite kingdom of jordan", "Jordan"),
+    ("hashemitekingdomofjordan", "Jordan"),
+    ("hayastan", "Armenia"),
+    ("hayastán", "Armenia"),
+    ("haïti", "Haiti"),
+    ("heardislandandmcdonaldislands", "Heard Island and McDonald Islands"),
+    ("hellas", "Greece"),
+    ("hellenic republic", "Greece"),
+    ("hellenicrepublic", "Greece"),
+    ("henderson", "Pitcairn, Henderson, Ducie and Oeno Islands"),
+    ("heung gong", "Hong Kong"),
+    ("heunggong", "Hong Kong"),
+    ("hindustan", "India"),
+    ("hk", "Hong Kong"),
+    ("hm", "Heard Island and McDonald Islands"),
+    ("hn", "Honduras"),
+    ("holland", "Netherlands"),
+    ("holy see", "Vatican City"),
+    ("holysee", "Vatican City"),
+    ("hong kong special administrative region", "Hong Kong"),
+    ("hongkong", "Hong Kong"),
+    ("hongkongspecialadministrativeregion", "Hong Kong"),
+    ("howlandisland", "Howland Island"),
+    ("hr", "Croatia"),
+    ("hrvatska", "Croatia"),
+    ("ht", "Haiti"),
+    ("hu", "Hungary"),
+    ("id", "Indonesia"),
+    ("ie", "Ireland"),
+    ("il", "Israel"),
+    ("ilikwet", "Kuwait"),
+    ("im", "United Kingdom"),
+    ("in", "India"),
+    ("independent state of papua new guinea", "Papua New Guinea"),
+    ("independent state of samoa", "Samoa"),
+    ("independentstateofpapuanewguinea", "Papua New Guinea"),
+    ("independentstateofsamoa", "Samoa"),
+    ("iningizimu afrika", "South Africa"),
+    ("iningizimuafrika", "South Africa"),
+    ("io", "British Indian Ocean Territory"),
+    ("iot", "British Indian Ocean Territory"),
+    ("iq", "Iraq"),
+    ("ir", "Iran"),
+    ("irak", "Iraq"),
+    ("irelend", "Ireland"),
+    ("irish republic", "Ireland"),
+    ("irishrepublic", "Ireland"),
+    ("iritriya", "Eritrea"),
+    ("is", "Iceland"),
+    ("isewula afrika", "South Africa"),
+    ("isewulaafrika", "South Africa"),
+    ("islamic republic of afghanistan", "Afghanistan"),
+    ("islamic republic of gambia", "The Gambia"),
+    ("islamic republic of iran", "Iran"),
+    ("islamic republic of mauritania", "Mauritania"),
+    ("islamic republic of pakistan", "Pakistan"),
+    ("islamicrepublicofafghanistan", "Afghanistan"),
+    ("islamicrepublicofgambia", "The Gambia"),
+    ("islamicrepublicofiran", "Iran"),
+    ("islamicrepublicofmauritania", "Mauritania"),
+    ("islamicrepublicofpakistan", "Pakistan"),
+    ("island of guernsey", "United Kingdom"),
+    ("island of jersey", "United Kingdom"),
+    ("island", "Iceland"),
+    ("islandofguernsey", "United Kingdom"),
+    ("islandofjersey", "United Kingdom"),
+    ("isleofman", "United Kingdom"),
+    ("israʼiyl", "Israel"),
+    ("isreal", "Israel"),
+    ("it", "Italy"),
+    ("italia", "Italy"),
+    ("italian republic", "Italy"),
+    ("italianrepublic", "Italy"),
+    ("itlay", "Italy"),
+    ("ivorycoast", "Ivory Coast"),
+    ("jabuuti", "Djibouti"),
+    ("jamaca", "Jamaica"),
+    ("jamacia", "Jamaica"),
+    ("jamahiriya", "Libya"),
+    ("jarvisisland", "Jarvis Island"),
+    ("je", "United Kingdom"),
+    ("jm", "Jamaica"),
+    ("jo", "Jordan"),
+    ("johnstonatoll", "Johnston Atoll"),
+    ("jp", "Japan"),
+    ("juzur alqamar", "Comoros"),
+    ("juzuralqamar", "Comoros"),
+    ("jèrri", "Tuvalu"),
+    ("jībūtī", "Djibouti"),
+    ("kalaallit nunaat", "Greenland"),
+    ("kalaallitnunaat", "Greenland"),
+    ("kampuchea", "Cambodia"),
+    ("kangwane", "Eswatini"),
+    ("katar", "Qatar"),
+    ("kazakh", "Kazakhstan"),
+    ("kazakhstán", "Kazakhstan"),
+    ("kazakstan", "Kazakhstan"),
+    ("ke", "Kenya"),
+    ("kg", "Kyrgyzstan"),
+    ("kh", "Cambodia"),
+    ("ki", "Kiribati"),
+    ("kingdom of bahrain", "Bahrain"),
+    ("kingdom of belgium", "Belgium"),
+    ("kingdom of bhutan", "Bhutan"),
+    ("kingdom of cambodia", "Cambodia"),
+    ("kingdom of denmark", "Denmark"),
+    ("kingdom of eswatini", "Eswatini"),
+    ("kingdom of lesotho", "Lesotho"),
+    ("kingdom of moroccoalmagrib", "Morocco"),
+    ("kingdom of norway", "Norway"),
+    ("kingdom of saudi arabia", "Saudi Arabia"),
+    ("kingdom of spain", "Spain"),
+    ("kingdom of swaziland", "Eswatini"),
+    ("kingdom of sweden", "Sweden"),
+    ("kingdom of thailand", "Thailand"),
+    ("kingdom of the netherlands", "Netherlands"),
+    ("kingdom of tonga", "Tonga"),
+    ("kingdomofbahrain", "Bahrain"),
+    ("kingdomofbelgium", "Belgium"),
+    ("kingdomofbhutan", "Bhutan"),
+    ("kingdomofcambodia", "Cambodia"),
+    ("kingdomofdenmark", "Denmark"),
+    ("kingdomofeswatini", "Eswatini"),
+    ("kingdomoflesotho", "Lesotho"),
+    ("kingdomofmoroccoalmagrib", "Morocco"),
+    ("kingdomofnorway", "Norway"),
+    ("kingdomofsaudiarabia", "Saudi Arabia"),
+    ("kingdomofspain", "Spain"),
+    ("kingdomofswaziland", "Eswatini"),
+    ("kingdomofsweden", "Sweden"),
+    ("kingdomofthailand", "Thailand"),
+    ("kingdomofthenetherlands", "Netherlands"),
+    ("kingdomoftonga", "Tonga"),
+    ("kingmanreef", "Kingman Reef"),
+    ("kirghizia", "Kyrgyzstan"),
+    ("kirghizstan", "Kyrgyzstan"),
+    ("kirgiz", "Kyrgyzstan"),
+    ("kirgizia", "Kyrgyzstan"),
+    ("kirgizija", "Kyrgyzstan"),
+    ("kirgizstan", "Kyrgyzstan"),
+    ("km", "Comoros"),
+    ("kn", "St Kitts and Nevis"),
+    ("komori", "Comoros"),
+    ("kosova", "Kosovo"),
+    ("koweit", "Kuwait"),
+    ("kp", "North Korea"),
+    ("kr", "South Korea"),
+    ("kw", "Kuwait"),
+    ("ky", "Cayman Islands"),
+    ("kypros", "Cyprus"),
+    ("kyrgyz republic", "Kyrgyzstan"),
+    ("kyrgyz republickirghiz", "Kyrgyzstan"),
+    ("kyrgyzrepublic", "Kyrgyzstan"),
+    ("kyrgyzrepublickirghiz", "Kyrgyzstan"),
+    ("kz", "Kazakhstan"),
+    ("kòrsou", "Curaçao"),
+    ("ködörösêse tî bêafrîka", "Central African Republic"),
+    ("ködörösêsetîbêafrîka", "Central African Republic"),
+    ("kýpros", "Cyprus"),
+    ("kıbrıs", "Cyprus"),
+    ("la", "Laos"),
+    ("lao", "Laos"),
+    ("las malvinas", "Falkland Islands"),
+    ("lasmalvinas", "Falkland Islands"),
+    ("latvija", "Latvia"),
+    ("latvijaz", "Latvia"),
+    ("lb", "Lebanon"),
+    ("lc", "St Lucia"),
+    ("lebanese republic", "Lebanon"),
+    ("lebaneserepublic", "Lebanon"),
+    ("li", "Liechtenstein"),
+    ("lietuva", "Lithuania"),
+    ("lk", "Sri Lanka"),
+    ("lr", "Liberia"),
+    ("ls", "Lesotho"),
+    ("lt", "Lithuania"),
+    ("lu", "Luxembourg"),
+    ("lubnān", "Lebanon"),
+    ("luxemborg", "Luxembourg"),
+    ("luxemburg", "Luxembourg"),
+    ("lv", "Latvia"),
+    ("ly", "Libya"),
+    ("lëtzebuerg", "Luxembourg"),
+    ("lībiyā", "Libya"),
+    ("ma", "Morocco"),
+    ("macao special administrative region", "Macao"),
+    ("macaospecialadministrativeregion", "Macao"),
+    ("macedon", "North Macedonia"),
+    ("madagasikara", "Madagascar"),
+    ("magyarorszag", "Hungary"),
+    ("magyarország", "Hungary"),
+    ("mainland china", "China"),
+    ("mainlandchina", "China"),
+    ("makedonija", "North Macedonia"),
+    ("malagasy republic", "Madagascar"),
+    ("malagasyrepublic", "Madagascar"),
+    ("malyasi", "Malaysia"),
+    ("malēṣiyā", "Malaysia"),
+    ("maroc", "Morocco"),
+    ("marruecos", "Morocco"),
+    ("marshallislands", "Marshall Islands"),
+    ("masr", "Egypt"),
+    ("maurice", "Mauritius"),
+    ("mauritanie", "Mauritania"),
+    ("mc", "Monaco"),
+    ("md", "Moldova"),
+    ("me", "Montenegro"),
+    ("mexcio", "Mexico"),
+    ("mexicanos", "Mexico"),
+    ("mexixo", "Mexico"),
+    ("mf", "Saint-Martin (French part)"),
+    ("mg", "Madagascar"),
+    ("mh", "Marshall Islands"),
+    ("midwayislands", "Midway Islands"),
+    ("misr", "Egypt"),
+    ("mk", "North Macedonia"),
+    ("ml", "Mali"),
+    ("mm", "Myanmar (Burma)"),
+    ("mn", "Mongolia"),
+    ("mo", "Macao"),
+    ("mocambique", "Mozambique"),
+    ("moldavia", "Moldova"),
+    ("mongol uls", "Mongolia"),
+    ("mongoluls", "Mongolia"),
+    ("mongγol ulus", "Mongolia"),
+    ("mongγolulus", "Mongolia"),
+    ("moris", "Mauritius"),
+    ("moçambique", "Mozambique"),
+    ("mp", "Northern Mariana Islands"),
+    ("mq", "Martinique"),
+    ("mr", "Mauritania"),
+    ("ms", "Montserrat"),
+    ("mt", "Malta"),
+    ("mu", "Mauritius"),
+    ("mueang thai", "Thailand"),
+    ("mueangthai", "Thailand"),
+    ("muritan", "Mauritania"),
+    ("muritaniya", "Mauritania"),
+    ("muscat and oman", "Oman"),
+    ("muscatandoman", "Oman"),
+    ("mv", "Maldives"),
+    ("mw", "Malawi"),
+    ("mx", "Mexico"),
+    ("my", "Malaysia"),
+    ("myanma", "Myanmar (Burma)"),
+    ("myanmar(burma)", "Myanmar (Burma)"),
+    ("mz", "Mozambique"),
+    ("méxico", "Mexico"),
+    ("mēxihco", "Mexico"),
+    ("mūrītānyā", "Mauritania"),
+    ("mǎláixīyà", "Malaysia"),
+    ("na", "Namibia"),
+    ("namhan", "South Korea"),
+    ("namibië", "Namibia"),
+    ("naoero", "Nauru"),
+    ("navassaisland", "Navassa Island"),
+    ("naíjíríà", "Nigeria"),
+    ("nc", "New Caledonia"),
+    ("ne", "Niger"),
+    ("nederland", "Netherlands"),
+    ("nederlân", "Netherlands"),
+    ("nepāl", "Nepal"),
+    ("new hebrides", "Vanuatu"),
+    ("newcaledonia", "New Caledonia"),
+    ("newhebrides", "Vanuatu"),
+    ("newzealand", "New Zealand"),
+    ("nf", "Norfolk Island"),
+    ("ng", "Nigeria"),
+    ("ngwane", "Eswatini"),
+    ("nihon", "Japan"),
+    ("nijar", "Niger"),
+    ("nijeriya", "Nigeria"),
+    ("nippon", "Japan"),
+    ("niuē", "Niue"),
+    ("nl", "Netherlands"),
+    ("no", "Norway"),
+    ("noreg", "Norway"),
+    ("norfolkisland", "Norfolk Island"),
+    ("norge", "Norway"),
+    ("northern marianas", "Northern Mariana Islands"),
+    ("northern rhodesia", "Zambia"),
+    ("northernmarianaislands", "Northern Mariana Islands"),
+    ("northernmarianas", "Northern Mariana Islands"),
+    ("northernrhodesia", "Zambia"),
+    ("northkorea", "North Korea"),
+    ("northmacedonia", "North Macedonia"),
+    ("nouvellecalédonie", "New Caledonia"),
+    ("np", "Nepal"),
+    ("nr", "Nauru"),
+    ("nu", "Niue"),
+    ("nyasaland", "Malawi"),
+    ("nz", "New Zealand"),
+    ("occupiedpalestinianterritories", "Occupied Palestinian Territories"),
+    ("oesterreich", "Austria"),
+    ("om", "Oman"),
+    ("oriental republic of uruguay", "Uruguay"),
+    ("orientalrepublicofuruguay", "Uruguay"),
+    ("osterreich", "Austria"),
+    ("outer mongolia", "Mongolia"),
+    ("outermongolia", "Mongolia"),
+    ("o‘zbekiston", "Uzbekistan"),
+    ("o’zbekstan", "Uzbekistan"),
+    ("pa", "Panama"),
+    ("palmyraatoll", "Palmyra Atoll"),
+    ("panamá", "Panama"),
+    ("papua niugini", "Papua New Guinea"),
+    ("papuanewguinea", "Papua New Guinea"),
+    ("papuaniugini", "Papua New Guinea"),
+    ("paraguái", "Paraguay"),
+    ("pe", "Peru"),
+    ("pelew", "Palau"),
+    ("peoples republic", "China"),
+    ("peoplesrepublic", "China"),
+    ("persia", "Iran"),
+    ("perú", "Peru"),
+    ("pf", "French Polynesia"),
+    ("pg", "Papua New Guinea"),
+    ("ph", "Philippines"),
+    ("philippine islands", "Philippines"),
+    ("philippineislands", "Philippines"),
+    ("phillippine", "Philippines"),
+    ("pilipinas", "Philippines"),
+    ("pinas", "Philippines"),
+    ("piruw", "Peru"),
+    ("pitcairn", "Pitcairn, Henderson, Ducie and Oeno Islands"),
+    (
+        "pitcairn,henderson,ducieandoenoislands",
+        "Pitcairn, Henderson, Ducie and Oeno Islands",
+    ),
+    ("pk", "Pakistan"),
+    ("pl", "Poland"),
+    ("plurinational state of bolivia", "Bolivia"),
+    ("plurinationalstateofbolivia", "Bolivia"),
+    ("pm", "Saint Pierre and Miquelon"),
+    ("pn", "Pitcairn, Henderson, Ducie and Oeno Islands"),
+    ("png", "Papua New Guinea"),
+    ("polska", "Poland"),
+    ("polynésie française", "French Polynesia"),
+    ("polynésiefrançaise", "French Polynesia"),
+    ("porto rico", "Puerto Rico"),
+    ("portorico", "Puerto Rico"),
+    ("portuguesa", "Portugal"),
+    ("portuguese guinea", "Guinea-Bissau"),
+    ("portuguese republic", "Portugal"),
+    ("portugueseguinea", "Guinea-Bissau"),
+    ("portugueserepublic", "Portugal"),
+    ("pr", "Puerto Rico"),
+    ("prathet thai", "Thailand"),
+    ("prathetthai", "Thailand"),
+    ("prc", "China"),
+    ("principality of andorra", "Andorra"),
+    ("principality of liechtenstein", "Liechtenstein"),
+    ("principality of monaco", "Monaco"),
+    ("principalityofandorra", "Andorra"),
+    ("principalityofliechtenstein", "Liechtenstein"),
+    ("principalityofmonaco", "Monaco"),
+    ("prk", "North Korea"),
+    ("ps", "Occupied Palestinian Territories"),
+    ("pt", "Portugal"),
+    ("puarto rico", "Puerto Rico"),
+    ("puartorico", "Puerto Rico"),
+    ("puertorico", "Puerto Rico"),
+    ("pw", "Palau"),
+    ("py", "Paraguay"),
+    ("qa", "Qatar"),
+    ("qazaqstan", "Kazakhstan"),
+    ("rasalkhaimah", "Ras al-Khaimah"),
+    ("rastafari", "Jamaica"),
+    ("rastas", "Jamaica"),
+    ("ratchaanachak thai", "Thailand"),
+    ("ratchaanachakthai", "Thailand"),
+    ("re", "Réunion"),
+    ("rep of ireland", "Ireland"),
+    ("repubblica", "San Marino"),
+    ("repubilika ya kongo", "Congo (Democratic Republic)"),
+    ("repubilikayakongo", "Congo (Democratic Republic)"),
+    ("republic of albania", "Albania"),
+    ("republic of angola", "Angola"),
+    ("republic of armenia", "Armenia"),
+    ("republic of austria", "Austria"),
+    ("republic of azerbaijan", "Azerbaijan"),
+    ("republic of belarusbelorussia", "Belarus"),
+    ("republic of benin", "Benin"),
+    ("republic of bosnia and herzegovina", "Bosnia and Herzegovina"),
+    ("republic of botswana", "Botswana"),
+    ("republic of bulgaria", "Bulgaria"),
+    ("republic of burundi", "Burundi"),
+    ("republic of cabo verde", "Cape Verde"),
+    ("republic of cameroon", "Cameroon"),
+    ("republic of chad", "Chad"),
+    ("republic of chile", "Chile"),
+    ("republic of colombia", "Colombia"),
+    ("republic of costa rica", "Costa Rica"),
+    ("republic of croatia", "Croatia"),
+    ("republic of cuba", "Cuba"),
+    ("republic of cyprus", "Cyprus"),
+    ("republic of djibouti", "Djibouti"),
+    ("republic of ecuador", "Ecuador"),
+    ("republic of el salvador", "El Salvador"),
+    ("republic of equatorial guinea", "Equatorial Guinea"),
+    ("republic of estonia", "Estonia"),
+    ("republic of fiji", "Fiji"),
+    ("republic of finland", "Finland"),
+    ("republic of ghana", "Ghana"),
+    ("republic of guatemala", "Guatemala"),
+    ("republic of guinea", "Guinea"),
+    ("republic of guineabissau", "Guinea-Bissau"),
+    ("republic of haiti", "Haiti"),
+    ("republic of honduras", "Honduras"),
+    ("republic of iceland", "Iceland"),
+    ("republic of india", "India"),
+    ("republic of indonesia", "Indonesia"),
+    ("republic of iraq", "Iraq"),
+    ("republic of ireland", "Ireland"),
+    ("republic of kazakhstankazak", "Kazakhstan"),
+    ("republic of kenya", "Kenya"),
+    ("republic of kiribati", "Kiribati"),
+    ("republic of korea", "South Korea"),
+    ("republic of kosovo", "Kosovo"),
+    ("republic of latvia", "Latvia"),
+    ("republic of liberia", "Liberia"),
+    ("republic of lithuanialietuva", "Lithuania"),
+    ("republic of macedonia", "North Macedonia"),
+    ("republic of madagascar", "Madagascar"),
+    ("republic of malawi", "Malawi"),
+    ("republic of maldives", "Maldives"),
+    ("republic of mali", "Mali"),
+    ("republic of malta", "Malta"),
+    ("republic of mauritius", "Mauritius"),
+    ("republic of moldova", "Moldova"),
+    ("republic of mozambique", "Mozambique"),
+    ("republic of namibia", "Namibia"),
+    ("republic of nauru", "Nauru"),
+    ("republic of nicaragua", "Nicaragua"),
+    ("republic of niger", "Niger"),
+    ("republic of palau", "Palau"),
+    ("republic of panama", "Panama"),
+    ("republic of paraguay", "Paraguay"),
+    ("republic of peru", "Peru"),
+    ("republic of poland", "Poland"),
+    ("republic of rwandaruanda", "Rwanda"),
+    ("republic of san marino", "San Marino"),
+    ("republic of senegal", "Senegal"),
+    ("republic of serbia", "Serbia"),
+    ("republic of seychelles", "Seychelles"),
+    ("republic of sierra leone", "Sierra Leone"),
+    ("republic of singapore", "Singapore"),
+    ("republic of slovenia", "Slovenia"),
+    ("republic of south africa", "South Africa"),
+    ("republic of south sudan", "South Sudan"),
+    ("republic of suriname", "Suriname"),
+    ("republic of tajikistantadjik", "Tajikistan"),
+    ("republic of the congo", "Congo"),
+    ("republic of the marshall islands", "Marshall Islands"),
+    ("republic of the philippines", "Philippines"),
+    ("republic of the sudan", "Sudan"),
+    ("republic of the union of myanmar", "Myanmar (Burma)"),
+    ("republic of trinidad and tobago", "Trinidad and Tobago"),
+    ("republic of turkey", "Turkey"),
+    ("republic of uganda", "Uganda"),
+    ("republic of uzbekistan", "Uzbekistan"),
+    ("republic of vanuatu", "Vanuatu"),
+    ("republic of yemen", "Yemen"),
+    ("republic of zambia", "Zambia"),
+    ("republic of zimbabwe", "Zimbabwe"),
+    ("republicofalbania", "Albania"),
+    ("republicofangola", "Angola"),
+    ("republicofarmenia", "Armenia"),
+    ("republicofaustria", "Austria"),
+    ("republicofazerbaijan", "Azerbaijan"),
+    ("republicofbelarusbelorussia", "Belarus"),
+    ("republicofbenin", "Benin"),
+    ("republicofbosniaandherzegovina", "Bosnia and Herzegovina"),
+    ("republicofbotswana", "Botswana"),
+    ("republicofbulgaria", "Bulgaria"),
+    ("republicofburundi", "Burundi"),
+    ("republicofcaboverde", "Cape Verde"),
+    ("republicofcameroon", "Cameroon"),
+    ("republicofchad", "Chad"),
+    ("republicofchile", "Chile"),
+    ("republicofcolombia", "Colombia"),
+    ("republicofcostarica", "Costa Rica"),
+    ("republicofcroatia", "Croatia"),
+    ("republicofcuba", "Cuba"),
+    ("republicofcyprus", "Cyprus"),
+    ("republicofdjibouti", "Djibouti"),
+    ("republicofecuador", "Ecuador"),
+    ("republicofelsalvador", "El Salvador"),
+    ("republicofequatorialguinea", "Equatorial Guinea"),
+    ("republicofestonia", "Estonia"),
+    ("republicoffiji", "Fiji"),
+    ("republicoffinland", "Finland"),
+    ("republicofghana", "Ghana"),
+    ("republicofguatemala", "Guatemala"),
+    ("republicofguinea", "Guinea"),
+    ("republicofguineabissau", "Guinea-Bissau"),
+    ("republicofhaiti", "Haiti"),
+    ("republicofhonduras", "Honduras"),
+    ("republicoficeland", "Iceland"),
+    ("republicofindia", "India"),
+    ("republicofindonesia", "Indonesia"),
+    ("republicofiraq", "Iraq"),
+    ("republicofireland", "Ireland"),
+    ("republicofkazakhstankazak", "Kazakhstan"),
+    ("republicofkenya", "Kenya"),
+    ("republicofkiribati", "Kiribati"),
+    ("republicofkorea", "South Korea"),
+    ("republicofkosovo", "Kosovo"),
+    ("republicoflatvia", "Latvia"),
+    ("republicofliberia", "Liberia"),
+    ("republicoflithuanialietuva", "Lithuania"),
+    ("republicofmacedonia", "North Macedonia"),
+    ("republicofmadagascar", "Madagascar"),
+    ("republicofmalawi", "Malawi"),
+    ("republicofmaldives", "Maldives"),
+    ("republicofmali", "Mali"),
+    ("republicofmalta", "Malta"),
+    ("republicofmauritius", "Mauritius"),
+    ("republicofmoldova", "Moldova"),
+    ("republicofmozambique", "Mozambique"),
+    ("republicofnamibia", "Namibia"),
+    ("republicofnauru", "Nauru"),
+    ("republicofnicaragua", "Nicaragua"),
+    ("republicofniger", "Niger"),
+    ("republicofpalau", "Palau"),
+    ("republicofpanama", "Panama"),
+    ("republicofparaguay", "Paraguay"),
+    ("republicofperu", "Peru"),
+    ("republicofpoland", "Poland"),
+    ("republicofrwandaruanda", "Rwanda"),
+    ("republicofsanmarino", "San Marino"),
+    ("republicofsenegal", "Senegal"),
+    ("republicofserbia", "Serbia"),
+    ("republicofseychelles", "Seychelles"),
+    ("republicofsierraleone", "Sierra Leone"),
+    ("republicofsingapore", "Singapore"),
+    ("republicofslovenia", "Slovenia"),
+    ("republicofsouthafrica", "South Africa"),
+    ("republicofsouthsudan", "South Sudan"),
+    ("republicofsuriname", "Suriname"),
+    ("republicoftajikistantadjik", "Tajikistan"),
+    ("republicofthecongo", "Congo"),
+    ("republicofthemarshallislands", "Marshall Islands"),
+    ("republicofthephilippines", "Philippines"),
+    ("republicofthesudan", "Sudan"),
+    ("republicoftheunionofmyanmar", "Myanmar (Burma)"),
+    ("republicoftrinidadandtobago", "Trinidad and Tobago"),
+    ("republicofturkey", "Turkey"),
+    ("republicofuganda", "Uganda"),
+    ("republicofuzbekistan", "Uzbekistan"),
+    ("republicofvanuatu", "Vanuatu"),
+    ("republicofyemen", "Yemen"),
+    ("republicofzambia", "Zambia"),
+    ("republicofzimbabwe", "Zimbabwe"),
+    ("república dominicana", "Dominican Republic"),
+    ("república oriental del uruguay", "Uruguay"),
+    ("repúblicadominicana", "Dominican Republic"),
+    ("repúblicaorientaldeluruguay", "Uruguay"),
+    ("reunion", "Réunion"),
+    ("rgypt", "Egypt"),
+    ("rhodesia", "Zimbabwe"),
+    ("ro", "Romania"),
+    ("roi", "Ireland"),
+    ("românia", "Romania"),
+    ("rossiya", "Russia"),
+    ("rossiâ", "Russia"),
+    ("roumania", "Romania"),
+    ("rs", "Serbia"),
+    ("rsa", "South Africa"),
+    ("rsm", "San Marino"),
+    ("ru", "Russia"),
+    ("rumania", "Romania"),
+    ("russian federation", "Russia"),
+    ("russianfederation", "Russia"),
+    ("rw", "Rwanda"),
+    ("rwandese republic", "Rwanda"),
+    ("rwandeserepublic", "Rwanda"),
+    ("république centrafricaine", "Central African Republic"),
+    ("république du congo", "Congo"),
+    ("république démocratique du congo", "Congo (Democratic Republic)"),
+    ("république française", "France"),
+    ("république gabonaise", "Gabon"),
+    ("républiquecentrafricaine", "Central African Republic"),
+    ("républiqueducongo", "Congo"),
+    ("républiquedémocratiqueducongo", "Congo (Democratic Republic)"),
+    ("républiquefrançaise", "France"),
+    ("républiquegabonaise", "Gabon"),
+    ("sa", "Saudi Arabia"),
+    ("saint lucia", "St Lucia"),
+    ("saint vincent and the grenadines", "St Vincent"),
+    ("saintbarthélemy", "Saint Barthélemy"),
+    ("sainthelena", "Saint Helena"),
+    ("saintlucia", "St Lucia"),
+    ("saintmartin(frenchpart)", "Saint-Martin (French part)"),
+    ("saintpierre et miquelon", "Saint Pierre and Miquelon"),
+    ("saintpierreandmiquelon", "Saint Pierre and Miquelon"),
+    ("saintpierreetmiquelon", "Saint Pierre and Miquelon"),
+    ("saintvincentandthegrenadines", "St Vincent"),
+    ("sakartvelo", "Georgia"),
+    ("salvador", "El Salvador"),
+    ("samo", "Samoa"),
+    ("samoa i sisifo", "Samoa"),
+    ("samoaisisifo", "Samoa"),
+    ("sanmarino", "San Marino"),
+    ("sao thome e principe", "Sao Tome and Principe"),
+    ("sao tome e principe", "Sao Tome and Principe"),
+    ("saothomeeprincipe", "Sao Tome and Principe"),
+    ("saotomeandprincipe", "Sao Tome and Principe"),
+    ("saotomeeprincipe", "Sao Tome and Principe"),
+    ("sarnam sranangron", "Suriname"),
+    ("sarnam", "Suriname"),
+    ("sarnamsranangron", "Suriname"),
+    ("saudiarabia", "Saudi Arabia"),
+    ("sb", "Solomon Islands"),
+    ("sc", "Seychelles"),
+    ("schweiz", "Switzerland"),
+    ("sd", "Sudan"),
+    ("se", "Sweden"),
+    ("sesel", "Seychelles"),
+    ("sg", "Singapore"),
+    ("shac", "Ascension"),
+    ("shhl", "Saint Helena"),
+    ("shqipëria", "Albania"),
+    ("shta", "Tristan da Cunha"),
+    ("si", "Slovenia"),
+    ("siam", "Thailand"),
+    ("sierraleone", "Sierra Leone"),
+    ("singapur", "Singapore"),
+    ("singapura", "Singapore"),
+    ("sint maarten", "Sint Maarten (Dutch part)"),
+    ("sinteustatius", "Sint Eustatius"),
+    ("sintmaarten", "Sint Maarten (Dutch part)"),
+    ("sintmaarten(dutchpart)", "Sint Maarten (Dutch part)"),
+    ("sion", "Israel"),
+    ("sj", "Svalbard and Jan Mayen"),
+    ("sk", "Slovakia"),
+    ("sl", "Sierra Leone"),
+    ("slovak republic", "Slovakia"),
+    ("slovakrepublic", "Slovakia"),
+    ("slovenija", "Slovenia"),
+    ("slovensko", "Slovakia"),
+    ("slovenská", "Slovakia"),
+    ("sm", "San Marino"),
+    ("sn", "Senegal"),
+    ("so", "Somalia"),
+    ("socialist republic of vietnam", "Vietnam"),
+    ("socialistrepublicofvietnam", "Vietnam"),
+    ("solomon aelan", "Solomon Islands"),
+    ("solomonaelan", "Solomon Islands"),
+    ("solomonislands", "Solomon Islands"),
+    ("solomons", "Solomon Islands"),
+    ("soomaaliya", "Somalia"),
+    ("soudan", "Sudan"),
+    (
+        "south georgia and the south sandwich islands",
+        "South Georgia and South Sandwich Islands",
+    ),
+    ("south west africa", "Namibia"),
+    ("southafrica", "South Africa"),
+    ("southgeorgiaandsouthsandwichislands", "South Georgia and South Sandwich Islands"),
+    (
+        "southgeorgiaandthesouthsandwichislands",
+        "South Georgia and South Sandwich Islands",
+    ),
+    ("southkorea", "South Korea"),
+    ("southsudan", "South Sudan"),
+    ("southwestafrica", "Namibia"),
+    ("sovereign base areas of akrotiri and dhekelia", "Dhekelia"),
+    ("sovereignbaseareasofakrotirianddhekelia", "Dhekelia"),
+    ("spanish guinea", "Equatorial Guinea"),
+    ("spanishguinea", "Equatorial Guinea"),
+    ("sr", "Suriname"),
+    ("sranangron", "Suriname"),
+    ("srbija", "Serbia"),
+    ("sri lankā", "Sri Lanka"),
+    ("srilanka", "Sri Lanka"),
+    ("srilankā", "Sri Lanka"),
+    ("ss", "South Sudan"),
+    ("st barth", "Saint Barthélemy"),
+    ("st barthelemy", "Saint Barthélemy"),
+    ("st thomas and principe", "Sao Tome and Principe"),
+    ("st", "Sao Tome and Principe"),
+    ("state of bahrain", "Bahrain"),
+    ("state of eritrea", "Eritrea"),
+    ("state of israel", "Israel"),
+    ("state of kuwait", "Kuwait"),
+    ("state of qatar", "Qatar"),
+    ("stateofbahrain", "Bahrain"),
+    ("stateoferitrea", "Eritrea"),
+    ("stateofisrael", "Israel"),
+    ("stateofkuwait", "Kuwait"),
+    ("stateofqatar", "Qatar"),
+    ("stbarth", "Saint Barthélemy"),
+    ("stbarthelemy", "Saint Barthélemy"),
+    ("stkittsandnevis", "St Kitts and Nevis"),
+    ("stlucia", "St Lucia"),
+    ("stthomasandprincipe", "Sao Tome and Principe"),
+    ("stvincent", "St Vincent"),
+    ("suidafrika", "South Africa"),
+    ("suisse", "Switzerland"),
+    ("sultanate of oman", "Oman"),
+    ("sultanateofoman", "Oman"),
+    ("suomi", "Finland"),
+    ("suriyah", "Syria"),
+    ("sv", "El Salvador"),
+    ("svalbardandjanmayen", "Svalbard and Jan Mayen"),
+    ("sverige", "Sweden"),
+    ("svizra", "Switzerland"),
+    ("svizzera", "Switzerland"),
+    ("swatini", "Eswatini"),
+    ("swiss confederation", "Switzerland"),
+    ("swissconfederation", "Switzerland"),
+    ("switerland", "Switzerland"),
+    ("sx", "Sint Maarten (Dutch part)"),
+    ("sy", "Syria"),
+    ("syrian arab republic", "Syria"),
+    ("syrianarabrepublic", "Syria"),
+    ("sz", "Eswatini"),
+    ("são tomé e príncipe", "Sao Tome and Principe"),
+    ("sãotoméepríncipe", "Sao Tome and Principe"),
+    ("sénégal", "Senegal"),
+    ("tadzhik", "Tajikistan"),
+    ("tadzhikistan", "Tajikistan"),
+    ("tajik", "Tajikistan"),
+    ("tc", "Turks and Caicos Islands"),
+    ("tchad", "Chad"),
+    ("td", "Chad"),
+    ("territory of american samoa", "American Samoa"),
+    ("territory of christmas island", "Christmas Island"),
+    ("territory of guam", "Guam"),
+    (
+        "territory of heard island and mcdonald islands",
+        "Heard Island and McDonald Islands",
+    ),
+    ("territory of norfolk island", "Norfolk Island"),
+    ("territory of the cocos (keeling) islands", "Cocos (Keeling) Islands"),
+    ("territory of the wallis and futuna islands", "Wallis and Futuna"),
+    ("territoryofamericansamoa", "American Samoa"),
+    ("territoryofchristmasisland", "Christmas Island"),
+    ("territoryofguam", "Guam"),
+    ("territoryofheardislandandmcdonaldislands", "Heard Island and McDonald Islands"),
+    ("territoryofnorfolkisland", "Norfolk Island"),
+    ("territoryofthecocos(keeling)islands", "Cocos (Keeling) Islands"),
+    ("territoryofthewallisandfutunaislands", "Wallis and Futuna"),
+    ("tf", "French Southern Territories"),
+    ("tg", "Togo"),
+    ("th", "Thailand"),
+    ("the arab republic of egypt", "Egypt"),
+    ("the argentine republic", "Argentina"),
+    ("the bolivarian republic of venezuela", "Venezuela"),
+    ("the british indian ocean territory", "British Indian Ocean Territory"),
+    ("the central african republic", "Central African Republic"),
+    ("the commonwealth of australia", "Australia"),
+    ("the commonwealth of dominica", "Dominica"),
+    ("the commonwealth of the bahamas", "The Bahamas"),
+    ("the cooperative republic of guyana", "Guyana"),
+    ("the czech republic", "Czechia"),
+    ("the democratic republic of sao tome and principe", "Sao Tome and Principe"),
+    ("the democratic republic of the congo", "Congo (Democratic Republic)"),
+    ("the democratic republic of timorleste", "East Timor"),
+    ("the democratic socialist republic of sri lanka", "Sri Lanka"),
+    ("the dominican republic", "Dominican Republic"),
+    ("the federal democratic republic of ethiopia", "Ethiopia"),
+    ("the federal democratic republic of nepal", "Nepal"),
+    ("the federal republic of germany", "Germany"),
+    ("the federal republic of nigeria", "Nigeria"),
+    ("the federated states of micronesia", "Micronesia"),
+    ("the federation of saint christopher and nevis", "St Kitts and Nevis"),
+    ("the federative republic of brazil", "Brazil"),
+    ("the french republic", "France"),
+    ("the gabonese republic", "Gabon"),
+    ("the grand duchy of luxembourg", "Luxembourg"),
+    ("the hashemite kingdom of jordan", "Jordan"),
+    ("the hellenic republic", "Greece"),
+    ("the independent state of papua new guinea", "Papua New Guinea"),
+    ("the independent state of samoa", "Samoa"),
+    ("the islamic republic of afghanistan", "Afghanistan"),
+    ("the islamic republic of iran", "Iran"),
+    ("the islamic republic of mauritania", "Mauritania"),
+    ("the islamic republic of pakistan", "Pakistan"),
+    ("the italian republic", "Italy"),
+    ("the kingdom of bahrain", "Bahrain"),
+    ("the kingdom of belgium", "Belgium"),
+    ("the kingdom of bhutan", "Bhutan"),
+    ("the kingdom of cambodia", "Cambodia"),
+    ("the kingdom of denmark", "Denmark"),
+    ("the kingdom of lesotho", "Lesotho"),
+    ("the kingdom of morocco", "Morocco"),
+    ("the kingdom of norway", "Norway"),
+    ("the kingdom of saudi arabia", "Saudi Arabia"),
+    ("the kingdom of spain", "Spain"),
+    ("the kingdom of swaziland", "Eswatini"),
+    ("the kingdom of sweden", "Sweden"),
+    ("the kingdom of thailand", "Thailand"),
+    ("the kingdom of the netherlands", "Netherlands"),
+    ("the kingdom of tonga", "Tonga"),
+    ("the kyrgyz republic", "Kyrgyzstan"),
+    ("the lebanese republic", "Lebanon"),
+    ("the occupied palestinian territories", "Occupied Palestinian Territories"),
+    ("the oriental republic of uruguay", "Uruguay"),
+    ("the plurinational state of bolivia", "Bolivia"),
+    ("the portuguese republic", "Portugal"),
+    ("the principality of andorra", "Andorra"),
+    ("the principality of liechtenstein", "Liechtenstein"),
+    ("the principality of monaco", "Monaco"),
+    ("the republic of albania", "Albania"),
+    ("the republic of angola", "Angola"),
+    ("the republic of armenia", "Armenia"),
+    ("the republic of austria", "Austria"),
+    ("the republic of azerbaijan", "Azerbaijan"),
+    ("the republic of belarus", "Belarus"),
+    ("the republic of benin", "Benin"),
+    ("the republic of botswana", "Botswana"),
+    ("the republic of bulgaria", "Bulgaria"),
+    ("the republic of burundi", "Burundi"),
+    ("the republic of cabo verde", "Cape Verde"),
+    ("the republic of cameroon", "Cameroon"),
+    ("the republic of chad", "Chad"),
+    ("the republic of chile", "Chile"),
+    ("the republic of colombia", "Colombia"),
+    ("the republic of costa rica", "Costa Rica"),
+    ("the republic of croatia", "Croatia"),
+    ("the republic of cuba", "Cuba"),
+    ("the republic of cyprus", "Cyprus"),
+    ("the republic of djibouti", "Djibouti"),
+    ("the republic of ecuador", "Ecuador"),
+    ("the republic of el salvador", "El Salvador"),
+    ("the republic of equatorial guinea", "Equatorial Guinea"),
+    ("the republic of estonia", "Estonia"),
+    ("the republic of fiji", "Fiji"),
+    ("the republic of finland", "Finland"),
+    ("the republic of ghana", "Ghana"),
+    ("the republic of guatemala", "Guatemala"),
+    ("the republic of guinea", "Guinea"),
+    ("the republic of guineabissau", "Guinea-Bissau"),
+    ("the republic of haiti", "Haiti"),
+    ("the republic of honduras", "Honduras"),
+    ("the republic of iceland", "Iceland"),
+    ("the republic of india", "India"),
+    ("the republic of indonesia", "Indonesia"),
+    ("the republic of iraq", "Iraq"),
+    ("the republic of kazakhstan", "Kazakhstan"),
+    ("the republic of kenya", "Kenya"),
+    ("the republic of kiribati", "Kiribati"),
+    ("the republic of korea", "South Korea"),
+    ("the republic of kosovo", "Kosovo"),
+    ("the republic of latvia", "Latvia"),
+    ("the republic of liberia", "Liberia"),
+    ("the republic of lithuania", "Lithuania"),
+    ("the republic of macedonia", "North Macedonia"),
+    ("the republic of madagascar", "Madagascar"),
+    ("the republic of malawi", "Malawi"),
+    ("the republic of maldives", "Maldives"),
+    ("the republic of mali", "Mali"),
+    ("the republic of malta", "Malta"),
+    ("the republic of mauritius", "Mauritius"),
+    ("the republic of moldova", "Moldova"),
+    ("the republic of mozambique", "Mozambique"),
+    ("the republic of namibia", "Namibia"),
+    ("the republic of nauru", "Nauru"),
+    ("the republic of nicaragua", "Nicaragua"),
+    ("the republic of niger", "Niger"),
+    ("the republic of palau", "Palau"),
+    ("the republic of panama", "Panama"),
+    ("the republic of paraguay", "Paraguay"),
+    ("the republic of peru", "Peru"),
+    ("the republic of poland", "Poland"),
+    ("the republic of rwanda", "Rwanda"),
+    ("the republic of san marino", "San Marino"),
+    ("the republic of senegal", "Senegal"),
+    ("the republic of serbia", "Serbia"),
+    ("the republic of seychelles", "Seychelles"),
+    ("the republic of sierra leone", "Sierra Leone"),
+    ("the republic of singapore", "Singapore"),
+    ("the republic of slovenia", "Slovenia"),
+    ("the republic of south africa", "South Africa"),
+    ("the republic of south sudan", "South Sudan"),
+    ("the republic of suriname", "Suriname"),
+    ("the republic of tajikistan", "Tajikistan"),
+    ("the republic of the congo", "Congo"),
+    ("the republic of the gambia", "The Gambia"),
+    ("the republic of the marshall islands", "Marshall Islands"),
+    ("the republic of the philippines", "Philippines"),
+    ("the republic of the sudan", "Sudan"),
+    ("the republic of the union of myanmar", "Myanmar (Burma)"),
+    ("the republic of trinidad and tobago", "Trinidad and Tobago"),
+    ("the republic of turkey", "Turkey"),
+    ("the republic of uganda", "Uganda"),
+    ("the republic of uzbekistan", "Uzbekistan"),
+    ("the republic of vanuatu", "Vanuatu"),
+    ("the republic of yemen", "Yemen"),
+    ("the republic of zambia", "Zambia"),
+    ("the republic of zimbabwe", "Zimbabwe"),
+    ("the russian federation", "Russia"),
+    ("the slovak republic", "Slovakia"),
+    ("the socialist republic of vietnam", "Vietnam"),
+    ("the state of eritrea", "Eritrea"),
+    ("the state of israel", "Israel"),
+    ("the state of kuwait", "Kuwait"),
+    ("the state of qatar", "Qatar"),
+    ("the states", "United States"),
+    ("the sultanate of oman", "Oman"),
+    ("the swiss confederation", "Switzerland"),
+    ("the syrian arab republic", "Syria"),
+    ("the togolese republic", "Togo"),
+    ("the tunisian republic", "Tunisia"),
+    ("the union of the comoros", "Comoros"),
+    ("the united arab emirates", "United Arab Emirates"),
+    ("the united mexican states", "Mexico"),
+    ("the united republic of tanzania", "Tanzania"),
+    ("the united states of america", "United States"),
+    ("the virgin islands", "British Virgin Islands"),
+    ("thearabrepublicofegypt", "Egypt"),
+    ("theargentinerepublic", "Argentina"),
+    ("thebahamas", "The Bahamas"),
+    ("thebolivarianrepublicofvenezuela", "Venezuela"),
+    ("thebritishindianoceanterritory", "British Indian Ocean Territory"),
+    ("thecentralafricanrepublic", "Central African Republic"),
+    ("thecommonwealthofaustralia", "Australia"),
+    ("thecommonwealthofdominica", "Dominica"),
+    ("thecommonwealthofthebahamas", "The Bahamas"),
+    ("thecooperativerepublicofguyana", "Guyana"),
+    ("theczechrepublic", "Czechia"),
+    ("thedemocraticrepublicofsaotomeandprincipe", "Sao Tome and Principe"),
+    ("thedemocraticrepublicofthecongo", "Congo (Democratic Republic)"),
+    ("thedemocraticrepublicoftimorleste", "East Timor"),
+    ("thedemocraticsocialistrepublicofsrilanka", "Sri Lanka"),
+    ("thedominicanrepublic", "Dominican Republic"),
+    ("thefederaldemocraticrepublicofethiopia", "Ethiopia"),
+    ("thefederaldemocraticrepublicofnepal", "Nepal"),
+    ("thefederalrepublicofgermany", "Germany"),
+    ("thefederalrepublicofnigeria", "Nigeria"),
+    ("thefederatedstatesofmicronesia", "Micronesia"),
+    ("thefederationofsaintchristopherandnevis", "St Kitts and Nevis"),
+    ("thefederativerepublicofbrazil", "Brazil"),
+    ("thefrenchrepublic", "France"),
+    ("thegaboneserepublic", "Gabon"),
+    ("thegambia", "The Gambia"),
+    ("thegrandduchyofluxembourg", "Luxembourg"),
+    ("thehashemitekingdomofjordan", "Jordan"),
+    ("thehellenicrepublic", "Greece"),
+    ("theindependentstateofpapuanewguinea", "Papua New Guinea"),
+    ("theindependentstateofsamoa", "Samoa"),
+    ("theislamicrepublicofafghanistan", "Afghanistan"),
+    ("theislamicrepublicofiran", "Iran"),
+    ("theislamicrepublicofmauritania", "Mauritania"),
+    ("theislamicrepublicofpakistan", "Pakistan"),
+    ("theitalianrepublic", "Italy"),
+    ("thekingdomofbahrain", "Bahrain"),
+    ("thekingdomofbelgium", "Belgium"),
+    ("thekingdomofbhutan", "Bhutan"),
+    ("thekingdomofcambodia", "Cambodia"),
+    ("thekingdomofdenmark", "Denmark"),
+    ("thekingdomoflesotho", "Lesotho"),
+    ("thekingdomofmorocco", "Morocco"),
+    ("thekingdomofnorway", "Norway"),
+    ("thekingdomofsaudiarabia", "Saudi Arabia"),
+    ("thekingdomofspain", "Spain"),
+    ("thekingdomofswaziland", "Eswatini"),
+    ("thekingdomofsweden", "Sweden"),
+    ("thekingdomofthailand", "Thailand"),
+    ("thekingdomofthenetherlands", "Netherlands"),
+    ("thekingdomoftonga", "Tonga"),
+    ("thekyrgyzrepublic", "Kyrgyzstan"),
+    ("thelebaneserepublic", "Lebanon"),
+    ("theoccupiedpalestinianterritories", "Occupied Palestinian Territories"),
+    ("theorientalrepublicofuruguay", "Uruguay"),
+    ("theplurinationalstateofbolivia", "Bolivia"),
+    ("theportugueserepublic", "Portugal"),
+    ("theprincipalityofandorra", "Andorra"),
+    ("theprincipalityofliechtenstein", "Liechtenstein"),
+    ("theprincipalityofmonaco", "Monaco"),
+    ("therepublicofalbania", "Albania"),
+    ("therepublicofangola", "Angola"),
+    ("therepublicofarmenia", "Armenia"),
+    ("therepublicofaustria", "Austria"),
+    ("therepublicofazerbaijan", "Azerbaijan"),
+    ("therepublicofbelarus", "Belarus"),
+    ("therepublicofbenin", "Benin"),
+    ("therepublicofbotswana", "Botswana"),
+    ("therepublicofbulgaria", "Bulgaria"),
+    ("therepublicofburundi", "Burundi"),
+    ("therepublicofcaboverde", "Cape Verde"),
+    ("therepublicofcameroon", "Cameroon"),
+    ("therepublicofchad", "Chad"),
+    ("therepublicofchile", "Chile"),
+    ("therepublicofcolombia", "Colombia"),
+    ("therepublicofcostarica", "Costa Rica"),
+    ("therepublicofcroatia", "Croatia"),
+    ("therepublicofcuba", "Cuba"),
+    ("therepublicofcyprus", "Cyprus"),
+    ("therepublicofdjibouti", "Djibouti"),
+    ("therepublicofecuador", "Ecuador"),
+    ("therepublicofelsalvador", "El Salvador"),
+    ("therepublicofequatorialguinea", "Equatorial Guinea"),
+    ("therepublicofestonia", "Estonia"),
+    ("therepublicoffiji", "Fiji"),
+    ("therepublicoffinland", "Finland"),
+    ("therepublicofghana", "Ghana"),
+    ("therepublicofguatemala", "Guatemala"),
+    ("therepublicofguinea", "Guinea"),
+    ("therepublicofguineabissau", "Guinea-Bissau"),
+    ("therepublicofhaiti", "Haiti"),
+    ("therepublicofhonduras", "Honduras"),
+    ("therepublicoficeland", "Iceland"),
+    ("therepublicofindia", "India"),
+    ("therepublicofindonesia", "Indonesia"),
+    ("therepublicofiraq", "Iraq"),
+    ("therepublicofkazakhstan", "Kazakhstan"),
+    ("therepublicofkenya", "Kenya"),
+    ("therepublicofkiribati", "Kiribati"),
+    ("therepublicofkorea", "South Korea"),
+    ("therepublicofkosovo", "Kosovo"),
+    ("therepublicoflatvia", "Latvia"),
+    ("therepublicofliberia", "Liberia"),
+    ("therepublicoflithuania", "Lithuania"),
+    ("therepublicofmacedonia", "North Macedonia"),
+    ("therepublicofmadagascar", "Madagascar"),
+    ("therepublicofmalawi", "Malawi"),
+    ("therepublicofmaldives", "Maldives"),
+    ("therepublicofmali", "Mali"),
+    ("therepublicofmalta", "Malta"),
+    ("therepublicofmauritius", "Mauritius"),
+    ("therepublicofmoldova", "Moldova"),
+    ("therepublicofmozambique", "Mozambique"),
+    ("therepublicofnamibia", "Namibia"),
+    ("therepublicofnauru", "Nauru"),
+    ("therepublicofnicaragua", "Nicaragua"),
+    ("therepublicofniger", "Niger"),
+    ("therepublicofpalau", "Palau"),
+    ("therepublicofpanama", "Panama"),
+    ("therepublicofparaguay", "Paraguay"),
+    ("therepublicofperu", "Peru"),
+    ("therepublicofpoland", "Poland"),
+    ("therepublicofrwanda", "Rwanda"),
+    ("therepublicofsanmarino", "San Marino"),
+    ("therepublicofsenegal", "Senegal"),
+    ("therepublicofserbia", "Serbia"),
+    ("therepublicofseychelles", "Seychelles"),
+    ("therepublicofsierraleone", "Sierra Leone"),
+    ("therepublicofsingapore", "Singapore"),
+    ("therepublicofslovenia", "Slovenia"),
+    ("therepublicofsouthafrica", "South Africa"),
+    ("therepublicofsouthsudan", "South Sudan"),
+    ("therepublicofsuriname", "Suriname"),
+    ("therepublicoftajikistan", "Tajikistan"),
+    ("therepublicofthecongo", "Congo"),
+    ("therepublicofthegambia", "The Gambia"),
+    ("therepublicofthemarshallislands", "Marshall Islands"),
+    ("therepublicofthephilippines", "Philippines"),
+    ("therepublicofthesudan", "Sudan"),
+    ("therepublicoftheunionofmyanmar", "Myanmar (Burma)"),
+    ("therepublicoftrinidadandtobago", "Trinidad and Tobago"),
+    ("therepublicofturkey", "Turkey"),
+    ("therepublicofuganda", "Uganda"),
+    ("therepublicofuzbekistan", "Uzbekistan"),
+    ("therepublicofvanuatu", "Vanuatu"),
+    ("therepublicofyemen", "Yemen"),
+    ("therepublicofzambia", "Zambia"),
+    ("therepublicofzimbabwe", "Zimbabwe"),
+    ("therussianfederation", "Russia"),
+    ("theslovakrepublic", "Slovakia"),
+    ("thesocialistrepublicofvietnam", "Vietnam"),
+    ("thestateoferitrea", "Eritrea"),
+    ("thestateofisrael", "Israel"),
+    ("thestateofkuwait", "Kuwait"),
+    ("thestateofqatar", "Qatar"),
+    ("thestates", "United States"),
+    ("thesultanateofoman", "Oman"),
+    ("theswissconfederation", "Switzerland"),
+    ("thesyrianarabrepublic", "Syria"),
+    ("thetogoleserepublic", "Togo"),
+    ("thetunisianrepublic", "Tunisia"),
+    ("theunionofthecomoros", "Comoros"),
+    ("theunitedarabemirates", "United Arab Emirates"),
+    ("theunitedmexicanstates", "Mexico"),
+    ("theunitedrepublicoftanzania", "Tanzania"),
+    ("theunitedstatesofamerica", "United States"),
+    ("thevirginislands", "British Virgin Islands"),
+    ("timorleste", "East Timor"),
+    ("tj", "Tajikistan"),
+    ("tk", "Tokelau"),
+    ("tl", "East Timor"),
+    ("tm", "Turkmenistan"),
+    ("tn", "Tunisia"),
+    ("to", "Tonga"),
+    ("togolese republic", "Togo"),
+    ("togolese", "Togo"),
+    ("togoleserepublic", "Togo"),
+    ("tojikistan", "Tajikistan"),
+    ("toçikiston", "Tajikistan"),
+    ("tr", "Turkey"),
+    ("trinidadandtobago", "Trinidad and Tobago"),
+    ("tristandacunha", "Tristan da Cunha"),
+    ("tt", "Trinidad and Tobago"),
+    ("tunes", "Tunisia"),
+    ("tunisian republic", "Tunisia"),
+    ("tunisianrepublic", "Tunisia"),
+    ("turkiye", "Turkey"),
+    ("turkmen", "Turkmenistan"),
+    ("turkmenia", "Turkmenistan"),
+    ("turkomen", "Turkmenistan"),
+    ("turksandcaicosislands", "Turks and Caicos Islands"),
+    ("tv", "Tuvalu"),
+    ("tw", "Taiwan"),
+    ("tz", "Tanzania"),
+    ("táiwān", "Taiwan"),
+    ("türkiye", "Turkey"),
+    ("türkmenistan", "Turkmenistan"),
+    ("tšād", "Chad"),
+    ("tūns", "Tunisia"),
+    ("ua", "Ukraine"),
+    ("uae", "United Arab Emirates"),
+    ("ug", "Uganda"),
+    ("ukrayina", "Ukraine"),
+    ("ukraїna", "Ukraine"),
+    ("umbuso weswatini", "Eswatini"),
+    ("umbusoweswatini", "Eswatini"),
+    ("ummalquwain", "Umm al-Quwain"),
+    ("umzantsi afrika", "South Africa"),
+    ("umzantsiafrika", "South Africa"),
+    ("union of the comoros", "Comoros"),
+    ("unionofthecomoros", "Comoros"),
+    ("unit states", "United States"),
+    ("unite states", "United States"),
+    ("united arab republic", "Egypt"),
+    ("united mexican states", "Mexico"),
+    ("united republic of tanzania", "Tanzania"),
+    ("united sat", "United States"),
+    ("united staes", "United States"),
+    ("united stated", "United States"),
+    ("united states america", "United States"),
+    ("united states of america", "United States"),
+    ("united stats", "United States"),
+    ("united sttes", "United States"),
+    ("unitedarabemirates", "United Arab Emirates"),
+    ("unitedarabrepublic", "Egypt"),
+    ("unitedmexicanstates", "Mexico"),
+    ("unitedrepublicoftanzania", "Tanzania"),
+    ("unitedsat", "United States"),
+    ("unitedstaes", "United States"),
+    ("unitedstated", "United States"),
+    ("unitedstates", "United States"),
+    ("unitedstatesofamerica", "United States"),
+    ("unitedstatesvirginislands", "United States Virgin Islands"),
+    ("unitedstats", "United States"),
+    ("unitedsttes", "United States"),
+    ("unites states", "United States"),
+    ("unitesstates", "United States"),
+    ("unitestates", "United States"),
+    ("unitstates", "United States"),
+    ("untied state", "United States"),
+    ("untiedstate", "United States"),
+    ("us", "United States"),
+    ("usa", "United States"),
+    ("uvea mo futuna", "Wallis and Futuna"),
+    ("uveamofutuna", "Wallis and Futuna"),
+    ("uy", "Uruguay"),
+    ("uz", "Uzbekistan"),
+    ("uzbek", "Uzbekistan"),
+    ("va", "Vatican City"),
+    ("vatican city state", "Vatican City"),
+    ("vaticancity", "Vatican City"),
+    ("vaticancitystate", "Vatican City"),
+    ("vc", "St Vincent"),
+    ("ve", "Venezuela"),
+    ("veitnam", "Vietnam"),
+    ("venezula", "Venezuela"),
+    ("vg", "British Virgin Islands"),
+    ("vi", "United States Virgin Islands"),
+    ("vietman", "Vietnam"),
+    ("virgin islands of the united states", "United States Virgin Islands"),
+    ("virgin islands", "British Virgin Islands"),
+    ("virgina islands", "British Virgin Islands"),
+    ("virginaislands", "British Virgin Islands"),
+    ("virginislands", "British Virgin Islands"),
+    ("virginislandsoftheunitedstates", "United States Virgin Islands"),
+    ("viti", "Fiji"),
+    ("việt nam", "Vietnam"),
+    ("việtnam", "Vietnam"),
+    ("vn", "Vietnam"),
+    ("volta", "Burkina Faso"),
+    ("volívia", "Bolivia"),
+    ("vu", "Vanuatu"),
+    ("wakeisland", "Wake Island"),
+    ("wallisandfutuna", "Wallis and Futuna"),
+    ("wallisetfutuna", "Wallis and Futuna"),
+    ("west pakistan", "Pakistan"),
+    ("western samoa", "Samoa"),
+    ("westernsahara", "Western Sahara"),
+    ("westernsamoa", "Samoa"),
+    ("westpakistan", "Pakistan"),
+    ("weswatini swatini ngwane", "Eswatini"),
+    ("weswatini", "Eswatini"),
+    ("weswatiniswatiningwane", "Eswatini"),
+    ("wf", "Wallis and Futuna"),
+    ("white russia", "Belarus"),
+    ("whiterussia", "Belarus"),
+    ("ws", "Samoa"),
+    ("wuliwya", "Bolivia"),
+    ("xk", "Kosovo"),
+    ("xqz", "Akrotiri"),
+    ("xxd", "Dhekelia"),
+    ("xīnjiāpō", "Singapore"),
+    ("yaltopya", "Ethiopia"),
+    ("ye", "Yemen"),
+    ("yisrael", "Israel"),
+    ("yt", "Mayotte"),
+    ("za", "South Africa"),
+    ("zealnd", "New Zealand"),
+    ("zeland", "New Zealand"),
+    ("zhongguo", "China"),
+    ("zhonghua peoples republic", "China"),
+    ("zhonghua", "China"),
+    ("zhonghuapeoplesrepublic", "China"),
+    ("zhōngguó", "China"),
+    ("zhōnghuá mínguó", "Taiwan"),
+    ("zhōnghuámínguó", "Taiwan"),
+    ("zion", "Israel"),
+    ("zm", "Zambia"),
+    ("ztate of katar", "Qatar"),
+    ("ztateofkatar", "Qatar"),
+    ("zw", "Zimbabwe"),
+    ("åland", "Åland Islands"),
+    ("ålandislands", "Åland Islands"),
+    ("éire", "Ireland"),
+    ("étatsunis", "United States"),
+    ("ísland", "Iceland"),
+    ("îraq", "Iraq"),
+    ("österreich", "Austria"),
+    ("česko", "Czechia"),
+    ("česká republika", "Czechia"),
+    ("česká", "Czechia"),
+    ("českárepublika", "Czechia"),
+    ("īrān", "Iran"),
+    ("ελλάδα", "Greece"),
+    ("ελλάς", "Greece"),
+    ("κύπρος", "Cyprus"),
+    ("беларусь", "Belarus"),
+    ("босна и херцеговина", "Bosnia and Herzegovina"),
+    ("боснаихерцеговина", "Bosnia and Herzegovina"),
+    ("българия", "Bulgaria"),
+    ("казахстан", "Kazakhstan"),
+    ("киргизия", "Kyrgyzstan"),
+    ("косово", "Kosovo"),
+    ("кыргызстан", "Kyrgyzstan"),
+    ("македонија", "North Macedonia"),
+    ("монгол улс", "Mongolia"),
+    ("монголулс", "Mongolia"),
+    ("российская", "Russia"),
+    ("россия", "Russia"),
+    ("србија srbija", "Serbia"),
+    ("србија", "Serbia"),
+    ("србијаsrbija", "Serbia"),
+    ("тоҷикистон", "Tajikistan"),
+    ("україна", "Ukraine"),
+    ("црна гора", "Montenegro"),
+    ("црнагора", "Montenegro"),
+    ("ўзбекистон", "Uzbekistan"),
+    ("қазақстан", "Kazakhstan"),
+    ("հայաստան", "Armenia"),
+    ("ישראל", "Israel"),
+    ("إرتريا", "Eritrea"),
+    ("إسرائيل ישראל", "Israel"),
+    ("إسرائيل", "Israel"),
+    ("إسرائيلישראל", "Israel"),
+    ("افغانستان", "Afghanistan"),
+    ("الأردن", "Jordan"),
+    ("الإمارات العربيّة المتّحدة", "United Arab Emirates"),
+    ("الإمارات", "United Arab Emirates"),
+    ("الإماراتالعربيّةالمتّحدة", "United Arab Emirates"),
+    ("البحرين", "Bahrain"),
+    ("الجزائر", "Algeria"),
+    ("السعودية", "Saudi Arabia"),
+    ("السودان", "Sudan"),
+    ("الصومال", "Somalia"),
+    ("العراق", "Iraq"),
+    ("العراق\u200e", "Iraq"),
+    ("الكويت", "Kuwait"),
+    ("المغرب", "Morocco"),
+    ("المملكة العربية السعودية", "Saudi Arabia"),
+    ("المملكةالعربيةالسعودية", "Saudi Arabia"),
+    ("الموريتانية", "Mauritania"),
+    ("اليمن", "Yemen"),
+    ("ایران", "Iran"),
+    ("بروني", "Brunei"),
+    ("تشاد", "Chad"),
+    ("تشاد\u200e", "Chad"),
+    ("تونس", "Tunisia"),
+    ("جز القمر", "Comoros"),
+    ("جزالقمر", "Comoros"),
+    ("جزر القمر", "Comoros"),
+    ("جزرالقمر", "Comoros"),
+    ("جيبوتي", "Djibouti"),
+    ("جيبوتي\u200e", "Djibouti"),
+    ("دولة الكويت", "Kuwait"),
+    ("دولةالكويت", "Kuwait"),
+    ("سورية", "Syria"),
+    ("عمان", "Oman"),
+    ("عُمان", "Oman"),
+    ("فلسطين", "Occupied Palestinian Territories"),
+    ("قازاقستان", "Kazakhstan"),
+    ("قطر", "Qatar"),
+    ("لبنان", "Lebanon"),
+    ("لصحراء الغربية", "Western Sahara"),
+    ("لصحراءالغربية", "Western Sahara"),
+    ("ليبيا", "Libya"),
+    ("مصر", "Egypt"),
+    ("موريتانيا", "Mauritania"),
+    ("پاکستان", "Pakistan"),
+    ("नेपाल", "Nepal"),
+    ("फ़िजी", "Fiji"),
+    ("भारत गणराज्य", "India"),
+    ("भारत", "India"),
+    ("भारतगणराज्य", "India"),
+    ("भारतम्", "India"),
+    ("भूटान", "Bhutan"),
+    ("शर्नम्", "Suriname"),
+    ("বাংলাদেশ", "Bangladesh"),
+    ("ভারত", "India"),
+    ("ভাৰত", "India"),
+    ("ਭਾਰਤ", "India"),
+    ("ભારત", "India"),
+    ("ଭାରତ", "India"),
+    ("இலங்கை", "Sri Lanka"),
+    ("சிங்கப்பூர் குடியரசு", "Singapore"),
+    ("சிங்கப்பூர்", "Singapore"),
+    ("சிங்கப்பூர்கு", "Singapore"),
+    ("சிங்கப்பூர்குடியரசு", "Singapore"),
+    ("டியரசு", "Singapore"),
+    ("பாரதம்", "India"),
+    ("மலேசியா", "Malaysia"),
+    ("భారత దేశం", "India"),
+    ("భారతదేశం", "India"),
+    ("ಭಾರತ", "India"),
+    ("ഭാരതം", "India"),
+    # ('ශ්රී ලංකා இலங்கை', 'Sri Lanka'),
+    # ('ශ්රී ලංකා', 'Sri Lanka'),
+    # ('ශ්රී ලංකාව', 'Sri Lanka'),
+    # ('ශ්රීලංකා', 'Sri Lanka'),
+    # ('ශ්රීලංකාஇலங்கை', 'Sri Lanka'),
+    # ('ශ්රීලංකාව', 'Sri Lanka'),
+    ("ประเทศไทย", "Thailand"),
+    ("ราชอาณาจักรไทย", "Thailand"),
+    ("เมืองไทย", "Thailand"),
+    ("ປະເທດລາວ", "Laos"),
+    ("འབྲུག་ཡུལ", "Bhutan"),
+    ("မြန်မာ", "Myanmar (Burma)"),
+    ("საქართველო", "Georgia"),
+    ("ኢትዮጵያ", "Ethiopia"),
+    ("ኤርትራ", "Eritrea"),
+    ("កម្ពុជា", "Cambodia"),
+    ("ᠮᠤᠩᠭᠤᠯ ᠤᠯᠤᠰ", "Mongolia"),
+    ("ᠮᠤᠩᠭᠤᠯᠤᠯᠤᠰ", "Mongolia"),
+    ("‘umān", "Oman"),
+    ("ⴰⴳⴰⵡⵛ", "Mauritania"),
+    ("ⴰⵎⵔⵔⵓⴽ", "Morocco"),
+    ("ⴷⵣⴰⵢⴻⵔ", "Algeria"),
+    ("ⵍⵉⴱⵢⴰ", "Libya"),
+    ("ⵍⵎⵖⵔⵉⴱ", "Morocco"),
+    ("ⵎⵓⵔⵉⵜⴰⵏ", "Mauritania"),
+    ("ⵜⵓⵏⵙ", "Tunisia"),
+    ("中华", "China"),
+    ("中国", "China"),
+    ("中国/中华", "China"),
+    ("中華民國", "Taiwan"),
+    ("台灣", "Taiwan"),
+    ("新加坡", "Singapore"),
+    ("新加坡共和国", "Singapore"),
+    ("日本", "Japan"),
+    ("臺灣", "Taiwan"),
+    ("臺灣/台灣", "Taiwan"),
+    ("香港", "Hong Kong"),
+    ("马来西亚", "Malaysia"),
+    ("남한", "South Korea"),
+    ("북조선", "North Korea"),
+    ("조선 / 朝鮮", "North Korea"),
+    ("조선/朝鮮", "North Korea"),
+    ("한국 / 韓國", "South Korea"),
+    ("한국/韓國", "South Korea"),
+)
+
+
+CROWDSOURCED_MISTAKES = (
+    ("burma", "Myanmar (Burma)", "rest-of-world"),
+    ("canary islands", "Canary Islands", "europe"),
+    ("czechoslovakia", "Czechia", "europe"),
+    ("east germany", "Germany", "europe"),
+    ("easter island", "Easter Island", "rest-of-world"),
+    ("Eidal", "Italy", "europe"),
+    ("falklands", "Falkland Islands", "rest-of-world"),
+    ("Ffrainc", "France", "europe"),
+    ("hawaii", "United States", "rest-of-world"),
+    ("Herm", "United Kingdom", "united-kingdom"),
+    ("Khazakhstan", "Kazakhstan", "europe"),
+    ("korea", "South Korea", "rest-of-world"),
+    ("macau", "Macao", "rest-of-world"),
+    ("myanmar", "Myanmar (Burma)", "rest-of-world"),
+    ("new zeeland", "New Zealand", "rest-of-world"),
+    ("NI", "United Kingdom", "united-kingdom"),
+    ("Pitcairn Island", "Pitcairn, Henderson, Ducie and Oeno Islands", "rest-of-world"),
+    ("republic of china", "Taiwan", "rest-of-world"),
+    ("Republik Österreich", "Austria", "europe"),
+    ("République Islamique de Mauritanie", "Mauritania", "rest-of-world"),
+    ("Mauritanie", "Mauritania", "rest-of-world"),
+    ("Sark", "United Kingdom", "united-kingdom"),
+    ("South Ireland", "Ireland", "europe"),
+    ("St Helena", "Saint Helena", "rest-of-world"),
+    ("Swaziland", "Eswatini", "rest-of-world"),
+    ("the falkland islands", "Falkland Islands", "rest-of-world"),
+    ("the falklands", "Falkland Islands", "rest-of-world"),
+    (
+        "the sandwich islands",
+        "South Georgia and the South Sandwich Islands",
+        "rest-of-world",
+    ),
+    ("South Georgia", "South Georgia and the South Sandwich Islands", "rest-of-world"),
+    ("Tristan", "Tristan da Cunha", "rest-of-world"),
+    ("ussr", None, None),
+    ("USSR", None, None),
+    ("союз советских социалистических республик", None, None),
+    ("Vatican", "Vatican City", "europe"),
+    ("West Germany", "Germany", "europe"),
+    ("Yr Alban", "United Kingdom", "united-kingdom"),
+    ("yugoslavia", None, None),
+    ("jugoslavija", None, None),
+    ("Swistir", "Switzerland", "europe"),
+    ("Y Swistir", "Switzerland", "europe"),
+    ("Saint Kitts", "St Kitts and Nevis", "rest-of-world"),
+    ("St Kitts", "St Kitts and Nevis", "rest-of-world"),
+)
diff --git a/tests/notifications_utils/test_base64_uuid.py b/tests/notifications_utils/test_base64_uuid.py
new file mode 100644
index 0000000000..d8293b4b49
--- /dev/null
+++ b/tests/notifications_utils/test_base64_uuid.py
@@ -0,0 +1,57 @@
+import binascii
+import os
+from uuid import UUID
+
+import pytest
+
+from notifications_utils.base64_uuid import (
+    base64_to_bytes,
+    base64_to_uuid,
+    bytes_to_base64,
+    uuid_to_base64,
+)
+
+
+def test_bytes_to_base64_to_bytes():
+    b = os.urandom(32)
+    b64 = bytes_to_base64(b)
+    assert base64_to_bytes(b64) == b
+
+
+@pytest.mark.parametrize(
+    "url_val",
+    [
+        "AAAAAAAAAAAAAAAAAAAAAQ",
+        "AAAAAAAAAAAAAAAAAAAAAQ=",  # even though this has invalid padding we put extra =s on the end so this is okay
+        "AAAAAAAAAAAAAAAAAAAAAQ==",
+    ],
+)
+def test_base64_converter_to_python(url_val):
+    assert base64_to_uuid(url_val) == UUID(int=1)
+
+
+@pytest.mark.parametrize(
+    "python_val", [UUID(int=1), "00000000-0000-0000-0000-000000000001"]
+)
+def test_base64_converter_to_url(python_val):
+    assert uuid_to_base64(python_val) == "AAAAAAAAAAAAAAAAAAAAAQ"
+
+
+@pytest.mark.parametrize(
+    ("url_val", "expectation"),
+    [
+        (
+            "this_is_valid_base64_but_is_too_long_to_be_a_uuid",
+            pytest.raises(binascii.Error),
+        ),
+        ("this_one_has_emoji_➕➕➕", pytest.raises(UnicodeEncodeError)),
+    ],
+)
+def test_base64_converter_to_python_raises_validation_error(url_val, expectation):
+    with expectation:
+        base64_to_uuid(url_val)
+
+
+def test_base64_converter_to_url_raises_validation_error():
+    with pytest.raises(AttributeError):
+        uuid_to_base64(object())
diff --git a/tests/notifications_utils/test_base_template.py b/tests/notifications_utils/test_base_template.py
new file mode 100644
index 0000000000..ac46e219e8
--- /dev/null
+++ b/tests/notifications_utils/test_base_template.py
@@ -0,0 +1,119 @@
+from unittest.mock import patch
+
+import pytest
+
+from notifications_utils.template import SubjectMixin, Template
+
+
+class ConcreteImplementation:
+    template_type = None
+
+    # Can’t instantiate and test templates unless they implement __str__
+    def __str__(self):
+        pass
+
+
+class ConcreteTemplate(ConcreteImplementation, Template):
+    pass
+
+
+class ConcreteTemplateWithSubject(SubjectMixin, ConcreteTemplate):
+    pass
+
+
+def test_class():
+    assert (
+        repr(ConcreteTemplate({"content": "hello ((name))"}))
+        == 'ConcreteTemplate("hello ((name))", {})'
+    )
+
+
+def test_passes_through_template_attributes():
+    assert ConcreteTemplate({"content": ""}).name is None
+    assert (
+        ConcreteTemplate({"content": "", "name": "Two week reminder"}).name
+        == "Two week reminder"
+    )
+    assert ConcreteTemplate({"content": ""}).id is None
+    assert ConcreteTemplate({"content": "", "id": "1234"}).id == "1234"
+    assert ConcreteTemplate({"content": ""}).template_type is None
+
+
+def test_passes_through_subject():
+    assert (
+        ConcreteTemplateWithSubject(
+            {"content": "", "subject": "Your tax is due"}
+        ).subject
+        == "Your tax is due"
+    )
+
+
+def test_errors_for_missing_template_content():
+    with pytest.raises(KeyError):
+        ConcreteTemplate({})
+
+
+@pytest.mark.parametrize("template", [0, 1, 2, True, False, None])
+def test_errors_for_invalid_template_types(template):
+    with pytest.raises(TypeError):
+        ConcreteTemplate(template)
+
+
+@pytest.mark.parametrize("values", [[], False])
+def test_errors_for_invalid_values(values):
+    with pytest.raises(TypeError):
+        ConcreteTemplate({"content": ""}, values)
+
+
+def test_matches_keys_to_placeholder_names():
+    template = ConcreteTemplate({"content": "hello ((name))"})
+
+    template.values = {"NAME": "Chris"}
+    assert template.values == {"name": "Chris"}
+
+    template.values = {"NAME": "Chris", "Town": "London"}
+    assert template.values == {"name": "Chris", "Town": "London"}
+    assert template.additional_data == {"Town"}
+
+    template.values = None
+    assert template.missing_data == ["name"]
+
+
+@pytest.mark.parametrize(
+    ("template_content", "template_subject", "expected"),
+    [
+        ("the quick brown fox", "jumps", []),
+        ("the quick ((colour)) fox", "jumps", ["colour"]),
+        ("the quick ((colour)) ((animal))", "jumps", ["colour", "animal"]),
+        ("((colour)) ((animal)) ((colour)) ((animal))", "jumps", ["colour", "animal"]),
+        ("the quick brown fox", "((colour))", ["colour"]),
+        ("the quick ((colour)) ", "((animal))", ["animal", "colour"]),
+        ("((colour)) ((animal)) ", "((colour)) ((animal))", ["colour", "animal"]),
+        ("Dear ((name)), ((warning?? This is a warning))", "", ["name", "warning"]),
+        ("((warning? one question mark))", "", ["warning? one question mark"]),
+    ],
+)
+def test_extracting_placeholders(template_content, template_subject, expected):
+    assert (
+        ConcreteTemplateWithSubject(
+            {"content": template_content, "subject": template_subject}
+        ).placeholders
+        == expected
+    )
+
+
+def test_random_variable_retrieve():
+    template = ConcreteTemplate({"content": "content", "created_by": "now"})
+    assert template.get_raw("created_by") == "now"
+    assert template.get_raw("missing", default="random") == "random"
+    assert template.get_raw("missing") is None
+
+
+def test_compare_template():
+    with patch(
+        "notifications_utils.template_change.TemplateChange.__init__", return_value=None
+    ) as mocked:
+        old_template = ConcreteTemplate({"content": "faked"})
+        new_template = ConcreteTemplate({"content": "faked"})
+        old_template.compare_to(new_template)
+        mocked.assert_called_once_with(old_template, new_template)
diff --git a/tests/notifications_utils/test_countries.py b/tests/notifications_utils/test_countries.py
new file mode 100644
index 0000000000..07f48d0e45
--- /dev/null
+++ b/tests/notifications_utils/test_countries.py
@@ -0,0 +1,170 @@
+import pytest
+
+from notifications_utils.countries import Country, CountryMapping, CountryNotFoundError
+from notifications_utils.countries.data import (
+    _EUROPEAN_ISLANDS_LIST,
+    _UK_ISLANDS_LIST,
+    ADDITIONAL_SYNONYMS,
+    COUNTRIES_AND_TERRITORIES,
+    ROYAL_MAIL_EUROPEAN,
+    UK,
+    UK_ISLANDS,
+    WELSH_NAMES,
+    Postage,
+)
+
+from .country_synonyms import ALL as ALL_SYNONYMS
+from .country_synonyms import CROWDSOURCED_MISTAKES
+
+
+def test_constants():
+    assert UK == "United Kingdom"
+    assert UK_ISLANDS == [
+        ("Alderney", UK),
+        ("Brecqhou", UK),
+        ("Guernsey", UK),
+        ("Herm", UK),
+        ("Isle of Man", UK),
+        ("Jersey", UK),
+        ("Jethou", UK),
+        ("Sark", UK),
+    ]
+    assert Postage.EUROPE == "europe"
+    assert Postage.REST_OF_WORLD == "rest-of-world"
+    assert Postage.UK == "united-kingdom"
+
+
+@pytest.mark.parametrize(("synonym", "canonical"), ADDITIONAL_SYNONYMS)
+def test_hand_crafted_synonyms_map_to_canonical_countries(synonym, canonical):
+    exceptions_to_canonical_countries = [
+        "Easter Island",
+        "South Georgia and the South Sandwich Islands",
+    ]
+
+    synonyms = dict(COUNTRIES_AND_TERRITORIES).keys()
+    canonical_names = list(dict(COUNTRIES_AND_TERRITORIES).values())
+
+    assert canonical in (
+        canonical_names
+        + _EUROPEAN_ISLANDS_LIST
+        + _UK_ISLANDS_LIST
+        + exceptions_to_canonical_countries
+    )
+
+    assert synonym not in {CountryMapping.make_key(synonym_) for synonym_ in synonyms}
+    assert Country(synonym).canonical_name == canonical
+
+
+@pytest.mark.parametrize(("welsh_name", "canonical"), WELSH_NAMES)
+def test_welsh_names_map_to_canonical_countries(welsh_name, canonical):
+    assert Country(canonical).canonical_name == canonical
+    assert Country(welsh_name).canonical_name == canonical
+
+
+def test_all_synonyms():
+    for search, expected in ALL_SYNONYMS:
+        assert Country(search).canonical_name == expected
+
+
+def test_crowdsourced_test_data():
+    for search, expected_country, expected_postage in CROWDSOURCED_MISTAKES:
+        if expected_country or expected_postage:
+            assert Country(search).canonical_name == expected_country
+            assert Country(search).postage_zone == expected_postage
+
+
+@pytest.mark.parametrize(
+    ("search", "expected"),
+    [
+        ("u.s.a", "United States"),
+        ("america", "United States"),
+        ("United States America", "United States"),
+        ("ROI", "Ireland"),
+        ("Irish Republic", "Ireland"),
+        ("Rep of Ireland", "Ireland"),
+        ("RepOfIreland", "Ireland"),
+        ("deutschland", "Germany"),
+        ("UK", "United Kingdom"),
+        ("England", "United Kingdom"),
+        ("Northern Ireland", "United Kingdom"),
+        ("Scotland", "United Kingdom"),
+        ("Wales", "United Kingdom"),
+        ("N. Ireland", "United Kingdom"),
+        ("GB", "United Kingdom"),
+        ("NIR", "United Kingdom"),
+        ("SCT", "United Kingdom"),
+        ("WLS", "United Kingdom"),
+        ("gambia", "The Gambia"),
+        ("Jersey", "United Kingdom"),
+        ("Guernsey", "United Kingdom"),
+        ("Lubnān", "Lebanon"),
+        ("Lubnan", "Lebanon"),
+        ("ESPAÑA", "Spain"),
+        ("ESPANA", "Spain"),
+        ("the democratic people's republic of korea", "North Korea"),
+        ("the democratic peoples republic of korea", "North Korea"),
+        ("ALAND", "Åland Islands"),
+        ("Sao Tome + Principe", "Sao Tome and Principe"),
+        ("Sao Tome & Principe", "Sao Tome and Principe"),
+        ("Antigua, and Barbuda", "Antigua and Barbuda"),
+        ("Azores", "Azores"),
+        ("Autonomous Region of the Azores", "Azores"),
+        ("Canary Islands", "Canary Islands"),
+        ("Islas Canarias", "Canary Islands"),
+        ("Canaries", "Canary Islands"),
+        ("Madeira", "Madeira"),
+        ("Autonomous Region of Madeira", "Madeira"),
+        ("Região Autónoma da Madeira", "Madeira"),
+        ("Balearic Islands", "Balearic Islands"),
+        ("Islas Baleares", "Balearic Islands"),
+        ("Illes Balears", "Balearic Islands"),
+        ("Corsica", "Corsica"),
+        ("Corse", "Corsica"),
+    ],
+)
+def test_hand_crafted_synonyms(search, expected):
+    assert Country(search).canonical_name == expected
+
+
+def test_auto_checking_for_country_starting_with_the():
+    canonical_names = dict(COUNTRIES_AND_TERRITORIES).values()
+    synonyms = dict(COUNTRIES_AND_TERRITORIES).keys()
+    assert "The Gambia" in canonical_names
+    assert "Gambia" not in synonyms
+    assert Country("Gambia").canonical_name == "The Gambia"
+
+
+@pytest.mark.parametrize(
+    ("search", "expected_error_message"),
+    [
+        ("Qumran", "Not a known country or territory (Qumran)"),
+        ("Kumrahn", "Not a known country or territory (Kumrahn)"),
+    ],
+)
+def test_non_existant_countries(search, expected_error_message):
+    with pytest.raises(KeyError) as error:
+        Country(search)
+    assert str(error.value) == repr(expected_error_message)
+    assert isinstance(error.value, CountryNotFoundError)
+
+
+@pytest.mark.parametrize(
+    ("search", "expected"),
+    [
+        ("u.s.a", "rest-of-world"),
+        ("Rep of Ireland", "europe"),
+        ("deutschland", "europe"),
+        ("UK", "united-kingdom"),
+        ("Jersey", "united-kingdom"),
+        ("Guernsey", "united-kingdom"),
+        ("isle-of-man", "united-kingdom"),
+        ("ESPAÑA", "europe"),
+    ],
+)
+def test_get_postage(search, expected):
+    assert Country(search).postage_zone == expected
+
+
+def test_euro_postage_zone():
+    for search in ROYAL_MAIL_EUROPEAN:
+        assert Country(search).postage_zone == Postage.EUROPE
diff --git a/tests/notifications_utils/test_countries_iso.py b/tests/notifications_utils/test_countries_iso.py
new file mode 100644
index 0000000000..ada46e9309
--- /dev/null
+++ b/tests/notifications_utils/test_countries_iso.py
@@ -0,0 +1,526 @@
+import pytest
+
+from notifications_utils.countries import Country, CountryNotFoundError
+
+
+def _country_not_found(*test_case):
+    return pytest.param(
+        *test_case,
+        marks=pytest.mark.xfail(raises=CountryNotFoundError),
+    )
+
+
+@pytest.mark.parametrize(
+    ("alpha_2", "expected_name"),
+    [
+        ("AF", "Afghanistan"),
+        ("AL", "Albania"),
+        ("DZ", "Algeria"),
+        ("AS", "American Samoa"),
+        ("AD", "Andorra"),
+        ("AO", "Angola"),
+        ("AI", "Anguilla"),
+        ("AQ", "Antarctica"),
+        ("AG", "Antigua and Barbuda"),
+        ("AR", "Argentina"),
+        ("AM", "Armenia"),
+        ("AW", "Aruba"),
+        ("AU", "Australia"),
+        ("AT", "Austria"),
+        ("AZ", "Azerbaijan"),
+        ("BS", "The Bahamas"),
+        ("BH", "Bahrain"),
+        ("BD", "Bangladesh"),
+        ("BB", "Barbados"),
+        ("BY", "Belarus"),
+        ("BE", "Belgium"),
+        ("BZ", "Belize"),
+        ("BJ", "Benin"),
+        ("BM", "Bermuda"),
+        ("BT", "Bhutan"),
+        ("BO", "Bolivia"),
+        _country_not_found("BQ", "Bonaire, Sint Eustatius and Saba"),
+        ("BA", "Bosnia and Herzegovina"),
+        ("BW", "Botswana"),
+        ("BV", "Bouvet Island"),
+        ("BR", "Brazil"),
+        ("IO", "British Indian Ocean Territory"),
+        ("BN", "Brunei"),
+        ("BG", "Bulgaria"),
+        ("BF", "Burkina Faso"),
+        ("BI", "Burundi"),
+        ("CV", "Cape Verde"),
+        ("KH", "Cambodia"),
+        ("CM", "Cameroon"),
+        ("CA", "Canada"),
+        ("KY", "Cayman Islands"),
+        ("CF", "Central African Republic"),
+        ("TD", "Chad"),
+        ("CL", "Chile"),
+        ("CN", "China"),
+        ("CX", "Christmas Island"),
+        ("CC", "Cocos (Keeling) Islands"),
+        ("CO", "Colombia"),
+        ("KM", "Comoros"),
+        ("CD", "Congo (Democratic Republic)"),
+        ("CG", "Congo"),
+        ("CK", "Cook Islands"),
+        ("CR", "Costa Rica"),
+        ("HR", "Croatia"),
+        ("CU", "Cuba"),
+        ("CW", "Curaçao"),
+        ("CY", "Cyprus"),
+        ("CZ", "Czechia"),
+        ("CI", "Ivory Coast"),
+        ("DK", "Denmark"),
+        ("DJ", "Djibouti"),
+        ("DM", "Dominica"),
+        ("DO", "Dominican Republic"),
+        ("EC", "Ecuador"),
+        ("EG", "Egypt"),
+        ("SV", "El Salvador"),
+        ("GQ", "Equatorial Guinea"),
+        ("ER", "Eritrea"),
+        ("EE", "Estonia"),
+        ("SZ", "Eswatini"),
+        ("ET", "Ethiopia"),
+        ("FK", "Falkland Islands"),
+        ("FO", "Faroe Islands"),
+        ("FJ", "Fiji"),
+        ("FI", "Finland"),
+        ("FR", "France"),
+        ("GF", "French Guiana"),
+        ("PF", "French Polynesia"),
+        ("TF", "French Southern Territories"),
+        ("GA", "Gabon"),
+        ("GM", "The Gambia"),
+        ("GE", "Georgia"),
+        ("DE", "Germany"),
+        ("GH", "Ghana"),
+        ("GI", "Gibraltar"),
+        ("GR", "Greece"),
+        ("GL", "Greenland"),
+        ("GD", "Grenada"),
+        ("GP", "Guadeloupe"),
+        ("GU", "Guam"),
+        ("GT", "Guatemala"),
+        ("GG", "United Kingdom"),
+        ("GN", "Guinea"),
+        ("GW", "Guinea-Bissau"),
+        ("GY", "Guyana"),
+        ("HT", "Haiti"),
+        ("HM", "Heard Island and McDonald Islands"),
+        ("VA", "Vatican City"),
+        ("HN", "Honduras"),
+        ("HK", "Hong Kong"),
+        ("HU", "Hungary"),
+        ("IS", "Iceland"),
+        ("IN", "India"),
+        ("ID", "Indonesia"),
+        ("IR", "Iran"),
+        ("IQ", "Iraq"),
+        ("IE", "Ireland"),
+        ("IM", "United Kingdom"),
+        ("IL", "Israel"),
+        ("IT", "Italy"),
+        ("JM", "Jamaica"),
+        ("JP", "Japan"),
+        ("JE", "United Kingdom"),
+        ("JO", "Jordan"),
+        ("KZ", "Kazakhstan"),
+        ("KE", "Kenya"),
+        ("KI", "Kiribati"),
+        ("KP", "North Korea"),
+        ("KR", "South Korea"),
+        ("KW", "Kuwait"),
+        ("KG", "Kyrgyzstan"),
+        ("LA", "Laos"),
+        ("LV", "Latvia"),
+        ("LB", "Lebanon"),
+        ("LS", "Lesotho"),
+        ("LR", "Liberia"),
+        ("LY", "Libya"),
+        ("LI", "Liechtenstein"),
+        ("LT", "Lithuania"),
+        ("LU", "Luxembourg"),
+        ("MO", "Macao"),
+        ("MG", "Madagascar"),
+        ("MW", "Malawi"),
+        ("MY", "Malaysia"),
+        ("MV", "Maldives"),
+        ("ML", "Mali"),
+        ("MT", "Malta"),
+        ("MH", "Marshall Islands"),
+        ("MQ", "Martinique"),
+        ("MR", "Mauritania"),
+        ("MU", "Mauritius"),
+        ("YT", "Mayotte"),
+        ("MX", "Mexico"),
+        ("FM", "Micronesia"),
+        ("MD", "Moldova"),
+        ("MC", "Monaco"),
+        ("MN", "Mongolia"),
+        ("ME", "Montenegro"),
+        ("MS", "Montserrat"),
+        ("MA", "Morocco"),
+        ("MZ", "Mozambique"),
+        ("MM", "Myanmar (Burma)"),
+        ("NA", "Namibia"),
+        ("NR", "Nauru"),
+        ("NP", "Nepal"),
+        ("NL", "Netherlands"),
+        ("NC", "New Caledonia"),
+        ("NZ", "New Zealand"),
+        ("NI", "United Kingdom"),  # NI gets interpreted as ‘Northern Ireland’
+        ("NE", "Niger"),
+        ("NG", "Nigeria"),
+        ("NU", "Niue"),
+        ("NF", "Norfolk Island"),
+        ("MK", "North Macedonia"),
+        ("MP", "Northern Mariana Islands"),
+        ("NO", "Norway"),
+        ("OM", "Oman"),
+        ("PK", "Pakistan"),
+        ("PW", "Palau"),
+        ("PS", "Occupied Palestinian Territories"),
+        ("PA", "Panama"),
+        ("PG", "Papua New Guinea"),
+        ("PY", "Paraguay"),
+        ("PE", "Peru"),
+        ("PH", "Philippines"),
+        ("PN", "Pitcairn, Henderson, Ducie and Oeno Islands"),
+        ("PL", "Poland"),
+        ("PT", "Portugal"),
+        ("PR", "Puerto Rico"),
+        ("QA", "Qatar"),
+        ("RO", "Romania"),
+        ("RU", "Russia"),
+        ("RW", "Rwanda"),
+        ("RE", "Réunion"),
+        ("BL", "Saint Barthélemy"),
+        _country_not_found("SH", "Saint Helena, Ascension and Tristan da Cunha"),
+        ("KN", "St Kitts and Nevis"),
+        ("LC", "St Lucia"),
+        ("MF", "Saint-Martin (French part)"),
+        ("PM", "Saint Pierre and Miquelon"),
+        ("VC", "St Vincent"),
+        ("WS", "Samoa"),
+        ("SM", "San Marino"),
+        ("ST", "Sao Tome and Principe"),
+        ("SA", "Saudi Arabia"),
+        ("SN", "Senegal"),
+        ("RS", "Serbia"),
+        ("SC", "Seychelles"),
+        ("SL", "Sierra Leone"),
+        ("SG", "Singapore"),
+        ("SX", "Sint Maarten (Dutch part)"),
+        ("SK", "Slovakia"),
+        ("SI", "Slovenia"),
+        ("SB", "Solomon Islands"),
+        ("SO", "Somalia"),
+        ("ZA", "South Africa"),
+        ("GS", "South Georgia and South Sandwich Islands"),
+        ("SS", "South Sudan"),
+        ("ES", "Spain"),
+        ("LK", "Sri Lanka"),
+        ("SD", "Sudan"),
+        ("SR", "Suriname"),
+        ("SJ", "Svalbard and Jan Mayen"),
+        ("SE", "Sweden"),
+        ("CH", "Switzerland"),
+        ("SY", "Syria"),
+        ("TW", "Taiwan"),
+        ("TJ", "Tajikistan"),
+        ("TZ", "Tanzania"),
+        ("TH", "Thailand"),
+        ("TL", "East Timor"),
+        ("TG", "Togo"),
+        ("TK", "Tokelau"),
+        ("TO", "Tonga"),
+        ("TT", "Trinidad and Tobago"),
+        ("TN", "Tunisia"),
+        ("TR", "Turkey"),
+        ("TM", "Turkmenistan"),
+        ("TC", "Turks and Caicos Islands"),
+        ("TV", "Tuvalu"),
+        ("UG", "Uganda"),
+        ("UA", "Ukraine"),
+        ("AE", "United Arab Emirates"),
+        ("GB", "United Kingdom"),
+        _country_not_found("UM", "United States Minor Outlying Islands"),
+        ("US", "United States"),
+        ("UY", "Uruguay"),
+        ("UZ", "Uzbekistan"),
+        ("VU", "Vanuatu"),
+        ("VE", "Venezuela"),
+        ("VN", "Vietnam"),
+        ("VG", "British Virgin Islands"),
+        ("VI", "United States Virgin Islands"),
+        ("WF", "Wallis and Futuna"),
+        ("EH", "Western Sahara"),
+        ("YE", "Yemen"),
+        ("ZM", "Zambia"),
+        ("ZW", "Zimbabwe"),
+        ("AX", "Åland Islands"),
+    ],
+)
+def test_iso_alpha_2_country_codes(alpha_2, expected_name):
+    assert Country(alpha_2).canonical_name == expected_name
+
+
+@pytest.mark.parametrize(
+    ("alpha_3", "expected_name"),
+    [
+        _country_not_found("AFG", "Afghanistan"),
+        _country_not_found("ALB", "Albania"),
+        _country_not_found("DZA", "Algeria"),
+        _country_not_found("ASM", "American Samoa"),
+        _country_not_found("AND", "Andorra"),
+        _country_not_found("AGO", "Angola"),
+        _country_not_found("AIA", "Anguilla"),
+        _country_not_found("ATA", "Antarctica"),
+        _country_not_found("ATG", "Antigua and Barbuda"),
+        _country_not_found("ARG", "Argentina"),
+        _country_not_found("ARM", "Armenia"),
+        _country_not_found("ABW", "Aruba"),
+        _country_not_found("AUS", "Australia"),
+        _country_not_found("AUT", "Austria"),
+        _country_not_found("AZE", "Azerbaijan"),
+        _country_not_found("BHS", "The Bahamas"),
+        _country_not_found("BHR", "Bahrain"),
+        _country_not_found("BGD", "Bangladesh"),
+        _country_not_found("BRB", "Barbados"),
+        _country_not_found("BLR", "Belarus"),
+        _country_not_found("BEL", "Belgium"),
+        _country_not_found("BLZ", "Belize"),
+        _country_not_found("BEN", "Benin"),
+        _country_not_found("BMU", "Bermuda"),
+        _country_not_found("BTN", "Bhutan"),
+        _country_not_found("BOL", "Bolivia"),
+        _country_not_found("BES", "Bonaire, Sint Eustatius and Saba"),
+        ("BIH", "Bosnia and Herzegovina"),
+        _country_not_found("BWA", "Botswana"),
+        _country_not_found("BVT", "Bouvet Island"),
+        _country_not_found("BRA", "Brazil"),
+        ("IOT", "British Indian Ocean Territory"),
+        _country_not_found("BRN", "Brunei"),
+        _country_not_found("BGR", "Bulgaria"),
+        _country_not_found("BFA", "Burkina Faso"),
+        _country_not_found("BDI", "Burundi"),
+        _country_not_found("CPV", "Cape Verde"),
+        _country_not_found("KHM", "Cambodia"),
+        _country_not_found("CMR", "Cameroon"),
+        _country_not_found("CAN", "Canada"),
+        _country_not_found("CYM", "Cayman Islands"),
+        _country_not_found("CAF", "Central African Republic"),
+        _country_not_found("TCD", "Chad"),
+        _country_not_found("CHL", "Chile"),
+        _country_not_found("CHN", "China"),
+        _country_not_found("CXR", "Christmas Island"),
+        _country_not_found("CCK", "Cocos (Keeling) Islands"),
+        _country_not_found("COL", "Colombia"),
+        _country_not_found("COM", "Comoros"),
+        _country_not_found("COD", "Congo (Democratic Republic)"),
+        _country_not_found("COG", "Congo"),
+        _country_not_found("COK", "Cook Islands"),
+        _country_not_found("CRI", "Costa Rica"),
+        _country_not_found("HRV", "Croatia"),
+        _country_not_found("CUB", "Cuba"),
+        _country_not_found("CUW", "Curaçao"),
+        _country_not_found("CYP", "Cyprus"),
+        _country_not_found("CZE", "Czechia"),
+        _country_not_found("CIV", "Ivory Coast"),
+        _country_not_found("DNK", "Denmark"),
+        _country_not_found("DJI", "Djibouti"),
+        _country_not_found("DMA", "Dominica"),
+        _country_not_found("DOM", "Dominican Republic"),
+        _country_not_found("ECU", "Ecuador"),
+        _country_not_found("EGY", "Egypt"),
+        _country_not_found("SLV", "El Salvador"),
+        _country_not_found("GNQ", "Equatorial Guinea"),
+        _country_not_found("ERI", "Eritrea"),
+        _country_not_found("EST", "Estonia"),
+        _country_not_found("SWZ", "Eswatini"),
+        _country_not_found("ETH", "Ethiopia"),
+        _country_not_found("FLK", "Falkland Islands"),
+        _country_not_found("FRO", "Faroe Islands"),
+        _country_not_found("FJI", "Fiji"),
+        _country_not_found("FIN", "Finland"),
+        _country_not_found("FRA", "France"),
+        _country_not_found("GUF", "French Guiana"),
+        _country_not_found("PYF", "French Polynesia"),
+        _country_not_found("ATF", "French Southern Territories"),
+        _country_not_found("GAB", "Gabon"),
+        _country_not_found("GMB", "The Gambia"),
+        _country_not_found("GEO", "Georgia"),
+        _country_not_found("DEU", "Germany"),
+        _country_not_found("GHA", "Ghana"),
+        _country_not_found("GIB", "Gibraltar"),
+        _country_not_found("GRC", "Greece"),
+        _country_not_found("GRL", "Greenland"),
+        _country_not_found("GRD", "Grenada"),
+        _country_not_found("GLP", "Guadeloupe"),
+        _country_not_found("GUM", "Guam"),
+        _country_not_found("GTM", "Guatemala"),
+        _country_not_found("GGY", "United Kingdom"),
+        _country_not_found("GIN", "Guinea"),
+        _country_not_found("GNB", "Guinea-Bissau"),
+        _country_not_found("GUY", "Guyana"),
+        _country_not_found("HTI", "Haiti"),
+        _country_not_found("HMD", "Heard Island and McDonald Islands"),
+        _country_not_found("VAT", "Vatican City"),
+        _country_not_found("HND", "Honduras"),
+        _country_not_found("HKG", "Hong Kong"),
+        _country_not_found("HUN", "Hungary"),
+        _country_not_found("ISL", "Iceland"),
+        _country_not_found("IND", "India"),
+        _country_not_found("IDN", "Indonesia"),
+        _country_not_found("IRN", "Iran"),
+        _country_not_found("IRQ", "Iraq"),
+        _country_not_found("IRL", "Ireland"),
+        _country_not_found("IMN", "United Kingdom"),
+        _country_not_found("ISR", "Israel"),
+        _country_not_found("ITA", "Italy"),
+        _country_not_found("JAM", "Jamaica"),
+        _country_not_found("JPN", "Japan"),
+        _country_not_found("JEY", "United Kingdom"),
+        _country_not_found("JOR", "Jordan"),
+        _country_not_found("KAZ", "Kazakhstan"),
+        _country_not_found("KEN", "Kenya"),
+        _country_not_found("KIR", "Kiribati"),
+        ("PRK", "North Korea"),
+        _country_not_found("KOR", "Korea"),
+        _country_not_found("KWT", "Kuwait"),
+        _country_not_found("KGZ", "Kyrgyzstan"),
+        ("LAO", "Laos"),
+        _country_not_found("LVA", "Latvia"),
+        _country_not_found("LBN", "Lebanon"),
+        _country_not_found("LSO", "Lesotho"),
+        _country_not_found("LBR", "Liberia"),
+        _country_not_found("LBY", "Libya"),
+        _country_not_found("LIE", "Liechtenstein"),
+        _country_not_found("LTU", "Lithuania"),
+        _country_not_found("LUX", "Luxembourg"),
+        _country_not_found("MAC", "Macao"),
+        _country_not_found("MDG", "Madagascar"),
+        _country_not_found("MWI", "Malawi"),
+        _country_not_found("MYS", "Malaysia"),
+        _country_not_found("MDV", "Maldives"),
+        _country_not_found("MLI", "Mali"),
+        _country_not_found("MLT", "Malta"),
+        _country_not_found("MHL", "Marshall Islands"),
+        _country_not_found("MTQ", "Martinique"),
+        _country_not_found("MRT", "Mauritania"),
+        _country_not_found("MUS", "Mauritius"),
+        _country_not_found("MYT", "Mayotte"),
+        _country_not_found("MEX", "Mexico"),
+        _country_not_found("FSM", "Micronesia"),
+        _country_not_found("MDA", "Moldova"),
+        _country_not_found("MCO", "Monaco"),
+        _country_not_found("MNG", "Mongolia"),
+        _country_not_found("MNE", "Montenegro"),
+        _country_not_found("MSR", "Montserrat"),
+        _country_not_found("MAR", "Morocco"),
+        _country_not_found("MOZ", "Mozambique"),
+        _country_not_found("MMR", "Myanmar (Burma)"),
+        _country_not_found("NAM", "Namibia"),
+        _country_not_found("NRU", "Nauru"),
+        _country_not_found("NPL", "Nepal"),
+        _country_not_found("NLD", "Netherlands"),
+        _country_not_found("NCL", "New Caledonia"),
+        _country_not_found("NZL", "New Zealand"),
+        _country_not_found("NIC", "Nicaragua"),
+        _country_not_found("NER", "Niger"),
+        _country_not_found("NGA", "Nigeria"),
+        _country_not_found("NIU", "Niue"),
+        _country_not_found("NFK", "Norfolk Island"),
+        _country_not_found("MKD", "North Macedonia"),
+        _country_not_found("MNP", "Northern Mariana Islands"),
+        _country_not_found("NOR", "Norway"),
+        _country_not_found("OMN", "Oman"),
+        _country_not_found("PAK", "Pakistan"),
+        _country_not_found("PLW", "Palau"),
+        _country_not_found("PSE", "Occupied Palestinian Territories"),
+        _country_not_found("PAN", "Panama"),
+        ("PNG", "Papua New Guinea"),
+        _country_not_found("PRY", "Paraguay"),
+        _country_not_found("PER", "Peru"),
+        _country_not_found("PHL", "Philippines"),
+        _country_not_found("PCN", "Pitcairn, Henderson, Ducie and Oeno Islands"),
+        _country_not_found("POL", "Poland"),
+        _country_not_found("PRT", "Portugal"),
+        _country_not_found("PRI", "Puerto Rico"),
+        _country_not_found("QAT", "Qatar"),
+        _country_not_found("ROU", "Romania"),
+        _country_not_found("RUS", "Russian Federation"),
+        _country_not_found("RWA", "Rwanda"),
+        _country_not_found("REU", "Réunion"),
+        _country_not_found("BLM", "Saint Barthélemy"),
+        _country_not_found("SHN", "Saint Helena, Ascension and Tristan da Cunha"),
+        _country_not_found("KNA", "St Kitts and Nevis"),
+        _country_not_found("LCA", "St Lucia"),
+        _country_not_found("MAF", "Saint-Martin (French part)"),
+        _country_not_found("SPM", "Saint Pierre and Miquelon"),
+        _country_not_found("VCT", "Saint Vincent"),
+        _country_not_found("WSM", "Samoa"),
+        _country_not_found("SMR", "San Marino"),
+        _country_not_found("STP", "Sao Tome and Principe"),
+        _country_not_found("SAU", "Saudi Arabia"),
+        _country_not_found("SEN", "Senegal"),
+        _country_not_found("SRB", "Serbia"),
+        _country_not_found("SYC", "Seychelles"),
+        _country_not_found("SLE", "Sierra Leone"),
+        _country_not_found("SGP", "Singapore"),
+        _country_not_found("SXM", "Sint Maarten (Dutch part)"),
+        _country_not_found("SVK", "Slovakia"),
+        _country_not_found("SVN", "Slovenia"),
+        _country_not_found("SLB", "Solomon Islands"),
+        _country_not_found("SOM", "Somalia"),
+        _country_not_found("ZAF", "South Africa"),
+        _country_not_found("SGS", "South Georgia and South Sandwich Islands"),
+        _country_not_found("SSD", "South Sudan"),
+        _country_not_found("ESP", "Spain"),
+        _country_not_found("LKA", "Sri Lanka"),
+        _country_not_found("SDN", "Sudan"),
+        _country_not_found("SUR", "Suriname"),
+        _country_not_found("SJM", "Svalbard and Jan Mayen"),
+        _country_not_found("SWE", "Sweden"),
+        _country_not_found("CHE", "Switzerland"),
+        _country_not_found("SYR", "Syrian Arab Republic"),
+        _country_not_found("TWN", "Taiwan"),
+        _country_not_found("TJK", "Tajikistan"),
+        _country_not_found("TZA", "Tanzania"),
+        _country_not_found("THA", "Thailand"),
+        _country_not_found("TLS", "East Timor"),
+        _country_not_found("TGO", "Togo"),
+        _country_not_found("TKL", "Tokelau"),
+        _country_not_found("TON", "Tonga"),
+        _country_not_found("TTO", "Trinidad and Tobago"),
+        _country_not_found("TUN", "Tunisia"),
+        _country_not_found("TUR", "Turkey"),
+        _country_not_found("TKM", "Turkmenistan"),
+        _country_not_found("TCA", "Turks and Caicos Islands"),
+        _country_not_found("TUV", "Tuvalu"),
+        _country_not_found("UGA", "Uganda"),
+        _country_not_found("UKR", "Ukraine"),
+        _country_not_found("ARE", "United Arab Emirates"),
+        ("GBR", "United Kingdom"),
+        _country_not_found("UMI", "United States Minor Outlying Islands"),
+        ("USA", "United States"),
+        _country_not_found("URY", "Uruguay"),
+        _country_not_found("UZB", "Uzbekistan"),
+        _country_not_found("VUT", "Vanuatu"),
+        _country_not_found("VEN", "Venezuela"),
+        _country_not_found("VNM", "Vietnam"),
+        _country_not_found("VGB", "British Virgin Islands"),
+        _country_not_found("VIR", "United States Virgin Islands"),
+        _country_not_found("WLF", "Wallis and Futuna"),
+        _country_not_found("ESH", "Western Sahara"),
+        _country_not_found("YEM", "Yemen"),
+        _country_not_found("ZMB", "Zambia"),
+        _country_not_found("ZWE", "Zimbabwe"),
+        _country_not_found("ALA", "Åland Islands"),
+    ],
+)
+def test_iso_alpha_3_country_codes(alpha_3, expected_name):
+    assert Country(alpha_3).canonical_name == expected_name
diff --git a/tests/notifications_utils/test_field.py b/tests/notifications_utils/test_field.py
new file mode 100644
index 0000000000..fcd50cf3af
--- /dev/null
+++ b/tests/notifications_utils/test_field.py
@@ -0,0 +1,311 @@
+import pytest
+
+from notifications_utils.field import Field, str2bool
+
+
+@pytest.mark.parametrize(
+    "content",
+    [
+        "",
+        "the quick brown fox",
+        """
+        the
+        quick brown
+
+        fox
+    """,
+        "the ((quick brown fox",
+        "the (()) brown fox",
+    ],
+)
+def test_returns_a_string_without_placeholders(content):
+    assert str(Field(content)) == content
+
+
+@pytest.mark.parametrize(
+    ("template_content", "data", "expected"),
+    [
+        ("((colour))", {"colour": "red"}, "red"),
+        ("the quick ((colour)) fox", {"colour": "brown"}, "the quick brown fox"),
+        (
+            "((article)) quick ((colour)) ((animal))",
+            {"article": "the", "colour": "brown", "animal": "fox"},
+            "the quick brown fox",
+        ),
+        ("the quick (((colour))) fox", {"colour": "brown"}, "the quick (brown) fox"),
+        (
+            "the quick ((colour)) fox",
+            {"colour": "<script>alert('foo')</script>"},
+            "the quick alert('foo') fox",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": ""},
+            "before  after",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": "   "},
+            "before     after",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": True},
+            "before True after",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": False},
+            "before False after",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": 0},
+            "before 0 after",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": 0.0},
+            "before 0.0 after",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": 123},
+            "before 123 after",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": 0.1 + 0.2},
+            "before 0.30000000000000004 after",
+        ),
+        (
+            "before ((placeholder)) after",
+            {"placeholder": {"key": "value"}},
+            "before {'key': 'value'} after",
+        ),
+        (
+            "((warning?))",
+            {"warning?": "This is not a conditional"},
+            "This is not a conditional",
+        ),
+        (
+            "((warning?warning))",
+            {"warning?warning": "This is not a conditional"},
+            "This is not a conditional",
+        ),
+        (
+            "((warning??This is a conditional warning))",
+            {"warning": True},
+            "This is a conditional warning",
+        ),
+        (
+            "((warning??This is a conditional warning\nwith line break))",
+            {"warning": True},
+            "This is a conditional warning\nwith line break",
+        ),
+        ("((warning??This is a conditional warning))", {"warning": False}, ""),
+    ],
+)
+def test_replacement_of_placeholders(template_content, data, expected):
+    assert str(Field(template_content, data)) == expected
+
+
+@pytest.mark.parametrize(
+    ("template_content", "data", "expected"),
+    [
+        (
+            "((code)) is your security code",
+            {"code": "12345"},
+            "12345 is your security code",
+        ),
+        (
+            "((code)) is your security code",
+            {},
+            "<span class='placeholder-redacted'>hidden</span> is your security code",
+        ),
+        (
+            "Hey ((name)), click http://example.com/reset-password/?token=((token))",
+            {"name": "Example"},
+            (
+                "Hey Example, click "
+                "http://example.com/reset-password/?token="
+                "<span class='placeholder-redacted'>hidden</span>"
+            ),
+        ),
+    ],
+)
+def test_optional_redacting_of_missing_values(template_content, data, expected):
+    assert (
+        str(Field(template_content, data, redact_missing_personalisation=True))
+        == expected
+    )
+
+
+@pytest.mark.parametrize(
+    ("content", "expected"),
+    [
+        ("((colour))", "<span class='placeholder'>((colour))</span>"),
+        (
+            "the quick ((colour)) fox",
+            "the quick <span class='placeholder'>((colour))</span> fox",
+        ),
+        (
+            "((article)) quick ((colour)) ((animal))",
+            "<span class='placeholder'>((article))</span> quick <span class='placeholder'>((colour))</span> <span class='placeholder'>((animal))</span>",  # noqa
+        ),
+        (
+            """
+                ((article)) quick
+                ((colour))
+                ((animal))
+            """,
+            """
+                <span class='placeholder'>((article))</span> quick
+                <span class='placeholder'>((colour))</span>
+                <span class='placeholder'>((animal))</span>
+            """,
+        ),
+        (
+            "the quick (((colour))) fox",
+            "the quick (<span class='placeholder'>((colour))</span>) fox",
+        ),
+        ("((warning?))", "<span class='placeholder'>((warning?))</span>"),
+        (
+            "((warning? This is not a conditional))",
+            "<span class='placeholder'>((warning? This is not a conditional))</span>",
+        ),
+        (
+            "((warning?? This is a warning))",
+            "<span class='placeholder-conditional'>((warning??</span> This is a warning))",
+        ),
+        (
+            "((warning?? This is a warning\n text after linebreak))",
+            "<span class='placeholder-conditional'>((warning??</span> This is a warning\n text after linebreak))",
+        ),
+    ],
+)
+def test_formatting_of_placeholders(content, expected):
+    assert str(Field(content)) == expected
+
+
+@pytest.mark.parametrize(
+    ("content", "values", "expected"),
+    [
+        (
+            "((name)) ((colour))",
+            {"name": "Jo"},
+            "Jo <span class='placeholder'>((colour))</span>",
+        ),
+        (
+            "((name)) ((colour))",
+            {"name": "Jo", "colour": None},
+            "Jo <span class='placeholder'>((colour))</span>",
+        ),
+        (
+            "((show_thing??thing)) ((colour))",
+            {"colour": "red"},
+            "<span class='placeholder-conditional'>((show_thing??</span>thing)) red",
+        ),
+    ],
+)
+def test_handling_of_missing_values(content, values, expected):
+    assert str(Field(content, values)) == expected
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "0",
+        0,
+        2,
+        99.99999,
+        "off",
+        "exclude",
+        "no" "any random string",
+        "false",
+        False,
+        [],
+        {},
+        (),
+        ["true"],
+        {"True": True},
+        (True, "true", 1),
+    ],
+)
+def test_what_will_not_trigger_conditional_placeholder(value):
+    assert str2bool(value) is False
+
+
+@pytest.mark.parametrize(
+    "value", [1, "1", "yes", "y", "true", "True", True, "include", "show"]
+)
+def test_what_will_trigger_conditional_placeholder(value):
+    assert str2bool(value) is True
+
+
+@pytest.mark.parametrize(
+    ("values", "expected", "expected_as_markdown"),
+    [
+        (
+            {"placeholder": []},
+            "list: ",
+            "list: ",
+        ),
+        (
+            {"placeholder": ["", ""]},
+            "list: ",
+            "list: ",
+        ),
+        (
+            {"placeholder": [" ", " \t ", "\u180E"]},
+            "list: ",
+            "list: ",
+        ),
+        (
+            {"placeholder": ["one"]},
+            "list: one",
+            "list: \n\n* one",
+        ),
+        (
+            {"placeholder": ["one", "two"]},
+            "list: one and two",
+            "list: \n\n* one\n* two",
+        ),
+        (
+            {"placeholder": ["one", "two", "three"]},
+            "list: one, two and three",
+            "list: \n\n* one\n* two\n* three",
+        ),
+        (
+            {"placeholder": ["one", None, None]},
+            "list: one",
+            "list: \n\n* one",
+        ),
+        (
+            {"placeholder": ["<script>", 'alert("foo")', "</script>"]},
+            'list: , alert("foo") and ',
+            'list: \n\n* \n* alert("foo")\n* ',
+        ),
+        (
+            {"placeholder": [1, {"two": 2}, "three", None]},
+            "list: 1, {'two': 2} and three",
+            "list: \n\n* 1\n* {'two': 2}\n* three",
+        ),
+        (
+            {"placeholder": [[1, 2], [3, 4]]},
+            "list: [1, 2] and [3, 4]",
+            "list: \n\n* [1, 2]\n* [3, 4]",
+        ),
+        (
+            {"placeholder": [0.1, True, False]},
+            "list: 0.1, True and False",
+            "list: \n\n* 0.1\n* True\n* False",
+        ),
+    ],
+)
+def test_field_renders_lists_as_strings(values, expected, expected_as_markdown):
+    assert (
+        str(Field("list: ((placeholder))", values, markdown_lists=True))
+        == expected_as_markdown
+    )
+    assert str(Field("list: ((placeholder))", values)) == expected
diff --git a/tests/notifications_utils/test_field_html_handling.py b/tests/notifications_utils/test_field_html_handling.py
new file mode 100644
index 0000000000..16f83826c1
--- /dev/null
+++ b/tests/notifications_utils/test_field_html_handling.py
@@ -0,0 +1,77 @@
+import pytest
+
+from notifications_utils.field import Field
+
+
+@pytest.mark.parametrize(
+    (
+        "content",
+        "values",
+        "expected_stripped",
+        "expected_escaped",
+        "expected_passthrough",
+    ),
+    [
+        (
+            "string <em>with</em> html",
+            {},
+            "string with html",
+            "string &lt;em&gt;with&lt;/em&gt; html",
+            "string <em>with</em> html",
+        ),
+        (
+            "string ((<em>with</em>)) html",
+            {},
+            "string <span class='placeholder'>((with))</span> html",
+            "string <span class='placeholder'>((&lt;em&gt;with&lt;/em&gt;))</span> html",
+            "string <span class='placeholder'>((<em>with</em>))</span> html",
+        ),
+        (
+            "string ((placeholder)) html",
+            {"placeholder": "<em>without</em>"},
+            "string without html",
+            "string &lt;em&gt;without&lt;/em&gt; html",
+            "string <em>without</em> html",
+        ),
+        (
+            "string ((<em>conditional</em>??<em>placeholder</em>)) html",
+            {},
+            "string <span class='placeholder-conditional'>((conditional??</span>placeholder)) html",
+            (
+                "string "
+                "<span class='placeholder-conditional'>"
+                "((&lt;em&gt;conditional&lt;/em&gt;??</span>"
+                "&lt;em&gt;placeholder&lt;/em&gt;)) "
+                "html"
+            ),
+            (
+                "string "
+                "<span class='placeholder-conditional'>"
+                "((<em>conditional</em>??</span>"
+                "<em>placeholder</em>)) "
+                "html"
+            ),
+        ),
+        (
+            "string ((conditional??<em>placeholder</em>)) html",
+            {"conditional": True},
+            "string placeholder html",
+            "string &lt;em&gt;placeholder&lt;/em&gt; html",
+            "string <em>placeholder</em> html",
+        ),
+        (
+            "string & entity",
+            {},
+            "string &amp; entity",
+            "string &amp; entity",
+            "string & entity",
+        ),
+    ],
+)
+def test_field_handles_html(
+    content, values, expected_stripped, expected_escaped, expected_passthrough
+):
+    assert str(Field(content, values)) == expected_stripped
+    assert str(Field(content, values, html="strip")) == expected_stripped
+    assert str(Field(content, values, html="escape")) == expected_escaped
+    assert str(Field(content, values, html="passthrough")) == expected_passthrough
diff --git a/tests/notifications_utils/test_formatters.py b/tests/notifications_utils/test_formatters.py
new file mode 100644
index 0000000000..61185d9744
--- /dev/null
+++ b/tests/notifications_utils/test_formatters.py
@@ -0,0 +1,577 @@
+import pytest
+from markupsafe import Markup
+
+from notifications_utils.formatters import (
+    autolink_urls,
+    escape_html,
+    formatted_list,
+    make_quotes_smart,
+    normalise_whitespace,
+    remove_smart_quotes_from_email_addresses,
+    remove_whitespace_before_punctuation,
+    replace_hyphens_with_en_dashes,
+    sms_encode,
+    strip_all_whitespace,
+    strip_and_remove_obscure_whitespace,
+    strip_unsupported_characters,
+    unlink_govuk_escaped,
+)
+from notifications_utils.template import (
+    HTMLEmailTemplate,
+    PlainTextEmailTemplate,
+    SMSMessageTemplate,
+    SMSPreviewTemplate,
+)
+
+
+@pytest.mark.parametrize(
+    ("url", "expected_html"),
+    [
+        (
+            """https://example.com/"onclick="alert('hi')""",
+            """<a class="govuk-link govuk-link--no-visited-state" href="https://example.com/%22onclick=%22alert%28%27hi%27%29">https://example.com/"onclick="alert('hi')</a>""",  # noqa
+        ),
+        (
+            """https://example.com/"style='text-decoration:blink'""",
+            """<a class="govuk-link govuk-link--no-visited-state" href="https://example.com/%22style=%27text-decoration:blink%27">https://example.com/"style='text-decoration:blink'</a>""",  # noqa
+        ),
+    ],
+)
+def test_URLs_get_escaped_in_sms(url, expected_html):
+    assert expected_html in str(
+        SMSPreviewTemplate({"content": url, "template_type": "sms"})
+    )
+
+
+def test_HTML_template_has_URLs_replaced_with_links():
+    assert (
+        '<a style="word-wrap: break-word; color: #1D70B8;" href="https://service.example.com/accept_invite/a1b2c3d4">'
+        "https://service.example.com/accept_invite/a1b2c3d4"
+        "</a>"
+    ) in str(
+        HTMLEmailTemplate(
+            {
+                "content": (
+                    "You’ve been invited to a service. Click this link:\n"
+                    "https://service.example.com/accept_invite/a1b2c3d4\n"
+                    "\n"
+                    "Thanks\n"
+                ),
+                "subject": "",
+                "template_type": "email",
+            }
+        )
+    )
+
+
+def test_escaping_govuk_in_email_templates():
+    template_content = "GOV.UK"
+    expected = "GOV.\u200BUK"
+    assert unlink_govuk_escaped(template_content) == expected
+    template_json = {
+        "content": template_content,
+        "subject": "",
+        "template_type": "email",
+    }
+    assert expected in str(PlainTextEmailTemplate(template_json))
+    assert expected in str(HTMLEmailTemplate(template_json))
+
+
+@pytest.mark.parametrize(
+    ("template_content", "expected"),
+    [
+        # Cases that we add the breaking space
+        ("GOV.UK", "GOV.\u200BUK"),
+        ("gov.uk", "gov.\u200Buk"),
+        (
+            "content with space infront GOV.UK",
+            "content with space infront GOV.\u200BUK",
+        ),
+        ("content with tab infront\tGOV.UK", "content with tab infront\tGOV.\u200BUK"),
+        (
+            "content with newline infront\nGOV.UK",
+            "content with newline infront\nGOV.\u200BUK",
+        ),
+        ("*GOV.UK", "*GOV.\u200BUK"),
+        ("#GOV.UK", "#GOV.\u200BUK"),
+        ("^GOV.UK", "^GOV.\u200BUK"),
+        (" #GOV.UK", " #GOV.\u200BUK"),
+        ("GOV.UK with CONTENT after", "GOV.\u200BUK with CONTENT after"),
+        ("#GOV.UK with CONTENT after", "#GOV.\u200BUK with CONTENT after"),
+        # Cases that we don't add the breaking space
+        ("https://gov.uk", "https://gov.uk"),
+        ("https://www.gov.uk", "https://www.gov.uk"),
+        ("www.gov.uk", "www.gov.uk"),
+        ("WWW.GOV.UK", "WWW.GOV.UK"),
+        ("WWW.GOV.UK.", "WWW.GOV.UK."),
+        (
+            "https://www.gov.uk/?utm_source=gov.uk",
+            "https://www.gov.uk/?utm_source=gov.uk",
+        ),
+        ("mygov.uk", "mygov.uk"),
+        ("www.this-site-is-not-gov.uk", "www.this-site-is-not-gov.uk"),
+        (
+            "www.gov.uk?websites=bbc.co.uk;gov.uk;nsh.scot",
+            "www.gov.uk?websites=bbc.co.uk;gov.uk;nsh.scot",
+        ),
+        ("reply to: xxxx@xxx.gov.uk", "reply to: xxxx@xxx.gov.uk"),
+        ("southwark.gov.uk", "southwark.gov.uk"),
+        ("data.gov.uk", "data.gov.uk"),
+        ("gov.uk/foo", "gov.uk/foo"),
+        ("*GOV.UK/foo", "*GOV.UK/foo"),
+        ("#GOV.UK/foo", "#GOV.UK/foo"),
+        ("^GOV.UK/foo", "^GOV.UK/foo"),
+        ("gov.uk#departments-and-policy", "gov.uk#departments-and-policy"),
+        # Cases that we know currently aren't supported by our regex and have a non breaking space added when they
+        # shouldn't however, we accept the fact that our regex isn't perfect as we think the chance of a user using a
+        # URL like this in their content is very small.
+        # We document these edge cases here
+        pytest.param("gov.uk.com", "gov.uk.com", marks=pytest.mark.xfail),
+        pytest.param("gov.ukandi.com", "gov.ukandi.com", marks=pytest.mark.xfail),
+        pytest.param("gov.uks", "gov.uks", marks=pytest.mark.xfail),
+    ],
+)
+def test_unlink_govuk_escaped(template_content, expected):
+    assert unlink_govuk_escaped(template_content) == expected
+
+
+@pytest.mark.parametrize(
+    ("prefix", "body", "expected"),
+    [
+        ("a", "b", "a: b"),
+        (None, "b", "b"),
+    ],
+)
+def test_sms_message_adds_prefix(prefix, body, expected):
+    template = SMSMessageTemplate({"content": body, "template_type": "sms"})
+    template.prefix = prefix
+    template.sender = None
+    assert str(template) == expected
+
+
+def test_sms_preview_adds_newlines():
+    template = SMSPreviewTemplate(
+        {
+            "content": """
+        the
+        quick
+
+        brown fox
+    """,
+            "template_type": "sms",
+        }
+    )
+    template.prefix = None
+    template.sender = None
+    assert "<br>" in str(template)
+
+
+def test_sms_encode(mocker):
+    sanitise_mock = mocker.patch("notifications_utils.formatters.SanitiseSMS")
+    assert sms_encode("foo") == sanitise_mock.encode.return_value
+    sanitise_mock.encode.assert_called_once_with("foo")
+
+
+@pytest.mark.parametrize(
+    ("items", "kwargs", "expected_output"),
+    [
+        ([1], {}, "‘1’"),
+        ([1, 2], {}, "‘1’ and ‘2’"),
+        ([1, 2, 3], {}, "‘1’, ‘2’ and ‘3’"),
+        ([1, 2, 3], {"prefix": "foo", "prefix_plural": "bar"}, "bar ‘1’, ‘2’ and ‘3’"),
+        ([1], {"prefix": "foo", "prefix_plural": "bar"}, "foo ‘1’"),
+        ([1, 2, 3], {"before_each": "a", "after_each": "b"}, "a1b, a2b and a3b"),
+        ([1, 2, 3], {"conjunction": "foo"}, "‘1’, ‘2’ foo ‘3’"),
+        (["&"], {"before_each": "<i>", "after_each": "</i>"}, "<i>&amp;</i>"),
+        (
+            [1, 2, 3],
+            {"before_each": "<i>", "after_each": "</i>"},
+            "<i>1</i>, <i>2</i> and <i>3</i>",
+        ),
+    ],
+)
+def test_formatted_list(items, kwargs, expected_output):
+    assert formatted_list(items, **kwargs) == expected_output
+
+
+def test_formatted_list_returns_markup():
+    assert isinstance(formatted_list([0]), Markup)
+
+
+def test_bleach_doesnt_try_to_make_valid_html_before_cleaning():
+    assert escape_html("<to cancel daily cat facts reply 'cancel'>") == (
+        "&lt;to cancel daily cat facts reply 'cancel'&gt;"
+    )
+
+
+@pytest.mark.parametrize(
+    ("content", "expected_escaped"),
+    [
+        ("&?a;", "&amp;?a;"),
+        ("&>a;", "&amp;&gt;a;"),
+        ("&*a;", "&amp;*a;"),
+        ("&a?;", "&amp;a?;"),
+        ("&x?xa;", "&amp;x?xa;"),
+        # We need to be careful that query arguments don’t get turned into entities
+        ("&timestamp=&times;", "&amp;timestamp=×"),
+        ("&times=1,2,3", "&amp;times=1,2,3"),
+        # &minus; should have a trailing semicolon according to the HTML5
+        # spec but &micro doesn’t need one
+        ("2&minus;1", "2−1"),
+        ("200&micro;g", "200µg"),
+        # …we ignore it when it’s ambiguous
+        ("2&minus1", "2&amp;minus1"),
+        ("200&microg", "200&amp;microg"),
+        # …we still ignore when there’s a space afterwards
+        ("2 &minus 1", "2 &amp;minus 1"),
+        ("200&micro g", "200&amp;micro g"),
+        # Things which aren’t real entities are ignored, not removed
+        ("This &isnotarealentity;", "This &amp;isnotarealentity;"),
+        # We let users use &nbsp; for backwards compatibility
+        ("Before&nbsp;after", "Before&nbsp;after"),
+        # We let users use &amp; because it’s often pasted in URLs
+        ("?a=1&amp;b=2", "?a=1&amp;b=2"),
+        # We let users use &lpar; and &rpar; because otherwise it’s
+        # impossible to put brackets in the body of conditional placeholders
+        ("((var??&lpar;in brackets&rpar;))", "((var??&lpar;in brackets&rpar;))"),
+    ],
+)
+def test_escaping_html_entities(
+    content,
+    expected_escaped,
+):
+    assert escape_html(content) == expected_escaped
+
+
+@pytest.mark.parametrize(
+    ("dirty", "clean"),
+    [
+        (
+            "Hello ((name)) ,\n\nThis is a message",
+            "Hello ((name)),\n\nThis is a message",
+        ),
+        ("Hello Jo ,\n\nThis is a message", "Hello Jo,\n\nThis is a message"),
+        (
+            "\n   \t    , word",
+            "\n, word",
+        ),
+    ],
+)
+def test_removing_whitespace_before_commas(dirty, clean):
+    assert remove_whitespace_before_punctuation(dirty) == clean
+
+
+@pytest.mark.parametrize(
+    ("dirty", "clean"),
+    [
+        (
+            "Hello ((name)) .\n\nThis is a message",
+            "Hello ((name)).\n\nThis is a message",
+        ),
+        ("Hello Jo .\n\nThis is a message", "Hello Jo.\n\nThis is a message"),
+        (
+            "\n   \t    . word",
+            "\n. word",
+        ),
+    ],
+)
+def test_removing_whitespace_before_full_stops(dirty, clean):
+    assert remove_whitespace_before_punctuation(dirty) == clean
+
+
+@pytest.mark.parametrize(
+    ("dumb", "smart"),
+    [
+        (
+            """And I said, "what about breakfast at Tiffany's"?""",
+            """And I said, “what about breakfast at Tiffany’s”?""",
+        ),
+        (
+            """
+            <a href="http://example.com?q='foo'">http://example.com?q='foo'</a>
+        """,
+            """
+            <a href="http://example.com?q='foo'">http://example.com?q='foo'</a>
+        """,
+        ),
+    ],
+)
+def test_smart_quotes(dumb, smart):
+    assert make_quotes_smart(dumb) == smart
+
+
+@pytest.mark.parametrize(
+    ("nasty", "nice"),
+    [
+        (
+            (
+                "The en dash - always with spaces in running text when, as "
+                "discussed in this section, indicating a parenthesis or "
+                "pause - and the spaced em dash both have a certain "
+                "technical advantage over the unspaced em dash. "
+            ),
+            (
+                "The en dash \u2013 always with spaces in running text when, as "
+                "discussed in this section, indicating a parenthesis or "
+                "pause \u2013 and the spaced em dash both have a certain "
+                "technical advantage over the unspaced em dash. "
+            ),
+        ),
+        (
+            "double -- dash",
+            "double \u2013 dash",
+        ),
+        (
+            "triple --- dash",
+            "triple \u2013 dash",
+        ),
+        (
+            "quadruple ---- dash",
+            "quadruple ---- dash",
+        ),
+        (
+            "em — dash",
+            "em – dash",
+        ),
+        (
+            "already\u0020–\u0020correct",  # \u0020 is a normal space character
+            "already\u0020–\u0020correct",
+        ),
+        (
+            "2004-2008",
+            "2004-2008",  # no replacement
+        ),
+    ],
+)
+def test_en_dashes(nasty, nice):
+    assert replace_hyphens_with_en_dashes(nasty) == nice
+
+
+def test_unicode_dash_lookup():
+    en_dash_replacement_sequence = "\u0020\u2013"
+    hyphen = "-"
+    en_dash = "–"
+    space = " "
+    non_breaking_space = " "
+    assert en_dash_replacement_sequence == space + en_dash
+    assert non_breaking_space not in en_dash_replacement_sequence
+    assert hyphen not in en_dash_replacement_sequence
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "bar",
+        " bar ",
+        """
+        \t    bar
+    """,
+        " \u180E\u200B \u200C bar \u200D \u2060\uFEFF ",
+    ],
+)
+def test_strip_all_whitespace(value):
+    assert strip_all_whitespace(value) == "bar"
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "notifications-email",
+        "  \tnotifications-email \x0c ",
+        "\rn\u200Coti\u200Dfi\u200Bcati\u2060ons-\u180Eemai\uFEFFl\uFEFF",
+    ],
+)
+def test_strip_and_remove_obscure_whitespace(value):
+    assert strip_and_remove_obscure_whitespace(value) == "notifications-email"
+
+
+def test_strip_and_remove_obscure_whitespace_only_removes_normal_whitespace_from_ends():
+    sentence = "   words \n over multiple lines with \ttabs\t   "
+    assert (
+        strip_and_remove_obscure_whitespace(sentence)
+        == "words \n over multiple lines with \ttabs"
+    )
+
+
+def test_remove_smart_quotes_from_email_addresses():
+    assert (
+        remove_smart_quotes_from_email_addresses(
+            """
+        line one’s quote
+        first.o’last@example.com is someone’s email address
+        line ‘three’
+    """
+        )
+        == (
+            """
+        line one’s quote
+        first.o'last@example.com is someone’s email address
+        line ‘three’
+    """
+        )
+    )
+
+
+def test_strip_unsupported_characters():
+    assert strip_unsupported_characters("line one\u2028line two") == (
+        "line oneline two"
+    )
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        "\u200C Your tax   is\ndue\n\n",
+        "  Your tax is due  ",
+        # Non breaking spaces replaced by single spaces
+        "\u00A0Your\u00A0tax\u00A0 is\u00A0\u00A0due\u00A0",
+        # zero width spaces are removed
+        "\u180EYour \u200Btax\u200C is \u200D\u2060due \uFEFF",
+        # tabs are replaced by single spaces
+        "\tYour tax\tis due  ",
+    ],
+)
+def test_normalise_whitespace(value):
+    assert normalise_whitespace(value) == "Your tax is due"
+
+
+@pytest.mark.parametrize(
+    ("content", "expected_html"),
+    [
+        (
+            "http://example.com",
+            '<a href="http://example.com">http://example.com</a>',
+        ),
+        (
+            "https://example.com",
+            '<a href="https://example.com">https://example.com</a>',
+        ),
+        (
+            "example.com",
+            '<a href="http://example.com">example.com</a>',
+        ),
+        (
+            "www.foo.bar.example.com",
+            '<a href="http://www.foo.bar.example.com">www.foo.bar.example.com</a>',
+        ),
+        (
+            "example.com/",
+            '<a href="http://example.com/">example.com/</a>',
+        ),
+        (
+            "www.foo.bar.example.com/",
+            '<a href="http://www.foo.bar.example.com/">www.foo.bar.example.com/</a>',
+        ),
+        (
+            "example.com/foo",
+            '<a href="http://example.com/foo">example.com/foo</a>',
+        ),
+        (
+            "example.com?foo",
+            '<a href="http://example.com?foo">example.com?foo</a>',
+        ),
+        (
+            "example.com#foo",
+            '<a href="http://example.com#foo">example.com#foo</a>',
+        ),
+        (
+            "Go to gov.uk/example.",
+            "Go to " '<a href="http://gov.uk/example">gov.uk/example</a>.',
+        ),
+        (
+            "Go to gov.uk/example:",
+            "Go to " '<a href="http://gov.uk/example">gov.uk/example</a>:',
+        ),
+        (
+            "Go to gov.uk/example;",
+            "Go to " '<a href="http://gov.uk/example;">gov.uk/example;</a>',
+        ),
+        (
+            "(gov.uk/example)",
+            "(" '<a href="http://gov.uk/example">gov.uk/example</a>)',
+        ),
+        (
+            "(gov.uk/example)...",
+            "(" '<a href="http://gov.uk/example">gov.uk/example</a>)...',
+        ),
+        (
+            "(gov.uk/example.)",
+            "(" '<a href="http://gov.uk/example">gov.uk/example</a>.)',
+        ),
+        (
+            "(see example.com/foo_(bar))",
+            "(see "
+            '<a href="http://example.com/foo_%28bar%29">example.com/foo_(bar)</a>)',
+        ),
+        (
+            "example.com/foo(((((((bar",
+            '<a href="http://example.com/foo%28%28%28%28%28%28%28bar">example.com/foo(((((((bar</a>',
+        ),
+        (
+            "government website (gov.uk). Other websites…",
+            "government website ("
+            '<a href="http://gov.uk">gov.uk</a>). Other websites…',
+        ),
+        (
+            "[gov.uk/example]",
+            "[" '<a href="http://gov.uk/example">gov.uk/example</a>]',
+        ),
+        (
+            "gov.uk/foo, gov.uk/bar",
+            '<a href="http://gov.uk/foo">gov.uk/foo</a>, '
+            '<a href="http://gov.uk/bar">gov.uk/bar</a>',
+        ),
+        (
+            "<p>gov.uk/foo</p>",
+            "<p>" '<a href="http://gov.uk/foo">gov.uk/foo</a></p>',
+        ),
+        (
+            "gov.uk?foo&amp;",
+            '<a href="http://gov.uk?foo&amp;">gov.uk?foo&amp;</a>',
+        ),
+        (
+            "a .service.gov.uk domain",
+            "a .service.gov.uk domain",
+        ),
+        (
+            'http://foo.com/"bar"?x=1#2',
+            '<a href="http://foo.com/%22bar%22?x=1#2">http://foo.com/"bar"?x=1#2</a>',
+        ),
+        (
+            "firstname.lastname@example.com",
+            "firstname.lastname@example.com",
+        ),
+        (
+            "with-subdomain@test.example.com",
+            "with-subdomain@test.example.com",
+        ),
+    ],
+)
+def test_autolink_urls_matches_correctly(content, expected_html):
+    assert autolink_urls(content) == expected_html
+
+
+@pytest.mark.parametrize(
+    ("extra_kwargs", "expected_html"),
+    [
+        (
+            {},
+            '<a href="http://example.com">http://example.com</a>',
+        ),
+        (
+            {
+                "classes": "govuk-link",
+            },
+            '<a class="govuk-link" href="http://example.com">http://example.com</a>',
+        ),
+    ],
+)
+def test_autolink_urls_applies_correct_attributes(extra_kwargs, expected_html):
+    assert autolink_urls("http://example.com", **extra_kwargs) == expected_html
+
+
+@pytest.mark.parametrize(
+    "content", ["without link", "with link to https://example.com"]
+)
+def test_autolink_urls_returns_markup(content):
+    assert isinstance(autolink_urls(content), Markup)
diff --git a/tests/notifications_utils/test_insensitive_dict.py b/tests/notifications_utils/test_insensitive_dict.py
new file mode 100644
index 0000000000..e019b55ca7
--- /dev/null
+++ b/tests/notifications_utils/test_insensitive_dict.py
@@ -0,0 +1,96 @@
+from functools import partial
+
+import pytest
+
+from notifications_utils.insensitive_dict import InsensitiveDict
+from notifications_utils.recipients import Cell, Row
+
+
+def test_columns_as_dict_with_keys():
+    assert InsensitiveDict(
+        {"Date of Birth": "01/01/2001", "TOWN": "London"}
+    ).as_dict_with_keys({"date_of_birth", "town"}) == {
+        "date_of_birth": "01/01/2001",
+        "town": "London",
+    }
+
+
+def test_columns_as_dict():
+    assert dict(InsensitiveDict({"date of birth": "01/01/2001", "TOWN": "London"})) == {
+        "dateofbirth": "01/01/2001",
+        "town": "London",
+    }
+
+
+def test_missing_data():
+    partial_row = partial(
+        Row,
+        row_dict={},
+        index=1,
+        error_fn=None,
+        recipient_column_headers=[],
+        placeholders=[],
+        template=None,
+        allow_international_letters=False,
+    )
+    with pytest.raises(KeyError):
+        InsensitiveDict({})["foo"]
+    assert InsensitiveDict({}).get("foo") is None
+    assert InsensitiveDict({}).get("foo", "bar") == "bar"
+    assert partial_row()["foo"] == Cell()
+    assert partial_row().get("foo") == Cell()
+    assert partial_row().get("foo", "bar") == "bar"
+
+
+@pytest.mark.parametrize(
+    "in_dictionary",
+    [
+        {"foo": "bar"},
+        {"F_O O": "bar"},
+    ],
+)
+@pytest.mark.parametrize(
+    ("key", "should_be_present"),
+    [
+        ("foo", True),
+        ("f_o_o", True),
+        ("F O O", True),
+        ("bar", False),
+    ],
+)
+def test_lookup(key, should_be_present, in_dictionary):
+    assert (key in InsensitiveDict(in_dictionary)) == should_be_present
+
+
+@pytest.mark.parametrize(
+    "key_in",
+    [
+        "foo",
+        "F_O O",
+    ],
+)
+@pytest.mark.parametrize(
+    "lookup_key",
+    [
+        "foo",
+        "f_o_o",
+        "F O O",
+    ],
+)
+def test_set_item(key_in, lookup_key):
+    columns = InsensitiveDict({})
+    columns[key_in] = "bar"
+    assert columns[lookup_key] == "bar"
+
+
+def test_maintains_insertion_order():
+    d = InsensitiveDict(
+        {
+            "B": None,
+            "A": None,
+            "C": None,
+        }
+    )
+    assert d.keys() == ["b", "a", "c"]
+    d["BB"] = None
+    assert d.keys() == ["b", "a", "c", "bb"]
diff --git a/tests/notifications_utils/test_international_billing_rates.py b/tests/notifications_utils/test_international_billing_rates.py
new file mode 100644
index 0000000000..d7bd1a7270
--- /dev/null
+++ b/tests/notifications_utils/test_international_billing_rates.py
@@ -0,0 +1,50 @@
+import pytest
+
+from notifications_utils.international_billing_rates import (
+    COUNTRY_PREFIXES,
+    INTERNATIONAL_BILLING_RATES,
+)
+from notifications_utils.recipients import use_numeric_sender
+
+
+def test_international_billing_rates_exists():
+    assert INTERNATIONAL_BILLING_RATES["1"]["names"][0] == "Canada"
+
+
+@pytest.mark.parametrize(
+    ("country_prefix", "values"), sorted(INTERNATIONAL_BILLING_RATES.items())
+)
+def test_international_billing_rates_are_in_correct_format(country_prefix, values):
+    assert isinstance(country_prefix, str)
+    # we don't want the prefixes to have + at the beginning for instance
+    assert country_prefix.isdigit()
+
+    assert set(values.keys()) == {"attributes", "billable_units", "names"}
+
+    assert isinstance(values["billable_units"], int)
+    assert 1 <= values["billable_units"] <= 3
+
+    assert isinstance(values["names"], list)
+    assert all(isinstance(country, str) for country in values["names"])
+
+    assert isinstance(values["attributes"], dict)
+    assert values["attributes"]["dlr"] is None or isinstance(
+        values["attributes"]["dlr"], str
+    )
+
+
+def test_country_codes():
+    assert len(COUNTRY_PREFIXES) == 214
+
+
+@pytest.mark.parametrize(
+    ("number", "expected"),
+    [
+        ("+48123654789", False),  # Poland alpha: Yes
+        ("+1-403-123-5687", True),  # Canada alpha: No
+        ("+40123548897", False),  # Romania alpha: REG
+        ("+60123451345", True),
+    ],
+)  # Malaysia alpha: NO
+def test_use_numeric_sender(number, expected):
+    assert use_numeric_sender(number) == expected
diff --git a/tests/notifications_utils/test_letter_timings.py b/tests/notifications_utils/test_letter_timings.py
new file mode 100644
index 0000000000..aecc9c744e
--- /dev/null
+++ b/tests/notifications_utils/test_letter_timings.py
@@ -0,0 +1,276 @@
+from datetime import datetime
+
+import pytest
+import pytz
+from freezegun import freeze_time
+
+from notifications_utils.letter_timings import (
+    get_letter_timings,
+    letter_can_be_cancelled,
+)
+
+
+@freeze_time("2017-07-14 13:59:59")  # Friday, before print deadline (3PM EST)
+@pytest.mark.parametrize(
+    (
+        "upload_time",
+        "expected_print_time",
+        "is_printed",
+        "first_class",
+        "expected_earliest",
+        "expected_latest",
+    ),
+    [
+        # EST
+        # ==================================================================
+        #  First thing Monday
+        (
+            "Monday 2017-07-10 00:00:01",
+            "Tuesday 2017-07-11 15:00",
+            True,
+            "Wednesday 2017-07-12 16:00",
+            "Thursday 2017-07-13 16:00",
+            "Friday 2017-07-14 16:00",
+        ),
+        #  Monday at 17:29 EST (sent on monday)
+        (
+            "Monday 2017-07-10 16:29:59",
+            "Tuesday 2017-07-11 15:00",
+            True,
+            "Wednesday 2017-07-12 16:00",
+            "Thursday 2017-07-13 16:00",
+            "Friday 2017-07-14 16:00",
+        ),
+        #  Monday at 17:30 EST (sent on tuesday)
+        (
+            "Monday 2017-07-10 16:30:01",
+            "Wednesday 2017-07-12 15:00",
+            True,
+            "Thursday 2017-07-13 16:00",
+            "Friday 2017-07-14 16:00",
+            "Saturday 2017-07-15 16:00",
+        ),
+        #  Tuesday before 17:30 EST
+        (
+            "Tuesday 2017-07-11 12:00:00",
+            "Wednesday 2017-07-12 15:00",
+            True,
+            "Thursday 2017-07-13 16:00",
+            "Friday 2017-07-14 16:00",
+            "Saturday 2017-07-15 16:00",
+        ),
+        #  Wednesday before 17:30 EST
+        (
+            "Wednesday 2017-07-12 12:00:00",
+            "Thursday 2017-07-13 15:00",
+            True,
+            "Friday 2017-07-14 16:00",
+            "Saturday 2017-07-15 16:00",
+            "Monday 2017-07-17 16:00",
+        ),
+        #  Thursday before 17:30 EST
+        (
+            "Thursday 2017-07-13 12:00:00",
+            "Friday 2017-07-14 15:00",
+            False,
+            "Saturday 2017-07-15 16:00",
+            "Monday 2017-07-17 16:00",
+            "Tuesday 2017-07-18 16:00",
+        ),
+        #  Friday anytime
+        (
+            "Friday 2017-07-14 00:00:00",
+            "Monday 2017-07-17 15:00",
+            False,
+            "Tuesday 2017-07-18 16:00",
+            "Wednesday 2017-07-19 16:00",
+            "Thursday 2017-07-20 16:00",
+        ),
+        (
+            "Friday 2017-07-14 12:00:00",
+            "Monday 2017-07-17 15:00",
+            False,
+            "Tuesday 2017-07-18 16:00",
+            "Wednesday 2017-07-19 16:00",
+            "Thursday 2017-07-20 16:00",
+        ),
+        (
+            "Friday 2017-07-14 22:00:00",
+            "Monday 2017-07-17 15:00",
+            False,
+            "Tuesday 2017-07-18 16:00",
+            "Wednesday 2017-07-19 16:00",
+            "Thursday 2017-07-20 16:00",
+        ),
+        #  Saturday anytime
+        (
+            "Saturday 2017-07-14 12:00:00",
+            "Monday 2017-07-17 15:00",
+            False,
+            "Tuesday 2017-07-18 16:00",
+            "Wednesday 2017-07-19 16:00",
+            "Thursday 2017-07-20 16:00",
+        ),
+        #  Sunday before 1730 EST
+        (
+            "Sunday 2017-07-15 15:59:59",
+            "Monday 2017-07-17 15:00",
+            False,
+            "Tuesday 2017-07-18 16:00",
+            "Wednesday 2017-07-19 16:00",
+            "Thursday 2017-07-20 16:00",
+        ),
+        #  Sunday after 17:30 EST
+        (
+            "Sunday 2017-07-16 16:30:01",
+            "Tuesday 2017-07-18 15:00",
+            False,
+            "Wednesday 2017-07-19 16:00",
+            "Thursday 2017-07-20 16:00",
+            "Friday 2017-07-21 16:00",
+        ),
+        # GMT
+        # ==================================================================
+        #  Monday at 17:29 GMT
+        (
+            "Monday 2017-01-02 17:29:59",
+            "Tuesday 2017-01-03 15:00",
+            True,
+            "Wednesday 2017-01-04 16:00",
+            "Thursday 2017-01-05 16:00",
+            "Friday 2017-01-06 16:00",
+        ),
+        #  Monday at 17:00 GMT
+        (
+            "Monday 2017-01-02 17:30:01",
+            "Wednesday 2017-01-04 15:00",
+            True,
+            "Thursday 2017-01-05 16:00",
+            "Friday 2017-01-06 16:00",
+            "Saturday 2017-01-07 16:00",
+        ),
+    ],
+)
+@pytest.mark.skip(reason="Letters being developed later")
+def test_get_estimated_delivery_date_for_letter(
+    upload_time,
+    expected_print_time,
+    is_printed,
+    first_class,
+    expected_earliest,
+    expected_latest,
+):
+    # remove the day string from the upload_time, which is purely informational
+
+    def format_dt(x):
+        return x.astimezone(pytz.timezone("America/New_York")).strftime(
+            "%A %Y-%m-%d %H:%M"
+        )
+
+    upload_time = upload_time.split(" ", 1)[1]
+
+    timings = get_letter_timings(upload_time, postage="second")
+
+    assert format_dt(timings.printed_by) == expected_print_time
+    assert timings.is_printed == is_printed
+    assert format_dt(timings.earliest_delivery) == expected_earliest
+    assert format_dt(timings.latest_delivery) == expected_latest
+
+    first_class_timings = get_letter_timings(upload_time, postage="first")
+
+    assert format_dt(first_class_timings.printed_by) == expected_print_time
+    assert first_class_timings.is_printed == is_printed
+    assert format_dt(first_class_timings.earliest_delivery) == first_class
+    assert format_dt(first_class_timings.latest_delivery) == first_class
+
+
+@pytest.mark.parametrize("status", ["sending", "pending"])
+def test_letter_cannot_be_cancelled_if_letter_status_is_not_created_or_pending_virus_check(
+    status,
+):
+    notification_created_at = datetime.utcnow()
+
+    assert not letter_can_be_cancelled(status, notification_created_at)
+
+
+@freeze_time("2018-7-7 16:00:00")
+@pytest.mark.parametrize(
+    "notification_created_at",
+    [
+        datetime(2018, 7, 6, 18, 0),  # created yesterday after 1730
+        datetime(2018, 7, 7, 12, 0),  # created today
+    ],
+)
+@pytest.mark.skip(reason="Letters not part of release")
+def test_letter_can_be_cancelled_if_before_1730_and_letter_created_before_1730(
+    notification_created_at,
+):
+    notification_status = "pending-virus-check"
+
+    assert letter_can_be_cancelled(notification_status, notification_created_at)
+
+
+@freeze_time("2017-12-12 17:30:00")
+@pytest.mark.parametrize(
+    "notification_created_at",
+    [
+        datetime(2017, 12, 12, 17, 0),
+        datetime(2017, 12, 12, 17, 30),
+    ],
+)
+@pytest.mark.skip(reason="Letters not part of release")
+def test_letter_cannot_be_cancelled_if_1730_exactly_and_letter_created_at_or_before_1730(
+    notification_created_at,
+):
+    notification_status = "pending-virus-check"
+
+    assert not letter_can_be_cancelled(notification_status, notification_created_at)
+
+
+@freeze_time("2018-7-7 19:00:00")
+@pytest.mark.parametrize(
+    "notification_created_at",
+    [
+        datetime(2018, 7, 6, 18, 0),  # created yesterday after 1730
+        datetime(2018, 7, 7, 12, 0),  # created today before 1730
+    ],
+)
+@pytest.mark.skip(reason="Letters not part of release")
+def test_letter_cannot_be_cancelled_if_after_1730_and_letter_created_before_1730(
+    notification_created_at,
+):
+    notification_status = "created"
+
+    assert not letter_can_be_cancelled(notification_status, notification_created_at)
+
+
+@freeze_time("2018-7-7 15:00:00")
+@pytest.mark.skip(reason="Letters not part of release")
+def test_letter_cannot_be_cancelled_if_before_1730_and_letter_created_before_1730_yesterday():
+    notification_status = "created"
+
+    assert not letter_can_be_cancelled(notification_status, datetime(2018, 7, 6, 14, 0))
+
+
+@freeze_time("2018-7-7 15:00:00")
+@pytest.mark.skip(reason="Letters not part of release")
+def test_letter_cannot_be_cancelled_if_before_1730_and_letter_created_after_1730_two_days_ago():
+    notification_status = "created"
+
+    assert not letter_can_be_cancelled(notification_status, datetime(2018, 7, 5, 19, 0))
+
+
+@freeze_time("2018-7-7 19:00:00")
+@pytest.mark.parametrize(
+    "notification_created_at",
+    [
+        datetime(2018, 7, 7, 18, 30),
+        datetime(2018, 7, 7, 19, 0),
+    ],
+)
+def test_letter_can_be_cancelled_if_after_1730_and_letter_created_at_1730_today_or_later(
+    notification_created_at,
+):
+    notification_status = "created"
+
+    assert letter_can_be_cancelled(notification_status, notification_created_at)
diff --git a/tests/notifications_utils/test_logging.py b/tests/notifications_utils/test_logging.py
new file mode 100644
index 0000000000..cc7f5ee34b
--- /dev/null
+++ b/tests/notifications_utils/test_logging.py
@@ -0,0 +1,51 @@
+import json
+import logging as builtin_logging
+
+from notifications_utils import logging
+
+
+def test_get_handlers_sets_up_logging_appropriately_with_debug():
+    class App:
+        config = {"NOTIFY_APP_NAME": "bar", "NOTIFY_LOG_LEVEL": "ERROR"}
+        debug = True
+
+    app = App()
+
+    handlers = logging.get_handlers(app)
+
+    assert len(handlers) == 1
+    assert isinstance(handlers[0], builtin_logging.StreamHandler)
+    assert isinstance(handlers[0].formatter, builtin_logging.Formatter)
+
+
+def test_get_handlers_sets_up_logging_appropriately_without_debug():
+    class App:
+        config = {"NOTIFY_APP_NAME": "bar", "NOTIFY_LOG_LEVEL": "ERROR"}
+        debug = False
+
+    app = App()
+
+    handlers = logging.get_handlers(app)
+
+    assert len(handlers) == 1
+    assert isinstance(handlers[0], builtin_logging.StreamHandler)
+    assert isinstance(handlers[0].formatter, logging.JSONFormatter)
+
+
+def test_base_json_formatter_contains_service_id():
+    record = builtin_logging.LogRecord(
+        name="log thing",
+        level="info",
+        pathname="path",
+        lineno=123,
+        msg="message to log",
+        exc_info=None,
+        args=None,
+    )
+
+    service_id_filter = logging.ServiceIdFilter()
+    assert (
+        json.loads(logging.BaseJSONFormatter().format(record))["message"]
+        == "message to log"
+    )
+    assert service_id_filter.filter(record).service_id == "no-service-id"
diff --git a/tests/notifications_utils/test_markdown.py b/tests/notifications_utils/test_markdown.py
new file mode 100644
index 0000000000..be1053725d
--- /dev/null
+++ b/tests/notifications_utils/test_markdown.py
@@ -0,0 +1,666 @@
+import pytest
+
+from notifications_utils.markdown import (
+    notify_email_markdown,
+    notify_letter_preview_markdown,
+    notify_plain_text_email_markdown,
+)
+from notifications_utils.template import HTMLEmailTemplate
+
+
+@pytest.mark.parametrize(
+    "url",
+    [
+        "http://example.com",
+        "http://www.gov.uk/",
+        "https://www.gov.uk/",
+        "http://service.gov.uk",
+        "http://service.gov.uk/blah.ext?q=a%20b%20c&order=desc#fragment",
+        pytest.param(
+            "http://service.gov.uk/blah.ext?q=one two three", marks=pytest.mark.xfail
+        ),
+    ],
+)
+def test_makes_links_out_of_URLs(url):
+    link = '<a style="word-wrap: break-word; color: #1D70B8;" href="{}">{}</a>'.format(
+        url, url
+    )
+    assert notify_email_markdown(url) == (
+        '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+        "{}"
+        "</p>"
+    ).format(link)
+
+
+@pytest.mark.parametrize(
+    ("input", "output"),
+    [
+        (
+            ("this is some text with a link http://example.com in the middle"),
+            (
+                "this is some text with a link "
+                '<a style="word-wrap: break-word; color: #1D70B8;" href="http://example.com">http://example.com</a>'
+                " in the middle"
+            ),
+        ),
+        (
+            ("this link is in brackets (http://example.com)"),
+            (
+                "this link is in brackets "
+                '(<a style="word-wrap: break-word; color: #1D70B8;" href="http://example.com">http://example.com</a>)'
+            ),
+        ),
+    ],
+)
+def test_makes_links_out_of_URLs_in_context(input, output):
+    assert notify_email_markdown(input) == (
+        '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+        "{}"
+        "</p>"
+    ).format(output)
+
+
+@pytest.mark.parametrize(
+    "url",
+    [
+        "example.com",
+        "www.example.com",
+        "ftp://example.com",
+        "test@example.com",
+        "mailto:test@example.com",
+        '<a href="https://example.com">Example</a>',
+    ],
+)
+def test_doesnt_make_links_out_of_invalid_urls(url):
+    assert notify_email_markdown(url) == (
+        '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+        "{}"
+        "</p>"
+    ).format(url)
+
+
+def test_handles_placeholders_in_urls():
+    assert notify_email_markdown(
+        "http://example.com/?token=<span class='placeholder'>((token))</span>&key=1"
+    ) == (
+        '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+        '<a style="word-wrap: break-word; color: #1D70B8;" href="http://example.com/?token=">'
+        "http://example.com/?token="
+        "</a>"
+        "<span class='placeholder'>((token))</span>&amp;key=1"
+        "</p>"
+    )
+
+
+@pytest.mark.parametrize(
+    ("url", "expected_html", "expected_html_in_template"),
+    [
+        (
+            """https://example.com"onclick="alert('hi')""",
+            """<a style="word-wrap: break-word; color: #1D70B8;" href="https://example.com%22onclick=%22alert%28%27hi">https://example.com"onclick="alert('hi</a>')""",  # noqa
+            """<a style="word-wrap: break-word; color: #1D70B8;" href="https://example.com%22onclick=%22alert%28%27hi">https://example.com"onclick="alert('hi</a>‘)""",  # noqa
+        ),
+        (
+            """https://example.com"style='text-decoration:blink'""",
+            """<a style="word-wrap: break-word; color: #1D70B8;" href="https://example.com%22style=%27text-decoration:blink">https://example.com"style='text-decoration:blink</a>'""",  # noqa
+            """<a style="word-wrap: break-word; color: #1D70B8;" href="https://example.com%22style=%27text-decoration:blink">https://example.com"style='text-decoration:blink</a>’""",  # noqa
+        ),
+    ],
+)
+def test_URLs_get_escaped(url, expected_html, expected_html_in_template):
+    assert notify_email_markdown(url) == (
+        '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+        "{}"
+        "</p>"
+    ).format(expected_html)
+    assert expected_html_in_template in str(
+        HTMLEmailTemplate(
+            {
+                "content": url,
+                "subject": "",
+                "template_type": "email",
+            }
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected_output"),
+    [
+        (
+            notify_email_markdown,
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+                '<a style="word-wrap: break-word; color: #1D70B8;" href="https://example.com">'
+                "https://example.com"
+                "</a>"
+                "</p>"
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+                "Next paragraph"
+                "</p>"
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\nhttps://example.com" "\n" "\nNext paragraph"),
+        ),
+    ],
+)
+def test_preserves_whitespace_when_making_links(markdown_function, expected_output):
+    assert (
+        markdown_function("https://example.com\n" "\n" "Next paragraph")
+        == expected_output
+    )
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (notify_letter_preview_markdown, 'print("hello")'),
+        (notify_email_markdown, 'print("hello")'),
+        (notify_plain_text_email_markdown, 'print("hello")'),
+    ],
+)
+def test_block_code(markdown_function, expected):
+    assert markdown_function('```\nprint("hello")\n```') == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (notify_letter_preview_markdown, ("<p>inset text</p>")),
+        (
+            notify_email_markdown,
+            (
+                "<blockquote "
+                'style="Margin: 0 0 20px 0; border-left: 10px solid #B1B4B6;'
+                "padding: 15px 0 0.1px 15px; font-size: 19px; line-height: 25px;"
+                '">'
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">inset text</p>'
+                "</blockquote>"
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\ninset text"),
+        ),
+    ],
+)
+def test_block_quote(markdown_function, expected):
+    assert markdown_function("^ inset text") == expected
+
+
+@pytest.mark.parametrize(
+    "heading",
+    [
+        "# heading",
+        "#heading",
+    ],
+)
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (notify_letter_preview_markdown, "<h2>heading</h2>\n"),
+        (
+            notify_email_markdown,
+            (
+                '<h2 style="Margin: 0 0 20px 0; padding: 0; font-size: 27px; '
+                'line-height: 35px; font-weight: bold; color: #0B0C0C;">'
+                "heading"
+                "</h2>"
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            (
+                "\n"
+                "\n"
+                "\nheading"
+                "\n-----------------------------------------------------------------"
+            ),
+        ),
+    ],
+)
+def test_level_1_header(markdown_function, heading, expected):
+    assert markdown_function(heading) == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (notify_letter_preview_markdown, "<p>inset text</p>"),
+        (
+            notify_email_markdown,
+            '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">inset text</p>',
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\ninset text"),
+        ),
+    ],
+)
+def test_level_2_header(markdown_function, expected):
+    assert markdown_function("## inset text") == (expected)
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            ("<p>a</p>" '<div class="page-break">&nbsp;</div>' "<p>b</p>"),
+        ),
+        (
+            notify_email_markdown,
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">a</p>'
+                '<hr style="border: 0; height: 1px; background: #B1B4B6; Margin: 30px 0 30px 0;">'
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">b</p>'
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            (
+                "\n"
+                "\na"
+                "\n"
+                "\n================================================================="
+                "\n"
+                "\nb"
+            ),
+        ),
+    ],
+)
+def test_hrule(markdown_function, expected):
+    assert markdown_function("a\n\n***\n\nb") == expected
+    assert markdown_function("a\n\n---\n\nb") == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            ("<ol>\n" "<li>one</li>\n" "<li>two</li>\n" "<li>three</li>\n" "</ol>\n"),
+        ),
+        (
+            notify_email_markdown,
+            (
+                '<table role="presentation" style="padding: 0 0 20px 0;">'
+                "<tr>"
+                '<td style="font-family: Helvetica, Arial, sans-serif;">'
+                '<ol style="Margin: 0 0 0 20px; padding: 0; list-style-type: decimal;">'
+                '<li style="Margin: 5px 0 5px; padding: 0 0 0 5px; font-size: 19px;'
+                'line-height: 25px; color: #0B0C0C;">one</li>'
+                '<li style="Margin: 5px 0 5px; padding: 0 0 0 5px; font-size: 19px;'
+                'line-height: 25px; color: #0B0C0C;">two</li>'
+                '<li style="Margin: 5px 0 5px; padding: 0 0 0 5px; font-size: 19px;'
+                'line-height: 25px; color: #0B0C0C;">three</li>'
+                "</ol>"
+                "</td>"
+                "</tr>"
+                "</table>"
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\n1. one" "\n2. two" "\n3. three"),
+        ),
+    ],
+)
+def test_ordered_list(markdown_function, expected):
+    assert markdown_function("1. one\n" "2. two\n" "3. three\n") == expected
+    assert markdown_function("1.one\n" "2.two\n" "3.three\n") == expected
+
+
+@pytest.mark.parametrize(
+    "markdown",
+    [
+        ("*one\n" "*two\n" "*three\n"),  # no space
+        ("* one\n" "* two\n" "* three\n"),  # single space
+        ("*  one\n" "*  two\n" "*  three\n"),  # two spaces
+        ("- one\n" "- two\n" "- three\n"),  # dash as bullet
+        pytest.param(
+            ("+ one\n" "+ two\n" "+ three\n"),  # plus as bullet
+            marks=pytest.mark.xfail(raises=AssertionError),
+        ),
+        ("• one\n" "• two\n" "• three\n"),  # bullet as bullet
+    ],
+)
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            ("<ul>\n" "<li>one</li>\n" "<li>two</li>\n" "<li>three</li>\n" "</ul>\n"),
+        ),
+        (
+            notify_email_markdown,
+            (
+                '<table role="presentation" style="padding: 0 0 20px 0;">'
+                "<tr>"
+                '<td style="font-family: Helvetica, Arial, sans-serif;">'
+                '<ul style="Margin: 0 0 0 20px; padding: 0; list-style-type: disc;">'
+                '<li style="Margin: 5px 0 5px; padding: 0 0 0 5px; font-size: 19px;'
+                'line-height: 25px; color: #0B0C0C;">one</li>'
+                '<li style="Margin: 5px 0 5px; padding: 0 0 0 5px; font-size: 19px;'
+                'line-height: 25px; color: #0B0C0C;">two</li>'
+                '<li style="Margin: 5px 0 5px; padding: 0 0 0 5px; font-size: 19px;'
+                'line-height: 25px; color: #0B0C0C;">three</li>'
+                "</ul>"
+                "</td>"
+                "</tr>"
+                "</table>"
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\n• one" "\n• two" "\n• three"),
+        ),
+    ],
+)
+def test_unordered_list(markdown, markdown_function, expected):
+    assert markdown_function(markdown) == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            "<p>+ one</p><p>+ two</p><p>+ three</p>",
+        ),
+        (
+            notify_email_markdown,
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">+ one</p>'
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">+ two</p>'
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">+ three</p>'
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n\n+ one" "\n\n+ two" "\n\n+ three"),
+        ),
+    ],
+)
+def test_pluses_dont_render_as_lists(markdown_function, expected):
+    assert markdown_function("+ one\n" "+ two\n" "+ three\n") == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            ("<p>" "line one<br>" "line two" "</p>" "<p>" "new paragraph" "</p>"),
+        ),
+        (
+            notify_email_markdown,
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">line one<br />'
+                "line two</p>"
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">new paragraph</p>'
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\nline one" "\nline two" "\n" "\nnew paragraph"),
+        ),
+    ],
+)
+def test_paragraphs(markdown_function, expected):
+    assert markdown_function("line one\n" "line two\n" "\n" "new paragraph") == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (notify_letter_preview_markdown, ("<p>before</p>" "<p>after</p>")),
+        (
+            notify_email_markdown,
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">before</p>'
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">after</p>'
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\nbefore" "\n" "\nafter"),
+        ),
+    ],
+)
+def test_multiple_newlines_get_truncated(markdown_function, expected):
+    assert markdown_function("before\n\n\n\n\n\nafter") == expected
+
+
+@pytest.mark.parametrize(
+    "markdown_function",
+    [
+        notify_letter_preview_markdown,
+        notify_email_markdown,
+        notify_plain_text_email_markdown,
+    ],
+)
+def test_table(markdown_function):
+    assert markdown_function("col | col\n" "----|----\n" "val | val\n") == ("")
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "link", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            "http://example.com",
+            "<p><strong>example.com</strong></p>",
+        ),
+        (
+            notify_email_markdown,
+            "http://example.com",
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+                '<a style="word-wrap: break-word; color: #1D70B8;" href="http://example.com">http://example.com</a>'
+                "</p>"
+            ),
+        ),
+        (
+            notify_email_markdown,
+            """https://example.com"onclick="alert('hi')""",
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+                '<a style="word-wrap: break-word; color: #1D70B8;" '
+                'href="https://example.com%22onclick=%22alert%28%27hi">'
+                'https://example.com"onclick="alert(\'hi'
+                "</a>')"
+                "</p>"
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            "http://example.com",
+            ("\n" "\nhttp://example.com"),
+        ),
+    ],
+)
+def test_autolink(markdown_function, link, expected):
+    assert markdown_function(link) == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (notify_letter_preview_markdown, "<p>variable called `thing`</p>"),
+        (
+            notify_email_markdown,
+            '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">variable called `thing`</p>',  # noqa E501
+        ),
+        (
+            notify_plain_text_email_markdown,
+            "\n\nvariable called `thing`",
+        ),
+    ],
+)
+def test_codespan(markdown_function, expected):
+    assert markdown_function("variable called `thing`") == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (notify_letter_preview_markdown, "<p>something **important**</p>"),
+        (
+            notify_email_markdown,
+            '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">something **important**</p>',  # noqa E501
+        ),
+        (
+            notify_plain_text_email_markdown,
+            "\n\nsomething **important**",
+        ),
+    ],
+)
+def test_double_emphasis(markdown_function, expected):
+    assert markdown_function("something **important**") == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "text", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            "something *important*",
+            "<p>something *important*</p>",
+        ),
+        (
+            notify_email_markdown,
+            "something *important*",
+            '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">something *important*</p>',  # noqa E501
+        ),
+        (
+            notify_plain_text_email_markdown,
+            "something *important*",
+            "\n\nsomething *important*",
+        ),
+        (
+            notify_plain_text_email_markdown,
+            "something _important_",
+            "\n\nsomething _important_",
+        ),
+        (
+            notify_plain_text_email_markdown,
+            "before*after",
+            "\n\nbefore*after",
+        ),
+        (
+            notify_plain_text_email_markdown,
+            "before_after",
+            "\n\nbefore_after",
+        ),
+    ],
+)
+def test_emphasis(markdown_function, text, expected):
+    assert markdown_function(text) == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (
+            notify_email_markdown,
+            '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">foo ****** bar</p>',
+        ),
+        (
+            notify_plain_text_email_markdown,
+            "\n\nfoo ****** bar",
+        ),
+    ],
+)
+def test_nested_emphasis(markdown_function, expected):
+    assert markdown_function("foo ****** bar") == expected
+
+
+@pytest.mark.parametrize(
+    "markdown_function",
+    [
+        notify_letter_preview_markdown,
+        notify_email_markdown,
+        notify_plain_text_email_markdown,
+    ],
+)
+def test_image(markdown_function):
+    assert markdown_function("![alt text](http://example.com/image.png)") == ("")
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            ("<p>Example: <strong>example.com</strong></p>"),
+        ),
+        (
+            notify_email_markdown,
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; '
+                'color: #0B0C0C;">'
+                '<a style="word-wrap: break-word; color: #1D70B8;" href="http://example.com">Example</a>'
+                "</p>"
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\nExample: http://example.com"),
+        ),
+    ],
+)
+def test_link(markdown_function, expected):
+    assert markdown_function("[Example](http://example.com)") == expected
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (
+            notify_letter_preview_markdown,
+            ("<p>Example: <strong>example.com</strong></p>"),
+        ),
+        (
+            notify_email_markdown,
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; '
+                'color: #0B0C0C;">'
+                '<a style="word-wrap: break-word; color: #1D70B8;" href="http://example.com" title="An example URL">'
+                "Example"
+                "</a>"
+                "</p>"
+            ),
+        ),
+        (
+            notify_plain_text_email_markdown,
+            ("\n" "\nExample (An example URL): http://example.com"),
+        ),
+    ],
+)
+def test_link_with_title(markdown_function, expected):
+    assert (
+        markdown_function('[Example](http://example.com "An example URL")') == expected
+    )
+
+
+@pytest.mark.parametrize(
+    ("markdown_function", "expected"),
+    [
+        (notify_letter_preview_markdown, "<p>~~Strike~~</p>"),
+        (
+            notify_email_markdown,
+            '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">~~Strike~~</p>',
+        ),
+        (notify_plain_text_email_markdown, "\n\n~~Strike~~"),
+    ],
+)
+def test_strikethrough(markdown_function, expected):
+    assert markdown_function("~~Strike~~") == expected
+
+
+def test_footnotes():
+    # Can’t work out how to test this
+    pass
diff --git a/tests/notifications_utils/test_placeholders.py b/tests/notifications_utils/test_placeholders.py
new file mode 100644
index 0000000000..348d2159a8
--- /dev/null
+++ b/tests/notifications_utils/test_placeholders.py
@@ -0,0 +1,66 @@
+import re
+
+import pytest
+
+from notifications_utils.field import Placeholder
+
+
+@pytest.mark.parametrize(
+    ("body", "expected"),
+    [
+        ("((with-brackets))", "with-brackets"),
+        ("without-brackets", "without-brackets"),
+    ],
+)
+def test_placeholder_returns_name(body, expected):
+    assert Placeholder(body).name == expected
+
+
+@pytest.mark.parametrize(
+    ("body", "is_conditional"),
+    [
+        ("not a conditional", False),
+        ("not? a conditional", False),
+        ("a?? conditional", True),
+    ],
+)
+def test_placeholder_identifies_conditional(body, is_conditional):
+    assert Placeholder(body).is_conditional() == is_conditional
+
+
+@pytest.mark.parametrize(
+    ("body", "conditional_text"),
+    [
+        ("a??b", "b"),
+        ("a?? b ", " b "),
+        ("a??b??c", "b??c"),
+    ],
+)
+def test_placeholder_gets_conditional_text(body, conditional_text):
+    assert Placeholder(body).conditional_text == conditional_text
+
+
+def test_placeholder_raises_if_accessing_conditional_text_on_non_conditional():
+    with pytest.raises(ValueError):  # noqa, flake8 says ValueError not specific enough
+        Placeholder("hello").conditional_text
+
+
+@pytest.mark.parametrize(
+    ("body", "value", "result"),
+    [
+        ("a??b", "Yes", "b"),
+        ("a??b", "No", ""),
+    ],
+)
+def test_placeholder_gets_conditional_body(body, value, result):
+    assert Placeholder(body).get_conditional_body(value) == result
+
+
+def test_placeholder_raises_if_getting_conditional_body_on_non_conditional():
+    with pytest.raises(ValueError):  # noqa, flake8 says ValueError not specific enough
+        Placeholder("hello").get_conditional_body("Yes")
+
+
+def test_placeholder_can_be_constructed_from_regex_match():
+    match = re.search(r"\(\(.*\)\)", "foo ((bar)) baz")
+    assert Placeholder.from_match(match).name == "bar"
diff --git a/tests/notifications_utils/test_postal_address.py b/tests/notifications_utils/test_postal_address.py
new file mode 100644
index 0000000000..3e29f193fe
--- /dev/null
+++ b/tests/notifications_utils/test_postal_address.py
@@ -0,0 +1,777 @@
+import pytest
+
+from notifications_utils.countries import Country
+from notifications_utils.countries.data import Postage
+from notifications_utils.insensitive_dict import InsensitiveDict
+from notifications_utils.postal_address import (
+    PostalAddress,
+    format_postcode_for_printing,
+    is_a_real_uk_postcode,
+    normalise_postcode,
+)
+
+
+def test_raw_address():
+    raw_address = "a\n\n\tb\r       c         "
+    assert PostalAddress(raw_address).raw_address == raw_address
+
+
+@pytest.mark.parametrize(
+    ("address", "expected_country"),
+    [
+        (
+            """
+        123 Example Street
+        City of Town
+        SW1A 1AA
+        """,
+            Country("United Kingdom"),
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        SW1A 1AA
+        United Kingdom
+        """,
+            Country("United Kingdom"),
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        Wales
+        """,
+            Country("United Kingdom"),
+        ),
+        (
+            """
+        123 Example Straße
+        Deutschland
+        """,
+            Country("Germany"),
+        ),
+    ],
+)
+def test_country(address, expected_country):
+    assert PostalAddress(address).country == expected_country
+
+
+@pytest.mark.parametrize(
+    ("address", "enough_lines_expected"),
+    [
+        (
+            "",
+            False,
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        SW1A 1AA
+        """,
+            True,
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        United Kingdom
+        """,
+            False,
+        ),
+        (
+            """
+        123 Example Street
+
+
+        City of Town
+        """,
+            False,
+        ),
+        (
+            """
+        1
+        2
+        3
+        4
+        5
+        6
+        7
+        8
+        """,
+            True,
+        ),
+    ],
+)
+def test_has_enough_lines(address, enough_lines_expected):
+    assert PostalAddress(address).has_enough_lines is enough_lines_expected
+
+
+@pytest.mark.parametrize(
+    ("address", "too_many_lines_expected"),
+    [
+        (
+            "",
+            False,
+        ),
+        (
+            """
+        Line 1
+        Line 2
+        Line 3
+        Line 4
+        Line 5
+        Line 6
+        Line 7
+        """,
+            False,
+        ),
+        (
+            """
+        Line 1
+
+        Line 2
+
+        Line 3
+
+        Line 4
+
+        Line 5
+
+        Line 6
+
+        Line 7
+        """,
+            False,
+        ),
+        (
+            """
+        Line 1
+        Line 2
+        Line 3
+        Line 4
+        Line 5
+        Line 6
+        Line 7
+        Scotland
+        """,
+            False,
+        ),
+        (
+            """
+        Line 1
+        Line 2
+        Line 3
+        Line 4
+        Line 5
+        Line 6
+        Line 7
+        Line 8
+        """,
+            True,
+        ),
+    ],
+)
+def test_has_too_many_lines(address, too_many_lines_expected):
+    assert PostalAddress(address).has_too_many_lines is too_many_lines_expected
+
+
+@pytest.mark.parametrize(
+    ("address", "expected_postcode"),
+    [
+        (
+            "",
+            None,
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        SW1A 1AA
+        """,
+            "SW1A 1AA",
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        S W1 A 1 AA
+        """,
+            "SW1A 1AA",
+        ),
+        (
+            """
+        123 Example Straße
+        Deutschland
+        """,
+            None,
+        ),
+        (
+            """
+        123 Example Straße
+        SW1A 1AA
+        Deutschland
+        """,
+            None,
+        ),
+    ],
+)
+def test_postcode(address, expected_postcode):
+    assert PostalAddress(address).has_valid_postcode is bool(expected_postcode)
+    assert PostalAddress(address).postcode == expected_postcode
+
+
+@pytest.mark.parametrize(
+    ("address", "expected_result"),
+    [
+        (
+            "",
+            False,
+        ),
+        (
+            """
+        1[23 Example Street)
+        C@ity of Town
+        SW1A 1AA
+        """,
+            False,
+        ),
+        (
+            """
+        [123 Example Street
+        (ity of Town
+        ]S W1 A 1 AA
+        """,
+            True,
+        ),
+        (
+            r"""
+        123 Example Straße
+        SW1A 1AA
+        \Deutschland
+        """,
+            True,
+        ),
+        (
+            r"""
+        >123 Example Straße
+        SW1A 1AA
+        Deutschland
+        """,
+            True,
+        ),
+        (
+            """
+        ~123 Example Street
+        City of Town
+        SW1 A 1 AA
+        """,
+            True,
+        ),
+    ],
+)
+def test_has_invalid_characters(address, expected_result):
+    assert PostalAddress(address).has_invalid_characters is expected_result
+
+
+@pytest.mark.parametrize(
+    ("address", "expected_international"),
+    [
+        (
+            "",
+            False,
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        SW1A 1AA
+        """,
+            False,
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        United Kingdom
+        """,
+            False,
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        Guernsey
+        """,
+            False,
+        ),
+        (
+            """
+        123 Example Straße
+        Deutschland
+        """,
+            True,
+        ),
+    ],
+)
+def test_international(address, expected_international):
+    assert PostalAddress(address).international is expected_international
+
+
+@pytest.mark.parametrize(
+    ("address", "expected_normalised", "expected_as_single_line"),
+    [
+        (
+            "",
+            "",
+            "",
+        ),
+        (
+            """
+        123 Example    St  .
+        City    of Town
+
+        S W1 A 1 AA
+        """,
+            ("123 Example St.\n" "City of Town\n" "SW1A 1AA"),
+            ("123 Example St., City of Town, SW1A 1AA"),
+        ),
+        (
+            (
+                "123 Example St. \t  ,    \n"
+                ", , ,  ,   ,     ,        ,\n"
+                "City of Town, Region,\n"
+                "SW1A 1AA,,\n"
+            ),
+            ("123 Example St.\n" "City of Town, Region\n" "SW1A 1AA"),
+            ("123 Example St., City of Town, Region, SW1A 1AA"),
+        ),
+        (
+            """
+          123  Example Straße
+        Deutschland
+
+
+        """,
+            ("123 Example Straße\n" "Germany"),
+            ("123 Example Straße, Germany"),
+        ),
+    ],
+)
+def test_normalised(address, expected_normalised, expected_as_single_line):
+    assert PostalAddress(address).normalised == expected_normalised
+    assert PostalAddress(address).as_single_line == expected_as_single_line
+
+
+@pytest.mark.parametrize(
+    ("address", "expected_postage"),
+    [
+        (
+            "",
+            Postage.UK,
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        SW1A 1AA
+        """,
+            Postage.UK,
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        Scotland
+        """,
+            Postage.UK,
+        ),
+        (
+            """
+        123 Example Straße
+        Deutschland
+        """,
+            Postage.EUROPE,
+        ),
+        (
+            """
+        123 Rue Example
+        Côte d'Ivoire
+        """,
+            Postage.REST_OF_WORLD,
+        ),
+    ],
+)
+def test_postage(address, expected_postage):
+    assert PostalAddress(address).postage == expected_postage
+
+
+@pytest.mark.parametrize(
+    "personalisation",
+    [
+        {
+            "address_line_1": "123 Example Street",
+            "address_line_3": "City of Town",
+            "address_line_4": "",
+            "postcode": "SW1A1AA",
+            "ignore me": "ignore me",
+        },
+        {
+            "address_line_1": "123 Example Street",
+            "address_line_3": "City of Town",
+            "address_line_4": "SW1A1AA",
+        },
+        {
+            "address_line_2": "123 Example Street",
+            "address_line_5": "City of Town",
+            "address_line_7": "SW1A1AA",
+        },
+        {
+            "address_line_1": "123 Example Street",
+            "address_line_3": "City of Town",
+            "address_line_7": "SW1A1AA",
+            "postcode": "ignored if address line 7 provided",
+        },
+        InsensitiveDict(
+            {
+                "address line 1": "123 Example Street",
+                "ADDRESS_LINE_2": "City of Town",
+                "Address-Line-7": "Sw1a  1aa",
+            }
+        ),
+    ],
+)
+def test_from_personalisation(personalisation):
+    assert PostalAddress.from_personalisation(personalisation).normalised == (
+        "123 Example Street\n" "City of Town\n" "SW1A 1AA"
+    )
+
+
+def test_from_personalisation_handles_int():
+    personalisation = {
+        "address_line_1": 123,
+        "address_line_2": "Example Street",
+        "address_line_3": "City of Town",
+        "address_line_4": "SW1A1AA",
+    }
+    assert PostalAddress.from_personalisation(personalisation).normalised == (
+        "123\n" "Example Street\n" "City of Town\n" "SW1A 1AA"
+    )
+
+
+@pytest.mark.parametrize(
+    ("address", "expected_personalisation"),
+    [
+        (
+            "",
+            {
+                "address_line_1": "",
+                "address_line_2": "",
+                "address_line_3": "",
+                "address_line_4": "",
+                "address_line_5": "",
+                "address_line_6": "",
+                "address_line_7": "",
+                "postcode": "",
+            },
+        ),
+        (
+            """
+        123 Example Street
+        City of Town
+        SW1A1AA
+        """,
+            {
+                "address_line_1": "123 Example Street",
+                "address_line_2": "City of Town",
+                "address_line_3": "",
+                "address_line_4": "",
+                "address_line_5": "",
+                "address_line_6": "",
+                "address_line_7": "SW1A 1AA",
+                "postcode": "SW1A 1AA",
+            },
+        ),
+        (
+            """
+        One
+        Two
+        Three
+        Four
+        Five
+        Six
+        Seven
+        Eight
+        """,
+            {
+                "address_line_1": "One",
+                "address_line_2": "Two",
+                "address_line_3": "Three",
+                "address_line_4": "Four",
+                "address_line_5": "Five",
+                "address_line_6": "Six",
+                "address_line_7": "Eight",
+                "postcode": "Eight",
+            },
+        ),
+    ],
+)
+def test_as_personalisation(address, expected_personalisation):
+    assert PostalAddress(address).as_personalisation == expected_personalisation
+
+
+@pytest.mark.parametrize(
+    ("address", "expected_bool"),
+    [
+        ("", False),
+        (" ", False),
+        ("\n\n  \n", False),
+        ("a", True),
+    ],
+)
+def test_bool(address, expected_bool):
+    assert bool(PostalAddress(address)) is expected_bool
+
+
+@pytest.mark.parametrize(
+    ("postcode", "normalised_postcode"),
+    [
+        ("SW1 3EF", "SW13EF"),
+        ("SW13EF", "SW13EF"),
+        ("sw13ef", "SW13EF"),
+        ("Sw13ef", "SW13EF"),
+        ("sw1 3ef", "SW13EF"),
+        (" SW1    3EF  ", "SW13EF"),
+    ],
+)
+def test_normalise_postcode(postcode, normalised_postcode):
+    assert normalise_postcode(postcode) == normalised_postcode
+
+
+@pytest.mark.parametrize(
+    ("postcode", "result"),
+    [
+        # real standard UK poscodes
+        ("SW1 3EF", True),
+        ("SW13EF", True),
+        ("SE1 63EF", True),
+        ("N5 1AA", True),
+        ("SO14 6WB", True),
+        ("so14 6wb", True),
+        ("so14\u00A06wb", True),
+        # invalida / incomplete postcodes
+        ("N5", False),
+        ("SO144 6WB", False),
+        ("SO14 6WBA", False),
+        ("", False),
+        ("Bad postcode", False),
+        # valid British Forces postcodes
+        ("BFPO1234", True),
+        ("BFPO C/O 1234", True),
+        ("BFPO 1234", True),
+        ("BFPO1", True),
+        # invalid British Forces postcodes
+        ("BFPO", False),
+        ("BFPO12345", False),
+        # Giro Bank valid postcode and invalid postcode
+        ("GIR0AA", True),
+        ("GIR0AB", False),
+    ],
+)
+def test_if_postcode_is_a_real_uk_postcode(postcode, result):
+    assert is_a_real_uk_postcode(postcode) is result
+
+
+def test_if_postcode_is_a_real_uk_postcode_normalises_before_checking_postcode(mocker):
+    normalise_postcode_mock = mocker.patch(
+        "notifications_utils.postal_address.normalise_postcode"
+    )
+    normalise_postcode_mock.return_value = "SW11AA"
+    assert is_a_real_uk_postcode("sw1  1aa") is True
+
+
+@pytest.mark.parametrize(
+    ("postcode", "postcode_with_space"),
+    [
+        ("SW13EF", "SW1 3EF"),
+        ("SW1 3EF", "SW1 3EF"),
+        ("N5 3EF", "N5 3EF"),
+        ("N5     3EF", "N5 3EF"),
+        ("N53EF   ", "N5 3EF"),
+        ("n53Ef", "N5 3EF"),
+        ("n5 \u00A0 \t 3Ef", "N5 3EF"),
+        ("SO146WB", "SO14 6WB"),
+        ("BFPO2", "BFPO 2"),
+        ("BFPO232", "BFPO 232"),
+        ("BFPO 2432", "BFPO 2432"),
+        ("BFPO C/O 2", "BFPO C/O 2"),
+        ("BFPO c/o 232", "BFPO C/O 232"),
+        ("GIR0AA", "GIR 0AA"),
+    ],
+)
+def test_format_postcode_for_printing(postcode, postcode_with_space):
+    assert format_postcode_for_printing(postcode) == postcode_with_space
+
+
+@pytest.mark.parametrize(
+    ("address", "international", "expected_valid"),
+    [
+        (
+            """
+            UK address
+            Service can’t send internationally
+            SW1A 1AA
+        """,
+            False,
+            True,
+        ),
+        (
+            """
+            UK address
+            Service can send internationally
+            SW1A 1AA
+        """,
+            True,
+            True,
+        ),
+        (
+            """
+            Overseas address
+            Service can’t send internationally
+            Guinea-Bissau
+        """,
+            False,
+            False,
+        ),
+        (
+            """
+            Overseas address
+            Service can send internationally
+            Guinea-Bissau
+        """,
+            True,
+            True,
+        ),
+        (
+            """
+            Overly long address
+            2
+            3
+            4
+            5
+            6
+            7
+            8
+        """,
+            True,
+            False,
+        ),
+        (
+            """
+            Address too short
+            2
+        """,
+            True,
+            False,
+        ),
+        (
+            """
+            No postcode or country
+            Service can’t send internationally
+            3
+        """,
+            False,
+            False,
+        ),
+        (
+            """
+            No postcode or country
+            Service can send internationally
+            3
+        """,
+            True,
+            False,
+        ),
+        (
+            """
+            Postcode and country
+            Service can’t send internationally
+            SW1 1AA
+            France
+        """,
+            False,
+            False,
+        ),
+    ],
+)
+def test_valid_with_international_parameter(address, international, expected_valid):
+    postal_address = PostalAddress(
+        address,
+        allow_international_letters=international,
+    )
+    assert postal_address.valid is expected_valid
+    assert postal_address.has_valid_last_line is expected_valid
+
+
+@pytest.mark.parametrize(
+    "address",
+    [
+        """
+        Too short, valid postcode
+        SW1A 1AA
+    """,
+        """
+        Too short, valid country
+        Bhutan
+    """,
+        """
+        Too long, valid postcode
+        2
+        3
+        4
+        5
+        6
+        7
+        SW1A 1AA
+    """,
+        """
+        Too long, valid country
+        2
+        3
+        4
+        5
+        6
+        7
+        Bhutan
+    """,
+    ],
+)
+def test_valid_last_line_too_short_too_long(address):
+    postal_address = PostalAddress(address, allow_international_letters=True)
+    assert postal_address.valid is False
+    assert postal_address.has_valid_last_line is True
+
+
+def test_valid_with_invalid_characters():
+    address = "Valid\nExcept\n[For one character\nBhutan\n"
+    assert PostalAddress(address, allow_international_letters=True).valid is False
+
+
+@pytest.mark.parametrize(
+    ("international", "expected_valid"),
+    [
+        (False, False),
+        (True, True),
+    ],
+)
+def test_valid_from_personalisation_with_international_parameter(
+    international, expected_valid
+):
+    assert (
+        PostalAddress.from_personalisation(
+            {"address_line_1": "A", "address_line_2": "B", "address_line_3": "Chad"},
+            allow_international_letters=international,
+        ).valid
+        is expected_valid
+    )
diff --git a/tests/notifications_utils/test_recipient_csv.py b/tests/notifications_utils/test_recipient_csv.py
new file mode 100644
index 0000000000..689781f6a8
--- /dev/null
+++ b/tests/notifications_utils/test_recipient_csv.py
@@ -0,0 +1,1361 @@
+import itertools
+import string
+import unicodedata
+from functools import partial
+from random import choice, randrange
+from unittest.mock import Mock
+
+import pytest
+from ordered_set import OrderedSet
+
+from notifications_utils import SMS_CHAR_COUNT_LIMIT
+from notifications_utils.countries import Country
+from notifications_utils.formatters import strip_and_remove_obscure_whitespace
+from notifications_utils.recipients import (
+    Cell,
+    RecipientCSV,
+    Row,
+    first_column_headings,
+)
+from notifications_utils.template import (
+    EmailPreviewTemplate,
+    LetterImageTemplate,
+    SMSMessageTemplate,
+)
+
+
+def _sample_template(template_type, content="foo"):
+    return {
+        "email": EmailPreviewTemplate(
+            {"content": content, "subject": "bar", "template_type": "email"}
+        ),
+        "sms": SMSMessageTemplate({"content": content, "template_type": "sms"}),
+        "letter": LetterImageTemplate(
+            {"content": content, "subject": "bar", "template_type": "letter"},
+            image_url="https://example.com",
+            page_count=1,
+        ),
+    }.get(template_type)
+
+
+def _index_rows(rows):
+    return set(row.index for row in rows)
+
+
+@pytest.mark.parametrize(
+    ("template_type", "expected"),
+    [
+        ("email", ["email address"]),
+        ("sms", ["phone number"]),
+        (
+            "letter",
+            [
+                "address line 1",
+                "address line 2",
+                "address line 3",
+                "address line 4",
+                "address line 5",
+                "address line 6",
+                "postcode",
+                "address line 7",
+            ],
+        ),
+    ],
+)
+def test_recipient_column_headers(template_type, expected):
+    recipients = RecipientCSV("", template=_sample_template(template_type))
+    assert (
+        (recipients.recipient_column_headers)
+        == (first_column_headings[template_type])
+        == (expected)
+    )
+
+
+@pytest.mark.parametrize(
+    ("file_contents", "template_type", "expected"),
+    [
+        (
+            "",
+            "sms",
+            [],
+        ),
+        (
+            "phone number",
+            "sms",
+            [],
+        ),
+        (
+            """
+                phone number,name
+                +44 123, test1
+                +44 456,test2
+            """,
+            "sms",
+            [
+                [("phone number", "+44 123"), ("name", "test1")],
+                [("phone number", "+44 456"), ("name", "test2")],
+            ],
+        ),
+        (
+            """
+                phone number,name
+                +44 123,
+                +44 456
+            """,
+            "sms",
+            [
+                [("phone number", "+44 123"), ("name", None)],
+                [("phone number", "+44 456"), ("name", None)],
+            ],
+        ),
+        (
+            """
+                email address,name
+                test@example.com,test1
+                test2@example.com, test2
+            """,
+            "email",
+            [
+                [("email address", "test@example.com"), ("name", "test1")],
+                [("email address", "test2@example.com"), ("name", "test2")],
+            ],
+        ),
+        (
+            """
+                email address
+                test@example.com,test1,red
+                test2@example.com, test2,blue
+            """,
+            "email",
+            [
+                [("email address", "test@example.com"), (None, ["test1", "red"])],
+                [("email address", "test2@example.com"), (None, ["test2", "blue"])],
+            ],
+        ),
+        (
+            """
+                email address,name
+                test@example.com,"test1"
+                test2@example.com,"   test2    "
+                test3@example.com," test3"
+            """,
+            "email",
+            [
+                [("email address", "test@example.com"), ("name", "test1")],
+                [("email address", "test2@example.com"), ("name", "test2")],
+                [("email address", "test3@example.com"), ("name", "test3")],
+            ],
+        ),
+        (
+            """
+                email address,date,name
+                test@example.com,"Nov 28, 2016",test1
+                test2@example.com,"Nov 29, 2016",test2
+            """,
+            "email",
+            [
+                [
+                    ("email address", "test@example.com"),
+                    ("date", "Nov 28, 2016"),
+                    ("name", "test1"),
+                ],
+                [
+                    ("email address", "test2@example.com"),
+                    ("date", "Nov 29, 2016"),
+                    ("name", "test2"),
+                ],
+            ],
+        ),
+        (
+            """
+                address_line_1
+                Alice
+                Bob
+            """,
+            "letter",
+            [[("address_line_1", "Alice")], [("address_line_1", "Bob")]],
+        ),
+        (
+            """
+                address line 1,address line 2,address line 5,address line 6,postcode,name,thing
+                A. Name,,,,XM4 5HQ,example,example
+            """,
+            "letter",
+            [
+                [
+                    ("addressline1", "A. Name"),
+                    ("addressline2", None),
+                    # optional address rows 3 and 4 not in file
+                    ("addressline5", None),
+                    ("addressline5", None),
+                    ("postcode", "XM4 5HQ"),
+                    ("name", "example"),
+                    ("thing", "example"),
+                ]
+            ],
+        ),
+        (
+            """
+                phone number, list, list, list
+                07900900001, cat, rat, gnat
+                07900900002, dog, hog, frog
+                07900900003, elephant
+            """,
+            "sms",
+            [
+                [("phone number", "07900900001"), ("list", ["cat", "rat", "gnat"])],
+                [("phone number", "07900900002"), ("list", ["dog", "hog", "frog"])],
+                [("phone number", "07900900003"), ("list", ["elephant", None, None])],
+            ],
+        ),
+    ],
+)
+def test_get_rows(file_contents, template_type, expected):
+    rows = list(
+        RecipientCSV(file_contents, template=_sample_template(template_type)).rows
+    )
+    if not expected:
+        assert rows == expected
+    for index, row in enumerate(expected):
+        assert len(rows[index].items()) == len(row)
+        for key, value in row:
+            assert rows[index].get(key).data == value
+
+
+def test_get_rows_does_no_error_checking_of_rows_or_cells(mocker):
+    has_error_mock = mocker.patch.object(Row, "has_error")
+    has_bad_recipient_mock = mocker.patch.object(Row, "has_bad_recipient")
+    has_missing_data_mock = mocker.patch.object(Row, "has_missing_data")
+    cell_recipient_error_mock = mocker.patch.object(Cell, "recipient_error")
+
+    recipients = RecipientCSV(
+        """
+            email address, name
+            a@b.com,
+            a@b.com, My Name
+            a@b.com,
+
+
+        """,
+        template=_sample_template("email", "hello ((name))"),
+        max_errors_shown=3,
+    )
+
+    rows = recipients.get_rows()
+    for _ in range(3):
+        assert next(rows).recipient == "a@b.com"
+
+    assert has_error_mock.called is False
+    assert has_bad_recipient_mock.called is False
+    assert has_missing_data_mock.called is False
+    assert cell_recipient_error_mock.called is False
+
+
+def test_get_rows_only_iterates_over_file_once(mocker):
+    row_mock = mocker.patch("notifications_utils.recipients.Row")
+
+    recipients = RecipientCSV(
+        """
+            email address, name
+            a@b.com,
+            a@b.com, My Name
+            a@b.com,
+
+
+        """,
+        template=_sample_template("email", "hello ((name))"),
+    )
+
+    rows = recipients.get_rows()
+    for _ in range(3):
+        next(rows)
+
+    assert row_mock.call_count == 3
+    assert recipients.rows_as_list is None
+
+
+@pytest.mark.parametrize(
+    ("file_contents", "template_type", "expected"),
+    [
+        (
+            """
+                phone number,name
+                2348675309, test1
+                +1234-867-5301,test2
+                ,
+            """,
+            "sms",
+            [
+                {"index": 0, "message_too_long": False},
+                {"index": 1, "message_too_long": False},
+            ],
+        ),
+        (
+            """
+                email address,name,colour
+                test@example.com,test1,blue
+                test2@example.com, test2,red
+            """,
+            "email",
+            [
+                {"index": 0, "message_too_long": False},
+                {"index": 1, "message_too_long": False},
+            ],
+        ),
+    ],
+)
+def test_get_annotated_rows(file_contents, template_type, expected):
+    recipients = RecipientCSV(
+        file_contents,
+        template=_sample_template(template_type, "hello ((name))"),
+        max_initial_rows_shown=1,
+    )
+    for index, expected_row in enumerate(expected):
+        annotated_row = list(recipients.rows)[index]
+        assert annotated_row.index == expected_row["index"]
+        assert annotated_row.message_too_long == expected_row["message_too_long"]
+    assert len(list(recipients.rows)) == 2
+    assert len(list(recipients.initial_rows)) == 1
+    assert not recipients.has_errors
+
+
+def test_get_rows_with_errors():
+    recipients = RecipientCSV(
+        """
+            email address, name
+            a@b.com,
+            a@b.com,
+            a@b.com,
+            a@b.com,
+            a@b.com,
+            a@b.com,
+
+
+        """,
+        template=_sample_template("email", "hello ((name))"),
+        max_errors_shown=3,
+    )
+    assert len(list(recipients.rows_with_errors)) == 6
+    assert len(list(recipients.initial_rows_with_errors)) == 3
+    assert recipients.has_errors
+
+
+@pytest.mark.parametrize(
+    ("template_type", "row_count", "header", "filler", "row_with_error"),
+    [
+        (
+            "email",
+            500,
+            "email address\n",
+            "test@example.com\n",
+            "test at example dot com",
+        ),
+        ("sms", 500, "phone number\n", "2348675309\n", "12345"),
+    ],
+)
+def test_big_list_validates_right_through(
+    template_type, row_count, header, filler, row_with_error
+):
+    big_csv = RecipientCSV(
+        header + (filler * (row_count - 1) + row_with_error),
+        template=_sample_template(template_type),
+        max_errors_shown=100,
+        max_initial_rows_shown=3,
+    )
+    assert len(list(big_csv.rows)) == row_count
+    assert _index_rows(big_csv.rows_with_bad_recipients) == {row_count - 1}  # 0 indexed
+    assert _index_rows(big_csv.rows_with_errors) == {row_count - 1}
+    assert len(list(big_csv.initial_rows_with_errors)) == 1
+    assert big_csv.has_errors
+
+
+@pytest.mark.parametrize(
+    ("template_type", "row_count", "header", "filler"),
+    [
+        ("email", 50, "email address\n", "test@example.com\n"),
+        ("sms", 50, "phone number\n", "07900900123\n"),
+    ],
+)
+def test_check_if_message_too_long_for_sms_but_not_email_in_CSV(
+    mocker, template_type, row_count, header, filler
+):
+    # we do not validate email size for CSVs to avoid performance issues
+    RecipientCSV(
+        header + filler * row_count,
+        template=_sample_template(template_type),
+        max_errors_shown=100,
+        max_initial_rows_shown=3,
+    )
+    is_message_too_long = mocker.patch(
+        "notifications_utils.template.Template.is_message_too_long", side_effect=False
+    )
+    if template_type == "email":
+        is_message_too_long.assert_not_called
+    else:
+        is_message_too_long.called
+
+
+def test_overly_big_list_stops_processing_rows_beyond_max(mocker):
+    mock_strip_and_remove_obscure_whitespace = mocker.patch(
+        "notifications_utils.recipients.strip_and_remove_obscure_whitespace",
+        wraps=strip_and_remove_obscure_whitespace,
+    )
+    mock_insert_or_append_to_dict = mocker.patch(
+        "notifications_utils.recipients.insert_or_append_to_dict"
+    )
+
+    big_csv = RecipientCSV(
+        "phonenumber,name\n" + ("2348675309,example\n" * 123),
+        template=_sample_template("sms", content="hello ((name))"),
+    )
+    big_csv.max_rows = 10
+
+    # Our CSV has lots of rows…
+    assert big_csv.too_many_rows
+    assert len(big_csv) == 123
+
+    # …but we’ve only called the expensive whitespace function on each
+    # of the 2 cells in the first 10 rows
+    assert len(mock_strip_and_remove_obscure_whitespace.call_args_list) == 20
+
+    # …and we’ve only called the function which builds the internal data
+    # structure once for each of the first 10 rows
+    assert len(mock_insert_or_append_to_dict.call_args_list) == 10
+
+
+def test_file_with_lots_of_empty_columns():
+    process = Mock()
+
+    lots_of_commas = "," * 10_000
+
+    for row in RecipientCSV(
+        f"phone_number{lots_of_commas}\n" + (f"07900900900{lots_of_commas}\n" * 100),
+        template=_sample_template("sms"),
+    ):
+        assert [(key, cell.data) for key, cell in row.items()] == [
+            # Note that we haven’t stored any of the empty cells
+            ("phonenumber", "07900900900")
+        ]
+        process()
+
+    assert process.call_count == 100
+
+
+def test_empty_column_names():
+    recipient_csv = RecipientCSV(
+        """
+            phone_number,,,name
+            07900900123,foo,bar,baz
+        """,
+        template=_sample_template("sms"),
+    )
+
+    assert recipient_csv[0]["phone_number"].data == "07900900123"
+    assert recipient_csv[0][""].data == ["foo", "bar"]
+    assert recipient_csv[0]["name"].data == "baz"
+
+
+@pytest.mark.parametrize(
+    ("file_contents", "template", "expected_recipients", "expected_personalisation"),
+    [
+        (
+            """
+                phone number,name, date
+                +44 123,test1,today
+                +44456,    ,tomorrow
+                ,,
+                , ,
+            """,
+            _sample_template("sms", "hello ((name))"),
+            ["+44 123", "+44456"],
+            [{"name": "test1"}, {"name": None}],
+        ),
+        (
+            """
+                email address,name,colour
+                test@example.com,test1,red
+                testatexampledotcom,test2,blue
+            """,
+            _sample_template("email", "((colour))"),
+            ["test@example.com", "testatexampledotcom"],
+            [{"colour": "red"}, {"colour": "blue"}],
+        ),
+        (
+            """
+                email address
+                test@example.com,test1,red
+                testatexampledotcom,test2,blue
+            """,
+            _sample_template("email"),
+            ["test@example.com", "testatexampledotcom"],
+            [],
+        ),
+    ],
+)
+def test_get_recipient(
+    file_contents, template, expected_recipients, expected_personalisation
+):
+    recipients = RecipientCSV(file_contents, template=template)
+
+    for index, row in enumerate(expected_personalisation):
+        for key, value in row.items():
+            assert recipients[index].recipient == expected_recipients[index]
+            assert recipients[index].personalisation.get(key) == value
+
+
+@pytest.mark.parametrize(
+    ("file_contents", "template", "expected_recipients", "expected_personalisation"),
+    [
+        (
+            """
+                email address,test
+                test@example.com,test1,red
+                testatexampledotcom,test2,blue
+            """,
+            _sample_template("email", "((test))"),
+            [(0, "test@example.com"), (1, "testatexampledotcom")],
+            [
+                {"emailaddress": "test@example.com", "test": "test1"},
+                {"emailaddress": "testatexampledotcom", "test": "test2"},
+            ],
+        )
+    ],
+)
+def test_get_recipient_respects_order(
+    file_contents, template, expected_recipients, expected_personalisation
+):
+    recipients = RecipientCSV(file_contents, template=template)
+
+    for row, email in expected_recipients:
+        assert (
+            recipients[row].index,
+            recipients[row].recipient,
+            recipients[row].personalisation,
+        ) == (
+            row,
+            email,
+            expected_personalisation[row],
+        )
+
+
+@pytest.mark.parametrize(
+    ("file_contents", "template_type", "expected", "expected_missing"),
+    [
+        ("", "sms", [], set(["phone number", "name"])),
+        (
+            """
+                phone number,name
+                2348675309,test1
+                2348675309,test1
+                2348675309,test1
+            """,
+            "sms",
+            ["phone number", "name"],
+            set(),
+        ),
+        (
+            """
+                email address,name,colour
+            """,
+            "email",
+            ["email address", "name", "colour"],
+            set(),
+        ),
+        (
+            """
+                address_line_1, address_line_2, postcode, name
+            """,
+            "letter",
+            ["address_line_1", "address_line_2", "postcode", "name"],
+            set(),
+        ),
+        (
+            """
+                email address,colour
+            """,
+            "email",
+            ["email address", "colour"],
+            set(["name"]),
+        ),
+        (
+            """
+                address_line_1, address_line_2, name
+            """,
+            "letter",
+            ["address_line_1", "address_line_2", "name"],
+            set(),
+        ),
+        (
+            """
+                phone number,list,list,name,list
+            """,
+            "sms",
+            ["phone number", "list", "name"],
+            set(),
+        ),
+    ],
+)
+def test_column_headers(file_contents, template_type, expected, expected_missing):
+    recipients = RecipientCSV(
+        file_contents, template=_sample_template(template_type, "((name))")
+    )
+    assert recipients.column_headers == expected
+    assert recipients.missing_column_headers == expected_missing
+    assert recipients.has_errors == bool(expected_missing)
+
+
+@pytest.mark.parametrize(
+    "content",
+    [
+        "hello",
+        "hello ((name))",
+    ],
+)
+@pytest.mark.parametrize(
+    ("file_contents", "template_type"),
+    [
+        pytest.param("", "sms", marks=pytest.mark.xfail),
+        pytest.param("name", "sms", marks=pytest.mark.xfail),
+        pytest.param("email address", "sms", marks=pytest.mark.xfail),
+        pytest.param(
+            "address_line_1",
+            "letter",
+            marks=pytest.mark.xfail,
+        ),
+        pytest.param(
+            "address_line_1, address_line_2",
+            "letter",
+            marks=pytest.mark.xfail,
+        ),
+        pytest.param(
+            "address_line_6, postcode",
+            "letter",
+            marks=pytest.mark.xfail,
+        ),
+        pytest.param(
+            "address_line_1, postcode, address_line_7",
+            "letter",
+            marks=pytest.mark.xfail,
+        ),
+        ("phone number", "sms"),
+        ("phone number,name", "sms"),
+        ("email address", "email"),
+        ("email address,name", "email"),
+        ("PHONENUMBER", "sms"),
+        ("email_address", "email"),
+        ("address_line_1, address_line_2, postcode", "letter"),
+        ("address_line_1, address_line_2, address_line_7", "letter"),
+        ("address_line_1, address_line_2, address_line_3", "letter"),
+        ("address_line_4, address_line_5, address_line_6", "letter"),
+        (
+            "address_line_1, address_line_2, address_line_3, address_line_4, address_line_5, address_line_6, postcode",
+            "letter",
+        ),
+    ],
+)
+def test_recipient_column(content, file_contents, template_type):
+    assert RecipientCSV(
+        file_contents, template=_sample_template(template_type, content)
+    ).has_recipient_columns
+
+
+@pytest.mark.parametrize(
+    (
+        "file_contents",
+        "template_type",
+        "rows_with_bad_recipients",
+        "rows_with_missing_data",
+    ),
+    [
+        (
+            """
+                phone number,name,date
+                2348675309,test1,test1
+                2348675309,test1
+                +44 123,test1,test1
+                2348675309,test1,test1
+                2348675309,test1
+                +1644000000,test1,test1
+                ,test1,test1
+            """,
+            "sms",
+            {2, 5},
+            {1, 4, 6},
+        ),
+        (
+            """
+                phone number,name
+                2348675309,test1,test2
+            """,
+            "sms",
+            set(),
+            set(),
+        ),
+        (
+            """
+            """,
+            "sms",
+            set(),
+            set(),
+        ),
+        (
+            # missing postcode
+            """
+                address_line_1,address_line_2,address_line_3,address_line_4,address_line_5,postcode,date
+                name,          building,      street,        town,          county,        SE1 7LS,today
+                name,          building,      street,        town,          county,        ,        today
+            """,
+            "letter",
+            {1},
+            set(),
+        ),
+        (
+            # not enough address fields
+            """
+                address_line_1, postcode, date
+                name,           SE1 7LS, today
+            """,
+            "letter",
+            {0},
+            set(),
+        ),
+        (
+            # optional address fields not filled in
+            """
+                address_line_1,address_line_2,address_line_3,address_line_4,address_line_5,postcode,date
+                name          ,123 fake st.  ,              ,              ,              ,SE1 7LS,today
+                name          ,              ,              ,              ,              ,SE1 7LS,today
+            """,
+            "letter",
+            {1},
+            set(),
+        ),
+        (
+            # Can use any address columns
+            """
+                address_line_3, address_line_4, address_line_7, date
+                name          , 123 fake st.,   SE1 7LS,        today
+            """,
+            "letter",
+            set(),
+            set(),
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "partial_instance",
+    [
+        partial(RecipientCSV),
+        partial(RecipientCSV, allow_international_sms=False),
+    ],
+)
+def test_bad_or_missing_data(
+    file_contents,
+    template_type,
+    rows_with_bad_recipients,
+    rows_with_missing_data,
+    partial_instance,
+):
+    recipients = partial_instance(
+        file_contents, template=_sample_template(template_type, "((date))")
+    )
+    assert _index_rows(recipients.rows_with_bad_recipients) == rows_with_bad_recipients
+    assert _index_rows(recipients.rows_with_missing_data) == rows_with_missing_data
+    if rows_with_bad_recipients or rows_with_missing_data:
+        assert recipients.has_errors is True
+
+
+@pytest.mark.parametrize(
+    ("file_contents", "rows_with_bad_recipients"),
+    [
+        (
+            """
+            phone number
+            +800000000000
+            1234
+            +447900123
+        """,
+            {0, 1, 2},
+        ),
+        (
+            """
+            phone number, country
+            1-202-234-0104, USA
+            +12022340104, USA
+            +23051234567, Mauritius
+        """,
+            {2},
+        ),
+    ],
+)
+def test_international_recipients(file_contents, rows_with_bad_recipients):
+    recipients = RecipientCSV(
+        file_contents,
+        template=_sample_template("sms"),
+        allow_international_sms=True,
+    )
+    assert _index_rows(recipients.rows_with_bad_recipients) == rows_with_bad_recipients
+
+
+def test_errors_when_too_many_rows():
+    recipients = RecipientCSV(
+        "email address\n" + ("a@b.com\n" * 101),
+        template=_sample_template("email"),
+    )
+
+    # Confirm the normal max_row limit
+    assert recipients.max_rows == 100_000
+    # Override to make this test faster
+    recipients.max_rows = 100
+
+    assert recipients.too_many_rows is True
+    assert recipients.has_errors is True
+    assert recipients.rows[99]["email_address"].data == "a@b.com"
+    # We stop processing subsequent rows
+    assert recipients.rows[100] is None
+
+
+@pytest.mark.parametrize(
+    ("file_contents", "template_type", "guestlist", "count_of_rows_with_errors"),
+    [
+        (
+            """
+                phone number
+                2348675309
+                2348675301
+                2348675302
+                2348675303
+            """,
+            "sms",
+            ["+12348675309"],  # Same as first phone number but in different format
+            3,
+        ),
+        (
+            """
+                phone number
+                12348675309
+                2348675301
+                2348675302
+            """,
+            "sms",
+            [
+                "2348675309",
+                "12348675301",
+                "2348675302",
+                "2341231234",
+                "test@example.com",
+            ],
+            0,
+        ),
+        (
+            """
+                email address
+                IN_GUESTLIST@EXAMPLE.COM
+                not_in_guestlist@example.com
+            """,
+            "email",
+            [
+                "in_guestlist@example.com",
+                "2348675309",
+            ],  # Email case differs to the one in the CSV
+            1,
+        ),
+    ],
+)
+def test_recipient_guestlist(
+    file_contents, template_type, guestlist, count_of_rows_with_errors
+):
+    recipients = RecipientCSV(
+        file_contents, template=_sample_template(template_type), guestlist=guestlist
+    )
+
+    if count_of_rows_with_errors:
+        assert not recipients.allowed_to_send_to
+    else:
+        assert recipients.allowed_to_send_to
+
+    # Make sure the guestlist isn’t emptied by reading it. If it’s an iterator then
+    # there’s a risk that it gets emptied after being read once
+    recipients.guestlist = (
+        str(fake_number) for fake_number in range(7700900888, 7700900898)
+    )
+    list(recipients.guestlist)
+    assert not recipients.allowed_to_send_to
+    assert recipients.has_errors
+
+    # An empty guestlist is treated as no guestlist at all
+    recipients.guestlist = []
+    assert recipients.allowed_to_send_to
+    recipients.guestlist = itertools.chain()
+    assert recipients.allowed_to_send_to
+
+
+def test_detects_rows_which_result_in_overly_long_messages():
+    template = SMSMessageTemplate(
+        {"content": "((placeholder))", "template_type": "sms"},
+        sender=None,
+        prefix=None,
+    )
+    recipients = RecipientCSV(
+        """
+            phone number,placeholder
+            2348675309,1
+            2348675301,{one_under}
+            2348675302,{exactly}
+            2348675303,{one_over}
+        """.format(
+            one_under="a" * (SMS_CHAR_COUNT_LIMIT - 1),
+            exactly="a" * SMS_CHAR_COUNT_LIMIT,
+            one_over="a" * (SMS_CHAR_COUNT_LIMIT + 1),
+        ),
+        template=template,
+    )
+    assert _index_rows(recipients.rows_with_errors) == {3}
+    assert _index_rows(recipients.rows_with_message_too_long) == {3}
+    assert recipients.has_errors
+    assert recipients[0].has_error_spanning_multiple_cells is False
+    assert recipients[1].has_error_spanning_multiple_cells is False
+    assert recipients[2].has_error_spanning_multiple_cells is False
+    assert recipients[3].has_error_spanning_multiple_cells is True
+
+
+def test_detects_rows_which_result_in_empty_messages():
+    template = SMSMessageTemplate(
+        {"content": "((show??content))", "template_type": "sms"},
+        sender=None,
+        prefix=None,
+    )
+    recipients = RecipientCSV(
+        """
+            phone number,show
+            2348675309,yes
+            2348675301,no
+            2348675302,yes
+        """,
+        template=template,
+    )
+    assert _index_rows(recipients.rows_with_errors) == {1}
+    assert _index_rows(recipients.rows_with_empty_message) == {1}
+    assert recipients.has_errors
+    assert recipients[0].has_error_spanning_multiple_cells is False
+    assert recipients[1].has_error_spanning_multiple_cells is True
+    assert recipients[2].has_error_spanning_multiple_cells is False
+
+
+@pytest.mark.parametrize(
+    ("key", "expected"),
+    sum(
+        [
+            [(key, expected) for key in group]
+            for expected, group in [
+                (
+                    "2348675309",
+                    (
+                        "phone number",
+                        "   PHONENUMBER",
+                        "phone_number",
+                        "phone-number",
+                        "phoneNumber",
+                    ),
+                ),
+                (
+                    "Jo",
+                    (
+                        "FIRSTNAME",
+                        "first name",
+                        "first_name ",
+                        "first-name",
+                        "firstName",
+                    ),
+                ),
+                (
+                    "Bloggs",
+                    (
+                        "Last    Name",
+                        "LASTNAME",
+                        "    last_name",
+                        "last-name",
+                        "lastName   ",
+                    ),
+                ),
+            ]
+        ],
+        [],
+    ),
+)
+def test_ignores_spaces_and_case_in_placeholders(key, expected):
+    recipients = RecipientCSV(
+        """
+            phone number,FIRSTNAME, Last Name
+            2348675309, Jo, Bloggs
+        """,
+        template=_sample_template(
+            "sms", content="((phone_number)) ((First Name)) ((lastname))"
+        ),
+    )
+    first_row = recipients[0]
+    assert first_row.get(key).data == expected
+    assert first_row[key].data == expected
+    assert first_row.recipient == "2348675309"
+    assert len(first_row.items()) == 3
+    assert not recipients.has_errors
+
+    assert recipients.missing_column_headers == set()
+    recipients.placeholders = {"one", "TWO", "Thirty_Three"}
+    assert recipients.missing_column_headers == {"one", "TWO", "Thirty_Three"}
+    assert recipients.has_errors
+
+
+@pytest.mark.parametrize(
+    ("character", "name"),
+    [
+        (" ", "SPACE"),
+        # these ones don’t have unicode names
+        ("\n", None),  # newline
+        ("\r", None),  # carriage return
+        ("\t", None),  # tab
+        ("\u180E", "MONGOLIAN VOWEL SEPARATOR"),
+        ("\u200B", "ZERO WIDTH SPACE"),
+        ("\u200C", "ZERO WIDTH NON-JOINER"),
+        ("\u200D", "ZERO WIDTH JOINER"),
+        ("\u2060", "WORD JOINER"),
+        ("\uFEFF", "ZERO WIDTH NO-BREAK SPACE"),
+        # all the things
+        (" \n\r\t\u000A\u000D\u180E\u200B\u200C\u200D\u2060\uFEFF", None),
+    ],
+)
+def test_ignores_leading_whitespace_in_file(character, name):
+    if name is not None:
+        assert unicodedata.name(character) == name
+
+    recipients = RecipientCSV(
+        "{}emailaddress\ntest@example.com".format(character),
+        template=_sample_template("email"),
+    )
+    first_row = recipients[0]
+
+    assert recipients.column_headers == ["emailaddress"]
+    assert recipients.recipient_column_headers == ["email address"]
+    assert recipients.missing_column_headers == set()
+    assert recipients.placeholders == ["email address"]
+
+    assert first_row.get("email address").data == "test@example.com"
+    assert first_row["email address"].data == "test@example.com"
+    assert first_row.recipient == "test@example.com"
+
+    assert not recipients.has_errors
+
+
+def test_error_if_too_many_recipients():
+    recipients = RecipientCSV(
+        "phone number,\n2348675309,\n2348675309,\n2348675309,",
+        template=_sample_template("sms"),
+        remaining_messages=2,
+    )
+    assert recipients.has_errors
+    assert recipients.more_rows_than_can_send
+
+
+def test_dont_error_if_too_many_recipients_not_specified():
+    recipients = RecipientCSV(
+        "phone number,\n2348675309,\n2348675309,\n2348675309,",
+        template=_sample_template("sms"),
+    )
+    assert not recipients.has_errors
+    assert not recipients.more_rows_than_can_send
+
+
+@pytest.mark.parametrize(
+    ("index", "expected_row"),
+    [
+        (
+            0,
+            {
+                "phone number": "07700 90000 1",
+                "colour": "red",
+            },
+        ),
+        (
+            1,
+            {
+                "phone_number": "07700 90000 2",
+                "COLOUR": "green",
+            },
+        ),
+        (
+            2,
+            {"p h o n e  n u m b e r": "07700 90000 3", "   colour   ": "blue"},
+        ),
+        pytest.param(
+            3,
+            {"phone number": "foo"},
+            marks=pytest.mark.xfail(raises=IndexError),
+        ),
+        (
+            -1,
+            {"p h o n e  n u m b e r": "07700 90000 3", "   colour   ": "blue"},
+        ),
+    ],
+)
+def test_recipients_can_be_accessed_by_index(index, expected_row):
+    recipients = RecipientCSV(
+        """
+            phone number, colour
+            07700 90000 1, red
+            07700 90000 2, green
+            07700 90000 3, blue
+        """,
+        template=_sample_template("sms"),
+    )
+    for key, value in expected_row.items():
+        assert recipients[index][key].data == value
+
+
+@pytest.mark.parametrize("international_sms", [True, False])
+def test_multiple_sms_recipient_columns(international_sms):
+    recipients = RecipientCSV(
+        """
+            phone number, phone number, phone_number, foo
+            234-867-5301, 234-867-5302, 234-867-5309, bar
+        """,
+        template=_sample_template("sms"),
+        allow_international_sms=international_sms,
+    )
+    assert recipients.column_headers == ["phone number", "phone_number", "foo"]
+    assert (
+        recipients.column_headers_as_column_keys == dict(phonenumber="", foo="").keys()
+    )
+    assert recipients.rows[0].get("phone number").data == ("234-867-5309")
+    assert recipients.rows[0].get("phone_number").data == ("234-867-5309")
+    assert recipients.rows[0].get("phone number").error is None
+    assert recipients.duplicate_recipient_column_headers == OrderedSet(
+        ["phone number", "phone_number"]
+    )
+    assert recipients.has_errors
+
+
+@pytest.mark.parametrize(
+    "column_name",
+    [
+        "phone_number",
+        "phonenumber",
+        "phone number",
+        "phone-number",
+        "p h o n e  n u m b e r",
+    ],
+)
+def test_multiple_sms_recipient_columns_with_missing_data(column_name):
+    recipients = RecipientCSV(
+        """
+            names, phone number, {}
+            "Joanna and Steve", 07900 900111
+        """.format(
+            column_name
+        ),
+        template=_sample_template("sms"),
+        allow_international_sms=True,
+    )
+    expected_column_headers = ["names", "phone number"]
+    if column_name != "phone number":
+        expected_column_headers.append(column_name)
+    assert recipients.column_headers == expected_column_headers
+    assert (
+        recipients.column_headers_as_column_keys
+        == dict(phonenumber="", names="").keys()
+    )
+    # A piece of weirdness uncovered: since rows are created before spaces in column names are normalised, when
+    # there are duplicate recipient columns and there is data for only one of the columns, if the columns have the same
+    # spacing, phone number data will be a list of this one phone number and None, while if the spacing style differs
+    # between two duplicate column names, the phone number data will be None. If there are no duplicate columns
+    # then our code finds the phone number well regardless of the spacing, so this should not affect our users.
+    phone_number_data = None
+    if column_name == "phone number":
+        phone_number_data = ["07900 900111", None]
+    assert recipients.rows[0]["phonenumber"].data == phone_number_data
+    assert recipients.rows[0].get("phone number").error is None
+    expected_duplicated_columns = ["phone number"]
+    if column_name != "phone number":
+        expected_duplicated_columns.append(column_name)
+    assert recipients.duplicate_recipient_column_headers == OrderedSet(
+        expected_duplicated_columns
+    )
+    assert recipients.has_errors
+
+
+def test_multiple_email_recipient_columns():
+    recipients = RecipientCSV(
+        """
+            EMAILADDRESS, email_address, foo
+            one@two.com,  two@three.com, bar
+        """,
+        template=_sample_template("email"),
+    )
+    assert recipients.rows[0].get("email address").data == ("two@three.com")
+    assert recipients.rows[0].get("email address").error is None
+    assert recipients.has_errors
+    assert recipients.duplicate_recipient_column_headers == OrderedSet(
+        ["EMAILADDRESS", "email_address"]
+    )
+    assert recipients.has_errors
+
+
+def test_multiple_letter_recipient_columns():
+    recipients = RecipientCSV(
+        """
+            address line 1, Address Line 2, address line 1, address_line_2
+            1,2,3,4
+        """,
+        template=_sample_template("letter"),
+    )
+    assert recipients.rows[0].get("addressline1").data == ("3")
+    assert recipients.rows[0].get("addressline1").error is None
+    assert recipients.has_errors
+    assert recipients.duplicate_recipient_column_headers == OrderedSet(
+        ["address line 1", "Address Line 2", "address line 1", "address_line_2"]
+    )
+    assert recipients.has_errors
+
+
+def test_displayed_rows_when_some_rows_have_errors():
+    recipients = RecipientCSV(
+        """
+            email address, name
+            a@b.com,
+            a@b.com,
+            a@b.com, My Name
+            a@b.com,
+            a@b.com,
+        """,
+        template=_sample_template("email", "((name))"),
+        max_errors_shown=3,
+    )
+
+    assert len(list(recipients.displayed_rows)) == 3
+
+
+def test_displayed_rows_when_there_are_no_rows_with_errors():
+    recipients = RecipientCSV(
+        """
+            email address, name
+            a@b.com, My Name
+            a@b.com, My Name
+            a@b.com, My Name
+            a@b.com, My Name
+        """,
+        template=_sample_template("email", "((name))"),
+        max_errors_shown=3,
+    )
+
+    assert len(list(recipients.displayed_rows)) == 4
+
+
+def test_multi_line_placeholders_work():
+    recipients = RecipientCSV(
+        """
+            email address, data
+            a@b.com, "a\nb\n\nc"
+        """,
+        template=_sample_template("email", "((data))"),
+    )
+
+    assert recipients.rows[0].personalisation["data"] == "a\nb\n\nc"
+
+
+@pytest.mark.parametrize(
+    ("extra_args", "expected_errors", "expected_bad_rows"),
+    [
+        ({}, True, {0}),
+        ({"allow_international_letters": False}, True, {0}),
+        ({"allow_international_letters": True}, False, set()),
+    ],
+)
+def test_accepts_international_addresses_when_allowed(
+    extra_args, expected_errors, expected_bad_rows
+):
+    recipients = RecipientCSV(
+        """
+            address line 1, address line 2, address line 3
+            First Lastname, 123 Example St, Fiji
+            First Lastname, 123 Example St, SW1A 1AA
+        """,
+        template=_sample_template("letter"),
+        **extra_args,
+    )
+    assert recipients.has_errors is expected_errors
+    assert _index_rows(recipients.rows_with_bad_recipients) == expected_bad_rows
+    # Prove that the error isn’t because the given country is unknown
+    assert recipients[0].as_postal_address.country == Country("Fiji")
+
+
+def test_address_validation_speed():
+    # We should be able to validate 1000 lines of address data in about
+    # a second – if it starts to get slow, something is inefficient
+    number_of_lines = 1000
+    uk_addresses_with_valid_postcodes = "\n".join(
+        (
+            "{n} Example Street, London, {a}{b} {c}{d}{e}".format(
+                n=randrange(1000),
+                a=choice(["n", "e", "sw", "se", "w"]),
+                b=choice(range(1, 10)),
+                c=choice(range(1, 10)),
+                d=choice("ABDefgHJLNPqrstUWxyZ"),
+                e=choice("ABDefgHJLNPqrstUWxyZ"),
+            )
+            for i in range(number_of_lines)
+        )
+    )
+    recipients = RecipientCSV(
+        "address line 1, address line 2, address line 3\n"
+        + (uk_addresses_with_valid_postcodes),
+        template=_sample_template("letter"),
+        allow_international_letters=False,
+    )
+    for row in recipients:
+        assert not row.has_bad_postal_address
+
+
+def test_email_validation_speed():
+    email_addresses = "\n".join(
+        (
+            "{a}{b}@example-{n}.com,Example,Thursday".format(
+                n=randrange(1000),
+                a=choice(string.ascii_letters),
+                b=choice(string.ascii_letters),
+            )
+            for i in range(1000)
+        )
+    )
+    recipients = RecipientCSV(
+        "email address,name,day\n" + email_addresses,
+        template=_sample_template(
+            "email",
+            content=f"""
+                hello ((name)) today is ((day))
+                here’s the letter ‘a’ 1000 times:
+                {'a' * 1000}
+            """,
+        ),
+    )
+    for row in recipients:
+        assert not row.has_error
+
+
+@pytest.mark.parametrize("should_validate", [True, False])
+def test_recipient_csv_checks_should_validate_flag(should_validate):
+    template = _sample_template("sms")
+    template.is_message_empty = Mock(return_value=False)
+
+    recipients = RecipientCSV(
+        """phone number,name
+        2348675309, test1
+        +447700 900 460,test2""",
+        template=template,
+        should_validate=should_validate,
+    )
+
+    recipients._get_error_for_field = Mock(return_value=None)
+
+    list(recipients.get_rows())
+
+    assert template.is_message_empty.called is should_validate
+    assert recipients._get_error_for_field.called is should_validate
diff --git a/tests/notifications_utils/test_recipient_validation.py b/tests/notifications_utils/test_recipient_validation.py
new file mode 100644
index 0000000000..ff48df7752
--- /dev/null
+++ b/tests/notifications_utils/test_recipient_validation.py
@@ -0,0 +1,427 @@
+import pytest
+
+from notifications_utils.recipients import (
+    InvalidEmailError,
+    InvalidPhoneError,
+    allowed_to_send_to,
+    format_phone_number_human_readable,
+    format_recipient,
+    get_international_phone_info,
+    international_phone_info,
+    is_us_phone_number,
+    try_validate_and_format_phone_number,
+    validate_and_format_phone_number,
+    validate_email_address,
+    validate_phone_number,
+)
+
+valid_us_phone_numbers = [
+    "1-202-555-0104",
+    "+12025550104",
+    "12025550104",
+    "2025550104",
+    "(202) 555-0104",
+]
+
+# TODO
+# International phone number tests are commented out as a result of issue #943 in notifications-admin.  We are
+# deliberately eliminating the ability to send to numbers outside of country code 1.   These tests should
+# be removed at some point when we are sure we are never going to support international numbers
+
+valid_international_phone_numbers = [
+    # "+71234567890",  # Russia
+    # "+447123456789",  # UK
+    # "+4407123456789",  # UK
+    # "+4407123 456789",  # UK
+    # "+4407123-456-789",  # UK
+    # "+23051234567",  # Mauritius,
+    # "+682 12345",  # Cook islands
+    # "+3312345678",
+    # "+9-2345-12345-12345",  # 15 digits
+]
+
+
+valid_phone_numbers = valid_us_phone_numbers + valid_international_phone_numbers
+
+
+invalid_us_phone_numbers = sum(
+    [
+        [(phone_number, error) for phone_number in group]
+        for error, group in [
+            (
+                "Too many digits",
+                (
+                    "55512345678",
+                    "+155512345678",
+                    "(555) 1234-5678",
+                ),
+            ),
+            (
+                "Not enough digits",
+                (
+                    "555123123",
+                    "(555) 123-123",
+                    "7890x32109",
+                    "07123 ☟☜⬇⬆☞☝",
+                    "07123☟☜⬇⬆☞☝",
+                ),
+            ),
+            ("Phone number range is not in use", ("1555123123",)),
+            ("Phone number is not possible", ("07123 456789...",)),
+            (
+                "The string supplied did not seem to be a phone number.",
+                (
+                    '07";DROP TABLE;"',
+                    "ALPHANUM3R1C",
+                ),
+            ),
+        ]
+    ],
+    [],
+)
+
+
+invalid_phone_numbers = [
+    ("+80233456789", "Not a valid country prefix"),
+    ("1234567", "Not enough digits"),
+    ("+682 1234", "Invalid country code"),  # Cook Islands phone numbers can be 5 digits
+    ("+12345 12345 12345 6", "Too many digits"),
+]
+
+
+valid_email_addresses = (
+    "email@domain.com",
+    "email@domain.COM",
+    "firstname.lastname@domain.com",
+    "firstname.o'lastname@domain.com",
+    "email@subdomain.domain.com",
+    "firstname+lastname@domain.com",
+    "1234567890@domain.com",
+    "email@domain-one.com",
+    "_______@domain.com",
+    "email@domain.name",
+    "email@domain.superlongtld",
+    "email@domain.co.jp",
+    "firstname-lastname@domain.com",
+    "info@german-financial-services.vermögensberatung",
+    "info@german-financial-services.reallylongarbitrarytldthatiswaytoohugejustincase",
+    "japanese-info@例え.テスト",
+    "email@double--hyphen.com",
+)
+invalid_email_addresses = (
+    "email@123.123.123.123",
+    "email@[123.123.123.123]",
+    "plainaddress",
+    "@no-local-part.com",
+    "Outlook Contact <outlook-contact@domain.com>",
+    "no-at.domain.com",
+    "no-tld@domain",
+    ";beginning-semicolon@domain.co.uk",
+    "middle-semicolon@domain.co;uk",
+    "trailing-semicolon@domain.com;",
+    '"email+leading-quotes@domain.com',
+    'email+middle"-quotes@domain.com',
+    '"quoted-local-part"@domain.com',
+    '"quoted@domain.com"',
+    "lots-of-dots@domain..gov..uk",
+    "two-dots..in-local@domain.com",
+    "multiple@domains@domain.com",
+    "spaces in local@domain.com",
+    "spaces-in-domain@dom ain.com",
+    "underscores-in-domain@dom_ain.com",
+    "pipe-in-domain@example.com|gov.uk",
+    "comma,in-local@gov.uk",
+    "comma-in-domain@domain,gov.uk",
+    "pound-sign-in-local£@domain.com",
+    "local-with-’-apostrophe@domain.com",
+    "local-with-”-quotes@domain.com",
+    "domain-starts-with-a-dot@.domain.com",
+    "brackets(in)local@domain.com",
+    "email-too-long-{}@example.com".format("a" * 320),
+    "incorrect-punycode@xn---something.com",
+)
+
+
+@pytest.mark.parametrize("phone_number", valid_international_phone_numbers)
+def test_detect_international_phone_numbers(phone_number):
+    assert is_us_phone_number(phone_number) is False
+
+
+@pytest.mark.parametrize("phone_number", valid_us_phone_numbers)
+def test_detect_us_phone_numbers(phone_number):
+    assert is_us_phone_number(phone_number) is True
+
+
+@pytest.mark.parametrize(
+    ("phone_number", "expected_info"),
+    [
+        # (
+        #    "+4407900900123",
+        #    international_phone_info(
+        #        international=True,
+        #        country_prefix="44",  # UK
+        #        billable_units=1,
+        #    ),
+        # ),
+        # (
+        #    "+4407700900123",
+        #    international_phone_info(
+        #        international=True,
+        #        country_prefix="44",  # Number in TV range
+        #        billable_units=1,
+        #    ),
+        # ),
+        # (
+        #    "+4407700800123",
+        #    international_phone_info(
+        #        international=True,
+        #        country_prefix="44",  # UK Crown dependency, so prefix same as UK
+        #        billable_units=1,
+        #    ),
+        # ),
+        # ( #
+        #    "+20-12-1234-1234",
+        #    international_phone_info(
+        #        international=True,
+        #        country_prefix="20",  # Egypt
+        #        billable_units=1,
+        #    ),
+        # ),
+        # (
+        #    "+201212341234",
+        #    international_phone_info(
+        #        international=True,
+        #        country_prefix="20",  # Egypt
+        #        billable_units=1,
+        #    ),
+        # ),
+        (
+            "+1 664-491-3434",
+            international_phone_info(
+                international=True,
+                country_prefix="1664",  # Montserrat
+                billable_units=1,
+            ),
+        ),
+        # (
+        #    "+71234567890",
+        #    international_phone_info(
+        #        international=True,
+        #        country_prefix="7",  # Russia
+        #        billable_units=1,
+        #    ),
+        # ),
+        (
+            "1-202-555-0104",
+            international_phone_info(
+                international=False,
+                country_prefix="1",  # USA
+                billable_units=1,
+            ),
+        ),
+        (
+            "202-555-0104",
+            international_phone_info(
+                international=False,
+                country_prefix="1",  # USA
+                billable_units=1,
+            ),
+        ),
+        # (
+        #    "+23051234567",
+        #    international_phone_info(
+        #        international=True,
+        #        country_prefix="230",  # Mauritius
+        #        billable_units=1,
+        #    ),
+        # ),
+    ],
+)
+def test_get_international_info(phone_number, expected_info):
+    assert get_international_phone_info(phone_number) == expected_info
+
+
+@pytest.mark.parametrize(
+    "phone_number",
+    [
+        "+21 4321 0987",
+        "+00997 1234 7890",
+        "+801234-7890",
+        "+8-0-1234-78901",
+    ],
+)
+def test_get_international_info_raises(phone_number):
+    with pytest.raises(InvalidPhoneError) as error:
+        get_international_phone_info(phone_number)
+    assert str(error.value) == "Not a valid country prefix"
+
+
+@pytest.mark.parametrize("phone_number", valid_us_phone_numbers)
+@pytest.mark.parametrize(
+    "extra_args",
+    [
+        {},
+        {"international": False},
+    ],
+)
+def test_phone_number_accepts_valid_values(extra_args, phone_number):
+    try:
+        validate_phone_number(phone_number, **extra_args)
+    except InvalidPhoneError:
+        pytest.fail("Unexpected InvalidPhoneError")
+
+
+@pytest.mark.parametrize("phone_number", valid_phone_numbers)
+def test_phone_number_accepts_valid_international_values(phone_number):
+    try:
+        validate_phone_number(phone_number, international=True)
+    except InvalidPhoneError:
+        pytest.fail("Unexpected InvalidPhoneError")
+
+
+@pytest.mark.parametrize("phone_number", valid_us_phone_numbers)
+def test_valid_us_phone_number_can_be_formatted_consistently(phone_number):
+    assert validate_and_format_phone_number(phone_number) == "+12025550104"
+
+
+@pytest.mark.parametrize(
+    ("phone_number", "expected_formatted"),
+    [
+        # ("+44071234567890", "+4471234567890"),
+        ("1-202-555-0104", "+12025550104"),
+        ("+12025550104", "+12025550104"),
+        ("12025550104", "+12025550104"),
+        # ("+23051234567", "+23051234567"),
+    ],
+)
+def test_valid_international_phone_number_can_be_formatted_consistently(
+    phone_number, expected_formatted
+):
+    assert (
+        validate_and_format_phone_number(phone_number, international=True)
+        == expected_formatted
+    )
+
+
+@pytest.mark.parametrize(("phone_number", "error_message"), invalid_us_phone_numbers)
+@pytest.mark.parametrize(
+    "extra_args",
+    [
+        {},
+        {"international": False},
+    ],
+)
+def test_phone_number_rejects_invalid_values(extra_args, phone_number, error_message):
+    with pytest.raises(InvalidPhoneError) as e:
+        validate_phone_number(phone_number, **extra_args)
+    assert error_message == str(e.value)
+
+
+@pytest.mark.parametrize(("phone_number", "error_message"), invalid_phone_numbers)
+def test_phone_number_rejects_invalid_international_values(phone_number, error_message):
+    with pytest.raises(InvalidPhoneError) as e:
+        validate_phone_number(phone_number, international=True)
+    assert error_message == str(e.value)
+
+
+@pytest.mark.parametrize("email_address", valid_email_addresses)
+def test_validate_email_address_accepts_valid(email_address):
+    try:
+        assert validate_email_address(email_address) == email_address
+    except InvalidEmailError:
+        pytest.fail("Unexpected InvalidEmailError")
+
+
+@pytest.mark.parametrize(
+    "email",
+    [
+        " email@domain.com ",
+        "\temail@domain.com",
+        "\temail@domain.com\n",
+        "\u200Bemail@domain.com\u200B",
+    ],
+)
+def test_validate_email_address_strips_whitespace(email):
+    assert validate_email_address(email) == "email@domain.com"
+
+
+@pytest.mark.parametrize("email_address", invalid_email_addresses)
+def test_validate_email_address_raises_for_invalid(email_address):
+    with pytest.raises(InvalidEmailError) as e:
+        validate_email_address(email_address)
+    assert str(e.value) == "Not a valid email address"
+
+
+@pytest.mark.parametrize("phone_number", valid_us_phone_numbers)
+def test_validates_against_guestlist_of_phone_numbers(phone_number):
+    assert allowed_to_send_to(
+        phone_number, ["2025550104", "2025550105", "test@example.com"]
+    )
+    assert not allowed_to_send_to(
+        phone_number, ["2025550105", "2028675309", "test@example.com"]
+    )
+
+
+# @pytest.mark.parametrize(
+#    "recipient_number, allowlist_number",
+#    [
+#        ["+4407123-456-789", "+4407123456789"],
+#        ["+4407123456789", "+4407123-456-789"],
+#    ],
+# )
+# def test_validates_against_guestlist_of_international_phone_numbers(
+#    recipient_number, allowlist_number
+# ):
+#    assert allowed_to_send_to(recipient_number, [allowlist_number])
+
+
+@pytest.mark.parametrize("email_address", valid_email_addresses)
+def test_validates_against_guestlist_of_email_addresses(email_address):
+    assert not allowed_to_send_to(
+        email_address, ["very_special_and_unique@example.com"]
+    )
+
+
+@pytest.mark.parametrize(
+    ("phone_number", "expected_formatted"),
+    [
+        # ("+4407900900123", "+44 7900 900123"),  # UK
+        # ("+44(0)7900900123", "+44 7900 900123"),  # UK
+        # ("+447900900123", "+44 7900 900123"),  # UK
+        # ("+20-12-1234-1234", "+20 121 234 1234"),  # Egypt
+        # ("+201212341234", "+20 121 234 1234"),  # Egypt
+        ("+1 664 491-3434", "+1 664-491-3434"),  # Montserrat
+        # ("+7 499 1231212", "+7 499 123-12-12"),  # Moscow (Russia)
+        ("1-202-555-0104", "(202) 555-0104"),  # Washington DC (USA)
+        # ("+23051234567", "+230 5123 4567"),  # Mauritius
+        # ("+33(0)1 12345678", "+33 1 12 34 56 78"),  # Paris (France)
+    ],
+)
+def test_format_us_and_international_phone_numbers(phone_number, expected_formatted):
+    assert format_phone_number_human_readable(phone_number) == expected_formatted
+
+
+@pytest.mark.parametrize(
+    ("recipient", "expected_formatted"),
+    [
+        (True, ""),
+        (False, ""),
+        (0, ""),
+        (0.1, ""),
+        (None, ""),
+        ("foo", "foo"),
+        ("TeSt@ExAmPl3.com", "test@exampl3.com"),
+        # ("+4407900 900 123", "+447900900123"),
+        ("+1 800 555 5555", "+18005555555"),
+    ],
+)
+def test_format_recipient(recipient, expected_formatted):
+    assert format_recipient(recipient) == expected_formatted
+
+
+def test_try_format_recipient_doesnt_throw():
+    assert try_validate_and_format_phone_number("ALPHANUM3R1C") == "ALPHANUM3R1C"
+
+
+def test_format_phone_number_human_readable_doenst_throw():
+    assert format_phone_number_human_readable("ALPHANUM3R1C") == "ALPHANUM3R1C"
diff --git a/tests/notifications_utils/test_request_header_authentication.py b/tests/notifications_utils/test_request_header_authentication.py
new file mode 100644
index 0000000000..8a5d93cfc6
--- /dev/null
+++ b/tests/notifications_utils/test_request_header_authentication.py
@@ -0,0 +1,61 @@
+import pytest
+from werkzeug.test import EnvironBuilder
+
+from notifications_utils.request_helper import NotifyRequest, _check_proxy_header_secret
+
+
+@pytest.mark.parametrize(
+    ("header", "secrets", "expected"),
+    [
+        (
+            {"X-Custom-Forwarder": "right_key"},
+            ["right_key", "old_key"],
+            (True, "Key used: 1"),
+        ),
+        ({"X-Custom-Forwarder": "right_key"}, ["right_key"], (True, "Key used: 1")),
+        ({"X-Custom-Forwarder": "right_key"}, ["right_key", ""], (True, "Key used: 1")),
+        ({"My-New-Header": "right_key"}, ["right_key", ""], (True, "Key used: 1")),
+        ({"X-Custom-Forwarder": "right_key"}, ["", "right_key"], (True, "Key used: 2")),
+        (
+            {"X-Custom-Forwarder": "right_key"},
+            ["", "old_key", "right_key"],
+            (True, "Key used: 3"),
+        ),
+        (
+            {"X-Custom-Forwarder": ""},
+            ["right_key", "old_key"],
+            (False, "Header exists but is empty"),
+        ),
+        (
+            {"X-Custom-Forwarder": "right_key"},
+            ["", None],
+            (False, "Secrets are not configured"),
+        ),
+        (
+            {"X-Custom-Forwarder": "wrong_key"},
+            ["right_key", "old_key"],
+            (False, "Header didn't match any keys"),
+        ),
+    ],
+)
+def test_request_header_authorization(header, secrets, expected):
+    builder = EnvironBuilder()
+    builder.headers.extend(header)
+    request = NotifyRequest(builder.get_environ())
+
+    res = _check_proxy_header_secret(request, secrets, list(header.keys())[0])
+    assert res == expected
+
+
+@pytest.mark.parametrize(
+    ("secrets", "expected"),
+    [
+        (["old_key", "right_key"], (False, "Header missing")),
+    ],
+)
+def test_request_header_authorization_missing_header(secrets, expected):
+    builder = EnvironBuilder()
+    request = NotifyRequest(builder.get_environ())
+
+    res = _check_proxy_header_secret(request, secrets)
+    assert res == expected
diff --git a/tests/notifications_utils/test_request_id.py b/tests/notifications_utils/test_request_id.py
new file mode 100644
index 0000000000..fee5e7d870
--- /dev/null
+++ b/tests/notifications_utils/test_request_id.py
@@ -0,0 +1,32 @@
+from notifications_utils import request_helper
+
+
+def test_request_id_is_set_on_response(app):
+    request_helper.init_app(app)
+    client = app.test_client()
+
+    with app.app_context():
+        response = client.get(
+            "/", headers={"X-B3-TraceId": "generated", "X-B3-SpanId": "generated"}
+        )
+        assert response.headers["X-B3-TraceId"] == "generated"
+        assert response.headers["X-B3-SpanId"] == "generated"
+
+
+def test_request_id_is_set_on_error_response(app):
+    request_helper.init_app(app)
+    client = app.test_client()
+    # turn off DEBUG so that the flask default error handler gets triggered
+    app.config["DEBUG"] = False
+
+    @app.route("/")
+    def error_route():
+        raise Exception()
+
+    with app.app_context():
+        response = client.get(
+            "/", headers={"X-B3-TraceId": "generated", "X-B3-SpanId": "generated"}
+        )
+        assert response.status_code == 500
+        assert response.headers["X-B3-TraceId"] == "generated"
+        assert response.headers["X-B3-SpanId"] == "generated"
diff --git a/tests/notifications_utils/test_s3.py b/tests/notifications_utils/test_s3.py
new file mode 100644
index 0000000000..46b863c4fd
--- /dev/null
+++ b/tests/notifications_utils/test_s3.py
@@ -0,0 +1,108 @@
+from urllib.parse import parse_qs
+
+import botocore
+import pytest
+
+from notifications_utils.s3 import S3ObjectNotFound, s3download, s3upload
+
+contents = "some file data"
+region = "eu-west-1"
+bucket = "some_bucket"
+location = "some_file_location"
+content_type = "binary/octet-stream"
+
+
+def test_s3upload_save_file_to_bucket(mocker):
+    mocked = mocker.patch("notifications_utils.s3.Session.resource")
+    s3upload(
+        filedata=contents, region=region, bucket_name=bucket, file_location=location
+    )
+    mocked_put = mocked.return_value.Object.return_value.put
+    mocked_put.assert_called_once_with(
+        Body=contents,
+        ServerSideEncryption="AES256",
+        ContentType=content_type,
+    )
+
+
+def test_s3upload_save_file_to_bucket_with_contenttype(mocker):
+    content_type = "image/png"
+    mocked = mocker.patch("notifications_utils.s3.Session.resource")
+    s3upload(
+        filedata=contents,
+        region=region,
+        bucket_name=bucket,
+        file_location=location,
+        content_type=content_type,
+    )
+    mocked_put = mocked.return_value.Object.return_value.put
+    mocked_put.assert_called_once_with(
+        Body=contents,
+        ServerSideEncryption="AES256",
+        ContentType=content_type,
+    )
+
+
+def test_s3upload_raises_exception(app, mocker):
+    mocked = mocker.patch("notifications_utils.s3.Session.resource")
+    response = {"Error": {"Code": 500}}
+    exception = botocore.exceptions.ClientError(response, "Bad exception")
+    mocked.return_value.Object.return_value.put.side_effect = exception
+    with pytest.raises(botocore.exceptions.ClientError):
+        s3upload(
+            filedata=contents,
+            region=region,
+            bucket_name=bucket,
+            file_location="location",
+        )
+
+
+def test_s3upload_save_file_to_bucket_with_urlencoded_tags(mocker):
+    mocked = mocker.patch("notifications_utils.s3.Session.resource")
+    s3upload(
+        filedata=contents,
+        region=region,
+        bucket_name=bucket,
+        file_location=location,
+        tags={"a": "1/2", "b": "x y"},
+    )
+    mocked_put = mocked.return_value.Object.return_value.put
+
+    # make sure tags were a urlencoded query string
+    encoded_tags = mocked_put.call_args[1]["Tagging"]
+    assert parse_qs(encoded_tags) == {"a": ["1/2"], "b": ["x y"]}
+
+
+def test_s3upload_save_file_to_bucket_with_metadata(mocker):
+    mocked = mocker.patch("notifications_utils.s3.Session.resource")
+    s3upload(
+        filedata=contents,
+        region=region,
+        bucket_name=bucket,
+        file_location=location,
+        metadata={"status": "valid", "pages": "5"},
+    )
+    mocked_put = mocked.return_value.Object.return_value.put
+
+    metadata = mocked_put.call_args[1]["Metadata"]
+    assert metadata == {"status": "valid", "pages": "5"}
+
+
+def test_s3download_gets_file(mocker):
+    mocked = mocker.patch("notifications_utils.s3.Session.resource")
+    mocked_object = mocked.return_value.Object
+    mocked_get = mocked.return_value.Object.return_value.get
+    s3download("bucket", "location.file")
+    mocked_object.assert_called_once_with("bucket", "location.file")
+    mocked_get.assert_called_once_with()
+
+
+def test_s3download_raises_on_error(mocker):
+    mocked = mocker.patch("notifications_utils.s3.Session.resource")
+    mocked.return_value.Object.side_effect = botocore.exceptions.ClientError(
+        {"Error": {"Code": 404}},
+        "Bad exception",
+    )
+
+    with pytest.raises(S3ObjectNotFound):
+        s3download("bucket", "location.file")
diff --git a/tests/notifications_utils/test_safe_string.py b/tests/notifications_utils/test_safe_string.py
new file mode 100644
index 0000000000..613dc85afb
--- /dev/null
+++ b/tests/notifications_utils/test_safe_string.py
@@ -0,0 +1,47 @@
+import pytest
+
+from notifications_utils.safe_string import (
+    make_string_safe_for_email_local_part,
+    make_string_safe_for_id,
+)
+
+
+@pytest.mark.parametrize(
+    ("unsafe_string", "expected_safe"),
+    [
+        ("name with spaces", "name.with.spaces"),
+        ("singleword", "singleword"),
+        ("UPPER CASE", "upper.case"),
+        ("Service - with dash", "service.with.dash"),
+        ("lots      of spaces", "lots.of.spaces"),
+        ("name.with.dots", "name.with.dots"),
+        ("name-with-other-delimiters", "namewithotherdelimiters"),
+        (".leading", "leading"),
+        ("trailing.", "trailing"),
+        ("üńïçödë wördś", "unicode.words"),
+    ],
+)
+def test_email_safe_return_dot_separated_email_local_part(unsafe_string, expected_safe):
+    assert make_string_safe_for_email_local_part(unsafe_string) == expected_safe
+
+
+@pytest.mark.parametrize(
+    ("unsafe_string", "expected_safe"),
+    [
+        ("name with spaces", "name-with-spaces"),
+        ("singleword", "singleword"),
+        ("UPPER CASE", "upper-case"),
+        ("Service - with dash", "service---with-dash"),
+        ("lots      of spaces", "lots-of-spaces"),
+        ("name.with.dots", "namewithdots"),
+        ("name-with-dashes", "name-with-dashes"),
+        ("N. London", "n-london"),
+        (".leading", "leading"),
+        ("-leading", "-leading"),
+        ("trailing.", "trailing"),
+        ("trailing-", "trailing-"),
+        ("üńïçödë wördś", "unicode-words"),
+    ],
+)
+def test_id_safe_return_dash_separated_string(unsafe_string, expected_safe):
+    assert make_string_safe_for_id(unsafe_string) == expected_safe
diff --git a/tests/notifications_utils/test_sanitise_text.py b/tests/notifications_utils/test_sanitise_text.py
new file mode 100644
index 0000000000..e8bdf04dda
--- /dev/null
+++ b/tests/notifications_utils/test_sanitise_text.py
@@ -0,0 +1,313 @@
+import pytest
+
+from notifications_utils.sanitise_text import SanitiseASCII, SanitiseSMS, SanitiseText
+
+params, ids = zip(
+    (("a", "a"), "ascii char (a)"),
+    # ascii control char (not in GSM)
+    (("\t", " "), "ascii control char not in gsm (tab)"),
+    # TODO we support lots of languages now not in the GSM charset so maybe make this 'downgrading' go away
+    # TODO for now comment out this line because it directly conflicts with support for Turkish
+    # these are not in GSM charset so are downgraded
+    # (("ç", "c"), "decomposed unicode char (C with cedilla)"),
+    # these unicode chars should change to something completely different for compatibility
+    # (("–", "-"), "compatibility transform unicode char (EN DASH (U+2013)"),
+    # (("—", "-"), "compatibility transform unicode char (EM DASH (U+2014)"),
+    (
+        ("…", "..."),
+        "compatibility transform unicode char (HORIZONTAL ELLIPSIS (U+2026)",
+    ),
+    (("\u200B", ""), "compatibility transform unicode char (ZERO WIDTH SPACE (U+200B)"),
+    (
+        ("‘", "'"),
+        "compatibility transform unicode char (LEFT SINGLE QUOTATION MARK (U+2018)",
+    ),
+    (
+        ("’", "'"),
+        "compatibility transform unicode char (RIGHT SINGLE QUOTATION MARK (U+2019)",
+    ),
+    # Conflict with Chinese quotes
+    # (
+    #    ("“", '"'),
+    #    "compatibility transform unicode char (LEFT DOUBLE QUOTATION MARK (U+201C)	",
+    # ),
+    # (
+    #    ("”", '"'),
+    #    "compatibility transform unicode char (RIGHT DOUBLE QUOTATION MARK (U+201D)",
+    # ),
+    (("\xa0", " "), "nobreak transform unicode char (NO-BREAK SPACE (U+00A0))"),
+    # this unicode char is not decomposable
+    (("😬", "?"), "undecomposable unicode char (grimace emoji)"),
+    (("↉", "?"), "vulgar fraction (↉) that we do not try decomposing"),
+)
+
+
+@pytest.mark.parametrize(("char", "expected"), params, ids=ids)
+@pytest.mark.parametrize("cls", [SanitiseSMS, SanitiseASCII])
+def test_encode_chars_the_same_for_ascii_and_sms(char, expected, cls):
+    assert cls.encode_char(char) == expected
+
+
+params, ids = zip(
+    # ascii control chars are allowed in GSM but not in ASCII
+    (("\n", "\n", "?"), "ascii control char in gsm (newline)"),
+    (("\r", "\r", "?"), "ascii control char in gsm (return)"),
+    # These characters are present in GSM but not in ascii
+    (("à", "à", "a"), "non-ascii gsm char (a with accent)"),
+    (("€", "€", "?"), "non-ascii gsm char (euro)"),
+    # These characters are Welsh characters that are not present in GSM
+    (("â", "â", "a"), "non-gsm Welsh char (a with hat)"),
+    (("Ŷ", "Ŷ", "Y"), "non-gsm Welsh char (capital y with hat)"),
+    (("ë", "ë", "e"), "non-gsm Welsh char (e with dots)"),
+    # (("Ò", "Ò", "O"), "non-gsm Welsh char (capital O with grave accent)"),  # conflicts with Vietnamese
+    (("í", "í", "i"), "non-gsm Welsh char (i with accent)"),
+)
+
+
+@pytest.mark.parametrize(("char", "expected_sms", "expected_ascii"), params, ids=ids)
+def test_encode_chars_different_between_ascii_and_sms(
+    char, expected_sms, expected_ascii
+):
+    assert SanitiseSMS.encode_char(char) == expected_sms
+    assert SanitiseASCII.encode_char(char) == expected_ascii
+
+
+@pytest.mark.parametrize(
+    ("codepoint", "char"),
+    [
+        ("0041", "A"),
+        ("0061", "a"),
+    ],
+)
+def test_get_unicode_char_from_codepoint(codepoint, char):
+    assert SanitiseText.get_unicode_char_from_codepoint(codepoint) == char
+
+
+@pytest.mark.parametrize(
+    "bad_input", ["", "GJ", "00001", '0001";import sys;sys.exit(0)"']
+)
+def test_get_unicode_char_from_codepoint_rejects_bad_input(bad_input):
+    with pytest.raises(ValueError):  # noqa PT011
+        SanitiseText.get_unicode_char_from_codepoint(bad_input)
+
+
+@pytest.mark.parametrize(
+    ("content", "expected"),
+    [
+        ("Łōdź", "?odz"),
+        (
+            "The quick brown fox jumps over the lazy dog",
+            "The quick brown fox jumps over the lazy dog",
+        ),
+    ],
+)
+def test_encode_string(content, expected):
+    assert SanitiseSMS.encode(content) == expected
+    assert SanitiseASCII.encode(content) == expected
+
+
+@pytest.mark.parametrize(
+    ("content", "cls", "expected"),
+    [
+        ("The quick brown fox jumps over the lazy dog", SanitiseSMS, set()),
+        (
+            "The “quick” brown fox has some downgradable characters\xa0",
+            SanitiseSMS,
+            set(),
+        ),
+        ("Need more 🐮🔔", SanitiseSMS, {"🐮", "🔔"}),
+        ("Ŵêlsh chârâctêrs ârê cômpâtîblê wîth SanitiseSMS", SanitiseSMS, set()),
+        ("Lots of GSM chars that arent ascii compatible:\n\r€", SanitiseSMS, set()),
+        (
+            "Lots of GSM chars that arent ascii compatible:\n\r€",
+            SanitiseASCII,
+            {"\n", "\r", "€"},
+        ),
+        ("Αυτό είναι ένα τεστ", SanitiseSMS, set()),
+        ("。、“”()：;？！", SanitiseSMS, set()),  # Chinese punctuation
+    ],
+)
+def test_sms_encoding_get_non_compatible_characters(content, cls, expected):
+    assert cls.get_non_compatible_characters(content) == expected
+
+
+@pytest.mark.parametrize(
+    ("content", "expected"),
+    [
+        ("이것은 테스트입니다", True),  # Korean
+        ("Αυτό είναι ένα τεστ", True),  # Greek
+        ("Это проверка", True),  # Russian
+        ("นี่คือการทดสอบ", True),  # Thai
+        ("இது ஒரு சோதனை", True),  # Tamil
+        ("これはテストです", True),  # Japanese
+        ("Đây là một bài kiểm tra", True),  # Vietnamese
+        ("𐤓𐤓𐤓𐤈𐤆", False),  # Phoenician
+        ("这是一次测试", True),  # Mandarin (Simplified)
+        ("Bunda Türkçe karakterler var", True),  # Turkish
+        (
+            "盾牌镍币是第一种采用白铜制作的5美分硬币，由詹姆斯·B·朗埃克设计，从1866年发行到1883年再由自由女神头像镍币取代。",
+            True,
+        ),  # Chinese from wikipedia 1
+        (
+            "国际志愿者日為每年的12月5日，它是由联合国大会在1985年12月17日通过的A/RES/40/212决议[1]上确定的[2]。",
+            True,
+        ),  # Chinese from wikipedia 2
+        (
+            "哪一種多邊形內部至少存在一個可以看見多邊形所有邊界和所有內部區域的點？",
+            True,
+        ),  # Chinese from wikipedia 3
+        (
+            """都柏林在官方城市邊界內的人口是大約495,000人（愛爾蘭中央統計處2002年人口調查），
+            然而這種統計已經沒有什麼太大的意義，因為都柏林的市郊地區和衛星城鎮已經大幅地發展與擴張。""",
+            True,
+        ),  # Chinese from wikipedia 4
+        (
+            "一名是Dubh Linn（愛爾蘭語，意為「黑色的水池」）的英國習語。當然也有人質疑這語源。",
+            True,
+        ),  # Chinese from wikipedia 5
+        (
+            "都柏林拥有世界闻名的文学历史，曾经产生过许多杰出的文学家，例如诺贝尔文学奖得主威廉·巴特勒·叶芝、蕭伯納和塞繆爾·貝克特。",
+            True,
+        ),  # Chinese from wikipedia 6
+        (
+            "愛爾蘭國家博物館的四个分馆中有三個分館都位於都柏林：考古学分馆在基尔代尔街，装饰艺术和历史分馆在柯林斯军营，而自然史分馆在梅林街[12]。",
+            True,
+        ),  # Chinese from wikipedia 7
+        (
+            "從17世紀開始，城市在寬闊街道事務委員會的幫助下開始迅速擴張。乔治亚都柏林曾一度是大英帝國僅次於倫敦的第二大城市。",
+            True,
+        ),  # Chinese from wikipedia 8
+        (
+            "一些著名的都柏林街道建築仍以倒閉前在此經營的酒吧和商業公司命名。",
+            True,
+        ),  # Chinese from wikipedia 9
+        (
+            "1922年，隨著愛爾蘭的分裂，都柏林成為愛爾蘭自由邦（1922年–1937年）的首都。現在則為愛爾蘭共和國的首都。",
+            True,
+        ),  # Chinese from wikipedia 10
+        (
+            """Dưới đây là danh sách tất cả các tên người dùng hiện đang có
+            tại Wikipedia, hoặc những tên người dùng trong một nhóm chỉ định. """,
+            True,
+        ),  # Vietnamese from wikipedia 1
+        (
+            """Các bảo quản viên đảm nhận những trách nhiệm này với tư cách là tình
+            nguyện viên sau khi trải qua quá trình xem xét của cộng đồng. """,
+            True,
+        ),  # Vietnamese from wikipedia 2
+        (
+            """Họ không bao giờ được yêu cầu sử dụng các công cụ của mình và không bao
+            giờ được sử dụng chúng để giành lợi thế trong một cuộc tranh chấp mà họ có
+            tham gia. Không nên nhầm lẫn bảo quản viên với quản trị viên hệ
+            thống của Wikimedia ("sysadmins").""",
+            True,
+        ),  # Vietnamese from wikipedia 3
+        (
+            "Để đạt được mục tiêu chung đó, Wikipedia đề ra một số quy định và hướng dẫn. ",
+            True,
+        ),  # Vietnamese from wikipedia 4
+        ("Wikipedia là một bách khoa toàn thư. ", True),  # Vietnamese from wikipedia 5
+        (
+            "Phải đảm bảo bài viết mang lại ích lợi cho độc giả (coi độc giả là yếu tố quan trọng khi viết bài)",
+            True,
+        ),  # Vietnamese from wikipedia 6
+        (
+            """Bài viết ở Wikipedia có thể chứa đựng từ ngữ và hình ảnh gây khó chịu
+            nhưng chỉ vì mục đích tốt đẹp. Không cần thêm vào phủ định trách nhiệm.""",
+            True,
+        ),  # Vietnamese from wikipedia 7
+        (
+            "Đừng sử dụng hình ảnh mà chỉ có thể xem được chính xác với công cụ 3D.",
+            True,
+        ),  # Vietnamese from wikipedia 8
+        (
+            """Trích dẫn bất cứ nôi dung tranh luận gốc nào cũng nên có liên quan
+            đến tranh luận đó (hoặc minh họa cho phong cách) và chỉ nên dài vừa đủ.""",
+            True,
+        ),  # Vietnamese from wikipedia 9
+        (
+            """Không tung tin vịt, thông tin sai lệch hoặc nội dung không kiểm chứng được vào bài viết.
+            Tuy nhiên, những bài viết về những tin vịt nổi bật được chấp nhận.""",
+            True,
+        ),  # Vietnamese from wikipedia 10
+        (
+            "수록되어 있으며, 넘겨주기를 포함한 일반 문서 수는 1,434,776개。",
+            True,
+        ),  # Korean from wikipedia includes circle-period
+        (
+            "日本語表記にも対応するようになり[1]、徐々に日本人のユーザーも増大していった、と述べられている。",
+            True,
+        ),  # Japanese from wikipedia includes circle-period
+        (
+            "DSHS:我们发现您的账户存在潜在欺诈行为。请致电您的 EBT 卡背面的号码废止或前往当地办公室获取一个新账户。回复 “STOP(退订)” 退订",
+            True,
+        ),  # State of Washington Chinese Simplified
+        (
+            """DSHS៖ ប ើងោនកត់សម្គា ល់ប ើញក្ដរបោកប្រោស់ជាសក្ដា នុពលបៅបលើគណនីរបស់អ្នក។ សូមបៅបៅបលខ #បៅបលើខនងក្ដត
+            EBT របស់អ្នក ប ើមបីបោោះបង់ ឬក៏បៅក្ដន់ក្ដរយាិ ល័ បៅកនុងតំបន់របស់អ្នក
+            ប ើមបីបសនើសុំក្ដតថ្មី។ ប្លើ តបជាអ្កសរ ឈប់ ប ើមបីបញ្ឈប់""",
+            True,
+        ),  # State of Washington Khmer
+        (
+            """DSHS: 귀하의 계정 상에 사기가 일어났을 가능성이 포착되었습니다. 귀하의 EBT 카드 뒷면에있는
+            번호로 전화를 걸어 취소하거나 현지 사무소로 가서 새 것을 발급 받으세요. 중단하려면중단이라고 회신하세요.""",
+            True,
+        ),  # State of WA Korean
+        (
+            """ຂ ຄໍ້ ວາມການສໍ້ໂກງທອາດເປັນໄປໄດ ໍ້ DSHS: ພວກເຮາົໄດສໍ້ງັເກດເຫນັການສໂກງທີ່ອາດເປັນໄປໄດໃໍ້ນບນັຊຂ ອງທີ່ານ.
+            ໂທຫາ # ທ ຢີ່ ດາໍ້ນຫ ງັຂອງບດັ EBT ຂອງທີ່ານເພອຍກົ ເລກ ຫ ໄປຍງັຫອໍ້ງການປະຈາ ທອໍ້ງຖ ນຂອງທີ່ານ ເພີ່ອຂ
+            ບດັ ໃຫມີ່ . ຕອບກບັດວໍ້ ຍ STOP (ຢຸດເຊາົ) ເພອຢຸດເຊາົ""",
+            True,
+        ),  # State of WA Lao
+        (
+            """Fariin Khiyaamo Suurtogal ah DSHS: Waxaanu ka ogaanay khiyaamo suurtogal ah akoonkaaga.
+            Wax # ee ku yaal xaga danbe ee kadadhka
+            EBT si aad u joojisid ama u aadid xafiiska deegaanka uguna dalbatid a new one (mid cusub).
+            Ku jawaab JOOJI si aad u joojisid""",
+            True,
+        ),  # State of WA Somali
+        (
+            "إدارة الخدمات الاجتماعية والصحية في ولاية واشنطن (Washington State Department of Social and Health Services, WA DSHS): ستُجرى المقابلة الهاتفية معك المعنية بمراقبة جودة الطعام يوم xx/xx/xx الساعة 00:00 صباحًا/مساءً. قد يؤدي الفشل إلى إغلاق مخصصاتك. اتصل بالرقم 1-800-473-5661 إذا كانت لديك أسئلة.",  # noqa
+            True,
+        ),  # State of WA Arabic
+        (
+            "WA DSHS: ਤੁਹਾਡੀ ਗੁਣਵੱਤਾ ਨਿਯੰਤਰਣ ਭੋਜਨ ਫ਼ੋਨ ਇੰਟਰਵਿਊ xx/xx/xx 'ਤੇ ਸਵੇਰੇ 00:00 ਵਜੇ/ਸ਼ਾਮ 'ਤੇ ਹੈ। ਅਸਫਲਤਾ ਤੁਹਾਡੇ ਲਾਭਾਂ ਨੂੰ ਬੰਦ ਕਰਨ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੀ ਹੈ। ਸਵਾਲਾਂ ਨਾਲ 1-800-473-5661 'ਤੇ ਕਾਲ ਕਰੋ।",  # noqa
+            True,
+        ),  # State of WA Punjabi
+        (
+            "WA DSHS: ਵਿਅਕਤੀਗਤ ਭੋਜਨ ਵਿੱਚ ਤੁਹਾਡਾ ਗੁਣਵੱਤਾ ਨਿਯੰਤਰਣ ਇੰਟਰਵਿਊ xx/xx/xx 'ਤੇ ਸਵੇਰੇ 00:00 ਵਜੇ /ਸ਼ਾਮ 00:00 ਵਜੇ ਹੈ। ਅਸਫਲਤਾ ਤੁਹਾਡੇ ਲਾਭਾਂ ਨੂੰ ਬੰਦ ਕਰਨ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੀ ਹੈ। 1-800-473-5661 'ਤੇ w/ਸਵਾਲ ਨਾਲ ਕਾਲ ਕਰੋ।",  # noqa
+            True,
+        ),  # State of WA Punjabi
+    ],
+)
+def test_sms_supporting_additional_languages(content, expected):
+    assert SanitiseSMS.is_extended_language(content) is expected
+
+
+@pytest.mark.parametrize(
+    ("content", "expected"),
+    [
+        ("이것은 테스트입니다", set()),  # Korean
+        ("Αυτό είναι ένα τεστ", set()),  # Greek
+        ("Это проверка", set()),  # Russian
+        ("นี่คือการทดสอบ", set()),  # Thai
+        ("இது ஒரு சோதனை", set()),  # Tamil
+        ("これはテストです", set()),  # Japanese
+        ("Đây là một bài kiểm tra", set()),  # Vietnamese
+        ("𐤓𐤓𐤓𐤈𐤆", {"𐤆", "𐤈", "𐤓"}),  # Phoenician
+        ("这是一次测试", set()),  # Mandarin (Simplified)
+        ("Bunda Türkçe karakterler var", set()),  # Turkish
+        ("。、“”()：;？！", set()),  # Chinese punctuation
+        (" ُ ُ", set()),  # Arabic diacritics
+        (
+            "WA DSHS: ਤੁਹਾਡੀ ਗੁਣਵੱਤਾ ਨਿਯੰਤਰਣ ਭੋਜਨ ਫ਼ੋਨ ਇੰਟਰਵਿਊ xx/xx/xx 'ਤੇ ਸਵੇਰੇ 00:00 ਵਜੇ/ਸ਼ਾਮ 'ਤੇ ਹੈ। ਅਸਫਲਤਾ ਤੁਹਾਡੇ ਲਾਭਾਂ ਨੂੰ ਬੰਦ ਕਰਨ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੀ ਹੈ। ਸਵਾਲਾਂ ਨਾਲ 1-800-473-5661 'ਤੇ ਕਾਲ ਕਰੋ।",  # noqa
+            set(),
+        ),  # Punjabi
+        (
+            "WA DSHS: ਵਿਅਕਤੀਗਤ ਭੋਜਨ ਵਿੱਚ ਤੁਹਾਡਾ ਗੁਣਵੱਤਾ ਨਿਯੰਤਰਣ ਇੰਟਰਵਿਊ xx/xx/xx 'ਤੇ ਸਵੇਰੇ 00:00 ਵਜੇ /ਸ਼ਾਮ 00:00 ਵਜੇ ਹੈ। ਅਸਫਲਤਾ ਤੁਹਾਡੇ ਲਾਭਾਂ ਨੂੰ ਬੰਦ ਕਰਨ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੀ ਹੈ। 1-800-473-5661 'ਤੇ w/ਸਵਾਲ ਨਾਲ ਕਾਲ ਕਰੋ।",  # noqa
+            set(),
+        ),  # more Punjabi
+    ],
+)
+def test_get_non_compatible_characters(content, expected):
+    assert SanitiseSMS.get_non_compatible_characters(content) == expected
diff --git a/tests/notifications_utils/test_serialised_model.py b/tests/notifications_utils/test_serialised_model.py
new file mode 100644
index 0000000000..c1344af48c
--- /dev/null
+++ b/tests/notifications_utils/test_serialised_model.py
@@ -0,0 +1,220 @@
+import sys
+
+import pytest
+
+from notifications_utils.serialised_model import (
+    SerialisedModel,
+    SerialisedModelCollection,
+)
+
+
+def test_cant_be_instatiated_with_abstract_properties():
+    class Custom(SerialisedModel):
+        pass
+
+    class CustomCollection(SerialisedModelCollection):
+        pass
+
+    with pytest.raises(TypeError) as e:
+        SerialisedModel()
+
+    if sys.version_info < (3, 9):
+        assert str(e.value) == (
+            "Can't instantiate abstract class SerialisedModel with abstract methods ALLOWED_PROPERTIES"
+        )
+    else:
+        assert "Can't instantiate abstract class SerialisedModel with abstract method ALLOWED_PROPERTIES"
+
+    with pytest.raises(TypeError) as e:
+        Custom()
+
+    if sys.version_info < (3, 9):
+        assert str(e.value) == (
+            "Can't instantiate abstract class Custom with abstract methods ALLOWED_PROPERTIES"
+        )
+    else:
+        assert str(e.value) == (
+            "Can't instantiate abstract class Custom without an implementation for abstract method 'ALLOWED_PROPERTIES'"
+        )
+
+    with pytest.raises(TypeError) as e:
+        SerialisedModelCollection()
+
+    if sys.version_info < (3, 9):
+        assert str(e.value) == (
+            "Can't instantiate abstract class SerialisedModelCollection with abstract methods model"
+        )
+    else:
+        assert str(e.value).startswith(
+            "Can't instantiate abstract class SerialisedModelCollection without an implementation"
+        )
+
+    with pytest.raises(TypeError) as e:
+        CustomCollection()
+
+    if sys.version_info < (3, 9):
+        assert str(e.value) == (
+            "Can't instantiate abstract class CustomCollection with abstract methods model"
+        )
+    else:
+        assert str(e.value) == (
+            "Can't instantiate abstract class CustomCollection without an implementation for abstract method 'model'"
+        )
+
+
+def test_looks_up_from_dict():
+    class Custom(SerialisedModel):
+        ALLOWED_PROPERTIES = {"foo"}
+
+    assert Custom({"foo": "bar"}).foo == "bar"
+
+
+def test_cant_override_custom_property_from_dict():
+    class Custom(SerialisedModel):
+        ALLOWED_PROPERTIES = {"foo"}
+
+        @property
+        def foo(self):
+            return "bar"
+
+    with pytest.raises(AttributeError) as e:
+        assert Custom({"foo": "NOPE"}).foo == "bar"
+    assert (
+        str(e.value)
+        == "property 'foo' of 'test_cant_override_custom_property_from_dict.<locals>.Custom' object has no setter"
+    )
+
+
+@pytest.mark.parametrize(
+    "json_response",
+    [
+        {},
+        {"foo": "bar"},  # Should still raise an exception
+    ],
+)
+def test_model_raises_for_unknown_attributes(json_response):
+    class Custom(SerialisedModel):
+        ALLOWED_PROPERTIES = set()
+
+    model = Custom(json_response)
+
+    assert model.ALLOWED_PROPERTIES == set()
+
+    with pytest.raises(AttributeError) as e:
+        model.foo
+
+    assert str(e.value) == ("'Custom' object has no attribute 'foo'")
+
+
+def test_model_raises_keyerror_if_item_missing_from_dict():
+    class Custom(SerialisedModel):
+        ALLOWED_PROPERTIES = {"foo"}
+
+    with pytest.raises(KeyError) as e:
+        Custom({}).foo
+
+    assert str(e.value) == "'foo'"
+
+
+@pytest.mark.parametrize(
+    "json_response",
+    [
+        {},
+        {"foo": "bar"},  # Should be ignored
+    ],
+)
+def test_model_doesnt_swallow_attribute_errors(json_response):
+    class Custom(SerialisedModel):
+        ALLOWED_PROPERTIES = set()
+
+        @property
+        def foo(self):
+            raise AttributeError("Something has gone wrong")
+
+    with pytest.raises(AttributeError) as e:
+        Custom(json_response).foo
+
+    assert str(e.value) == "Something has gone wrong"
+
+
+def test_dynamic_properties_are_introspectable():
+    class Custom(SerialisedModel):
+        ALLOWED_PROPERTIES = {"foo", "bar", "baz"}
+
+    instance = Custom({"foo": "", "bar": "", "baz": ""})
+
+    assert dir(instance)[-3:] == ["bar", "baz", "foo"]
+
+
+def test_empty_serialised_model_collection():
+    class CustomCollection(SerialisedModelCollection):
+        model = None
+
+    instance = CustomCollection([])
+
+    assert not instance
+    assert len(instance) == 0
+
+
+def test_serialised_model_collection_returns_models_from_list():
+    class Custom(SerialisedModel):
+        ALLOWED_PROPERTIES = {"x"}
+
+    class CustomCollection(SerialisedModelCollection):
+        model = Custom
+
+    instance = CustomCollection(
+        [
+            {"x": "foo"},
+            {"x": "bar"},
+            {"x": "baz"},
+        ]
+    )
+
+    assert instance
+    assert len(instance) == 3
+
+    assert instance[0].x == "foo"
+    assert instance[1].x == "bar"
+    assert instance[2].x == "baz"
+
+    assert [item.x for item in instance] == [
+        "foo",
+        "bar",
+        "baz",
+    ]
+
+    assert [type(item) for item in instance + [1, 2, 3]] == [
+        Custom,
+        Custom,
+        Custom,
+        int,
+        int,
+        int,
+    ]
+
+    instance_2 = CustomCollection(
+        [
+            {"x": "red"},
+            {"x": "green"},
+            {"x": "blue"},
+        ]
+    )
+
+    assert [item.x for item in instance + instance_2] == [
+        "foo",
+        "bar",
+        "baz",
+        "red",
+        "green",
+        "blue",
+    ]
+
+    assert [item.x for item in instance_2 + instance] == [
+        "red",
+        "green",
+        "blue",
+        "foo",
+        "bar",
+        "baz",
+    ]
diff --git a/tests/notifications_utils/test_take.py b/tests/notifications_utils/test_take.py
new file mode 100644
index 0000000000..7ec5218c1a
--- /dev/null
+++ b/tests/notifications_utils/test_take.py
@@ -0,0 +1,19 @@
+from notifications_utils.take import Take
+
+
+def _uppercase(value):
+    return value.upper()
+
+
+def _append(value, to_append):
+    return value + to_append
+
+
+def _prepend_with_service_name(value, service_name=None):
+    return "{}: {}".format(service_name, value)
+
+
+def test_take():
+    assert "Service name: HELLO WORLD!" == Take("hello world").then(_uppercase).then(
+        _append, "!"
+    ).then(_prepend_with_service_name, service_name="Service name")
diff --git a/tests/notifications_utils/test_template_change.py b/tests/notifications_utils/test_template_change.py
new file mode 100644
index 0000000000..12e0f85d3b
--- /dev/null
+++ b/tests/notifications_utils/test_template_change.py
@@ -0,0 +1,135 @@
+import pytest
+
+from notifications_utils.template_change import TemplateChange
+
+from .test_base_template import ConcreteTemplate
+
+
+@pytest.mark.parametrize(
+    ("old_template", "new_template", "should_differ"),
+    [
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            False,
+        ),
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((3)) ((2)) ((1))"}),
+            False,
+        ),
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((1)) ((1)) ((2)) ((2)) ((3)) ((3))"}),
+            False,
+        ),
+        (
+            ConcreteTemplate({"content": "((1))"}),
+            ConcreteTemplate({"content": "((1)) ((2))"}),
+            True,
+        ),
+        (
+            ConcreteTemplate({"content": "((1)) ((2))"}),
+            ConcreteTemplate({"content": "((1))"}),
+            True,
+        ),
+        (
+            ConcreteTemplate({"content": "((a)) ((b))"}),
+            ConcreteTemplate({"content": "((A)) (( B_ ))"}),
+            False,
+        ),
+    ],
+)
+def test_checking_for_difference_between_templates(
+    old_template, new_template, should_differ
+):
+    assert (
+        TemplateChange(old_template, new_template).has_different_placeholders
+        == should_differ
+    )
+
+
+@pytest.mark.parametrize(
+    ("old_template", "new_template", "placeholders_added"),
+    [
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            set(),
+        ),
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((1)) ((1)) ((2)) ((2)) ((3)) ((3))"}),
+            set(),
+        ),
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((1))"}),
+            set(),
+        ),
+        (
+            ConcreteTemplate({"content": "((1))"}),
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            set(["2", "3"]),
+        ),
+        (
+            ConcreteTemplate({"content": "((a))"}),
+            ConcreteTemplate({"content": "((A)) ((B)) ((C))"}),
+            set(["B", "C"]),
+        ),
+    ],
+)
+def test_placeholders_added(old_template, new_template, placeholders_added):
+    assert (
+        TemplateChange(old_template, new_template).placeholders_added
+        == placeholders_added
+    )
+
+
+@pytest.mark.parametrize(
+    ("old_template", "new_template", "placeholders_removed"),
+    [
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            set(),
+        ),
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((1)) ((1)) ((2)) ((2)) ((3)) ((3))"}),
+            set(),
+        ),
+        (
+            ConcreteTemplate({"content": "((1))"}),
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            set(),
+        ),
+        (
+            ConcreteTemplate({"content": "((1)) ((2)) ((3))"}),
+            ConcreteTemplate({"content": "((1))"}),
+            set(["2", "3"]),
+        ),
+        (
+            ConcreteTemplate({"content": "((a)) ((b)) ((c))"}),
+            ConcreteTemplate({"content": "((A))"}),
+            set(["b", "c"]),
+        ),
+    ],
+)
+def test_placeholders_removed(old_template, new_template, placeholders_removed):
+    assert (
+        TemplateChange(old_template, new_template).placeholders_removed
+        == placeholders_removed
+    )
+
+
+def test_ordering_of_placeholders_is_preserved():
+    before = ConcreteTemplate({"content": "((dog)) ((cat)) ((rat))"})
+    after = ConcreteTemplate({"content": "((platypus)) ((echidna)) ((quokka))"})
+    change = TemplateChange(before, after)
+    assert change.placeholders_removed == ["dog", "cat", "rat"] == before.placeholders
+    assert (
+        change.placeholders_added
+        == ["platypus", "echidna", "quokka"]
+        == after.placeholders
+    )
diff --git a/tests/notifications_utils/test_template_types.py b/tests/notifications_utils/test_template_types.py
new file mode 100644
index 0000000000..1b119f2161
--- /dev/null
+++ b/tests/notifications_utils/test_template_types.py
@@ -0,0 +1,3409 @@
+import os
+import sys
+from functools import partial
+from time import process_time
+from unittest import mock
+
+import pytest
+from bs4 import BeautifulSoup
+from freezegun import freeze_time
+from markupsafe import Markup
+from ordered_set import OrderedSet
+
+from notifications_utils.formatters import unlink_govuk_escaped
+from notifications_utils.template import (
+    BaseBroadcastTemplate,
+    BaseEmailTemplate,
+    BaseLetterTemplate,
+    BroadcastMessageTemplate,
+    BroadcastPreviewTemplate,
+    EmailPreviewTemplate,
+    HTMLEmailTemplate,
+    LetterImageTemplate,
+    LetterPreviewTemplate,
+    LetterPrintTemplate,
+    PlainTextEmailTemplate,
+    SMSBodyPreviewTemplate,
+    SMSMessageTemplate,
+    SMSPreviewTemplate,
+    SubjectMixin,
+    Template,
+)
+
+
+@pytest.mark.parametrize(
+    ("template_class", "expected_error"),
+    [
+        pytest.param(
+            Template,
+            ("Can't instantiate abstract class Template with abstract method __str__"),
+            marks=pytest.mark.skipif(
+                sys.version_info >= (3, 9), reason="‘methods’ will be singular"
+            ),
+        ),
+        pytest.param(
+            Template,
+            (
+                "Can't instantiate abstract class Template without an implementation for abstract method '__str__'"
+            ),
+            marks=pytest.mark.skipif(
+                sys.version_info < (3, 9), reason="‘method’ will be pluralised"
+            ),
+        ),
+        pytest.param(
+            BaseEmailTemplate,
+            (
+                "Can't instantiate abstract class BaseEmailTemplate with abstract methods __str__"
+            ),
+            marks=pytest.mark.skipif(
+                sys.version_info >= (3, 9), reason="‘methods’ will be singular"
+            ),
+        ),
+        pytest.param(
+            BaseEmailTemplate,
+            (
+                "Can't instantiate abstract class BaseEmailTemplate without an implementation for abstract method"
+            ),
+            marks=pytest.mark.skipif(
+                sys.version_info < (3, 9), reason="‘method’ will be pluralised"
+            ),
+        ),
+        pytest.param(
+            BaseLetterTemplate,
+            (
+                "Can't instantiate abstract class BaseLetterTemplate with abstract methods __str__"
+            ),
+            marks=pytest.mark.skipif(
+                sys.version_info >= (3, 9), reason="‘methods’ will be singular"
+            ),
+        ),
+        pytest.param(
+            BaseLetterTemplate,
+            (
+                "Can't instantiate abstract class BaseLetterTemplate without an implementation for abstract method"
+            ),
+            marks=pytest.mark.skipif(
+                sys.version_info < (3, 9), reason="‘method’ will be pluralised"
+            ),
+        ),
+        pytest.param(
+            BaseBroadcastTemplate,
+            (
+                "Can't instantiate abstract class BaseBroadcastTemplate with abstract methods __str__"
+            ),
+            marks=pytest.mark.skipif(
+                sys.version_info >= (3, 9), reason="‘methods’ will be singular"
+            ),
+        ),
+        pytest.param(
+            BaseBroadcastTemplate,
+            (
+                "Can't instantiate abstract class BaseBroadcastTemplate without an implementation for abstract method"
+            ),
+            marks=pytest.mark.skipif(
+                sys.version_info < (3, 9), reason="‘method’ will be pluralised"
+            ),
+        ),
+    ],
+)
+def test_abstract_classes_cant_be_instantiated(template_class, expected_error):
+    with pytest.raises(TypeError) as error:
+        template_class({})
+    # assert str(error.value) == expected_error
+    assert expected_error in str(error.value)
+
+
+@pytest.mark.parametrize(
+    ("template_class", "expected_error"),
+    [
+        (
+            HTMLEmailTemplate,
+            ("Cannot initialise HTMLEmailTemplate with sms template_type"),
+        ),
+        (
+            LetterPreviewTemplate,
+            ("Cannot initialise LetterPreviewTemplate with sms template_type"),
+        ),
+        (
+            BroadcastPreviewTemplate,
+            ("Cannot initialise BroadcastPreviewTemplate with sms template_type"),
+        ),
+    ],
+)
+def test_errors_for_incompatible_template_type(template_class, expected_error):
+    with pytest.raises(TypeError) as error:
+        template_class({"content": "", "subject": "", "template_type": "sms"})
+    assert str(error.value) == expected_error
+
+
+def test_html_email_inserts_body():
+    assert "the &lt;em&gt;quick&lt;/em&gt; brown fox" in str(
+        HTMLEmailTemplate(
+            {
+                "content": "the <em>quick</em> brown fox",
+                "subject": "",
+                "template_type": "email",
+            }
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    "content", ["DOCTYPE", "html", "body", "beta.notify.gov", "hello world"]
+)
+def test_default_template(content):
+    assert content in str(
+        HTMLEmailTemplate(
+            {
+                "content": "hello world",
+                "subject": "",
+                "template_type": "email",
+            }
+        )
+    )
+
+
+@pytest.mark.parametrize("show_banner", [True, False])
+def test_govuk_banner(show_banner):
+    email = HTMLEmailTemplate(
+        {
+            "content": "hello world",
+            "subject": "",
+            "template_type": "email",
+        }
+    )
+    email.govuk_banner = show_banner
+    if show_banner:
+        assert "beta.notify.gov" in str(email)
+    else:
+        assert "beta.notify.gov" not in str(email)
+
+
+def test_brand_banner_shows():
+    email = str(
+        HTMLEmailTemplate(
+            {"content": "hello world", "subject": "", "template_type": "email"},
+            brand_banner=True,
+            govuk_banner=False,
+        )
+    )
+    assert ('<td width="10" height="10" valign="middle"></td>') not in email
+    assert (
+        'role="presentation" width="100%" style="border-collapse: collapse;min-width: 100%;width: 100% !important;"'
+    ) in email
+
+
+@pytest.mark.parametrize(
+    ("brand_logo", "brand_text", "brand_colour"),
+    [
+        ("http://example.com/image.png", "Example", "red"),
+        ("http://example.com/image.png", "Example", "#f00"),
+        ("http://example.com/image.png", "Example", None),
+        ("http://example.com/image.png", "", "#f00"),
+        (None, "Example", "#f00"),
+    ],
+)
+def test_brand_data_shows(brand_logo, brand_text, brand_colour):
+    email = str(
+        HTMLEmailTemplate(
+            {"content": "hello world", "subject": "", "template_type": "email"},
+            brand_banner=True,
+            govuk_banner=False,
+            brand_logo=brand_logo,
+            brand_text=brand_text,
+            brand_colour=brand_colour,
+        )
+    )
+
+    assert "GOV.UK" not in email
+    if brand_logo:
+        assert brand_logo in email
+    if brand_text:
+        assert brand_text in email
+    if brand_colour:
+        assert 'bgcolor="{}"'.format(brand_colour) in email
+
+
+def test_alt_text_with_brand_text_and_govuk_banner_shown():
+    email = str(
+        HTMLEmailTemplate(
+            {"content": "hello world", "subject": "", "template_type": "email"},
+            govuk_banner=True,
+            brand_logo="http://example.com/image.png",
+            brand_text="Example",
+            brand_banner=True,
+            brand_name="Notify Logo",
+        )
+    )
+    assert 'alt=""' in email
+    assert 'alt="Notify Logo"' not in email
+
+
+def test_alt_text_with_no_brand_text_and_govuk_banner_shown():
+    email = str(
+        HTMLEmailTemplate(
+            {"content": "hello world", "subject": "", "template_type": "email"},
+            govuk_banner=True,
+            brand_logo="http://example.com/image.png",
+            brand_text=None,
+            brand_banner=True,
+            brand_name="Notify Logo",
+        )
+    )
+    assert 'alt=""' not in email
+    assert 'alt="Notify Logo"' in email
+
+
+@pytest.mark.parametrize(
+    ("brand_banner", "brand_text", "expected_alt_text"),
+    [
+        (True, None, 'alt="Notify Logo"'),
+        (True, "Example", 'alt=""'),
+        (False, "Example", 'alt=""'),
+        (False, None, 'alt="Notify Logo"'),
+    ],
+)
+def test_alt_text_with_no_govuk_banner(brand_banner, brand_text, expected_alt_text):
+    email = str(
+        HTMLEmailTemplate(
+            {"content": "hello world", "subject": "", "template_type": "email"},
+            govuk_banner=False,
+            brand_logo="http://example.com/image.png",
+            brand_text=brand_text,
+            brand_banner=brand_banner,
+            brand_name="Notify Logo",
+        )
+    )
+
+    assert expected_alt_text in email
+
+
+@pytest.mark.parametrize("complete_html", [True, False])
+@pytest.mark.parametrize(
+    ("branding_should_be_present", "brand_logo", "brand_text", "brand_colour"),
+    [
+        (True, "http://example.com/image.png", "Example", "#f00"),
+        (True, "http://example.com/image.png", "Example", None),
+        (True, "http://example.com/image.png", "", None),
+        (False, None, "Example", "#f00"),
+        (False, "http://example.com/image.png", None, "#f00"),
+    ],
+)
+@pytest.mark.parametrize("content", ["DOCTYPE", "html", "body"])
+def test_complete_html(
+    complete_html,
+    branding_should_be_present,
+    brand_logo,
+    brand_text,
+    brand_colour,
+    content,
+):
+    email = str(
+        HTMLEmailTemplate(
+            {"content": "hello world", "subject": "", "template_type": "email"},
+            complete_html=complete_html,
+            brand_logo=brand_logo,
+            brand_text=brand_text,
+            brand_colour=brand_colour,
+        )
+    )
+
+    if complete_html:
+        assert content in email
+    else:
+        assert content not in email
+
+    if branding_should_be_present:
+        assert brand_logo in email
+        assert brand_text in email
+
+        if brand_colour:
+            assert brand_colour in email
+            assert "##" not in email
+
+
+def test_subject_is_page_title():
+    email = BeautifulSoup(
+        str(
+            HTMLEmailTemplate(
+                {
+                    "content": "",
+                    "subject": "this is the subject",
+                    "template_type": "email",
+                },
+            )
+        ),
+        features="html.parser",
+    )
+    assert email.select_one("title").text == "this is the subject"
+
+
+def test_preheader_is_at_start_of_html_emails():
+    assert (
+        '<body style="font-family: Helvetica, Arial, sans-serif;font-size: 16px;margin: 0;color:#0b0c0c;">\n'
+        "\n"
+        '<span style="display: none;font-size: 1px;color: #fff; max-height: 0;">content…</span>'
+    ) in str(
+        HTMLEmailTemplate(
+            {"content": "content", "subject": "subject", "template_type": "email"}
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    ("content", "values", "expected_preheader"),
+    [
+        (
+            (
+                "Hello (( name ))\n"
+                "\n"
+                '# This - is a "heading"\n'
+                "\n"
+                "My favourite websites' URLs are:\n"
+                "- GOV.UK\n"
+                "- https://www.example.com\n"
+            ),
+            {"name": "Jo"},
+            "Hello Jo This – is a “heading” My favourite websites’ URLs are: • GOV.​UK • https://www.example.com",
+        ),
+        (
+            ("[Markdown link](https://www.example.com)\n"),
+            {},
+            "Markdown link",
+        ),
+        (
+            """
+            Lorem Ipsum is simply dummy text of the printing and
+            typesetting industry.
+
+            Lorem Ipsum has been the industry’s standard dummy text
+            ever since the 1500s, when an unknown printer took a galley
+            of type and scrambled it to make a type specimen book.
+
+            Lorem Ipsum is simply dummy text of the printing and
+            typesetting industry.
+
+            Lorem Ipsum has been the industry’s standard dummy text
+            ever since the 1500s, when an unknown printer took a galley
+            of type and scrambled it to make a type specimen book.
+        """,
+            {},
+            (
+                "Lorem Ipsum is simply dummy text of the printing and "
+                "typesetting industry. Lorem Ipsum has been the industry’s "
+                "standard dummy text ever since the 1500s, when an unknown "
+                "printer took a galley of type and scrambled it to make a "
+                "type specimen book. Lorem Ipsu"
+            ),
+        ),
+        (
+            "short email",
+            {},
+            "short email",
+        ),
+    ],
+)
+@mock.patch(
+    "notifications_utils.template.HTMLEmailTemplate.jinja_template.render",
+    return_value="mocked",
+)
+def test_content_of_preheader_in_html_emails(
+    mock_jinja_template,
+    content,
+    values,
+    expected_preheader,
+):
+    assert (
+        str(
+            HTMLEmailTemplate(
+                {"content": content, "subject": "subject", "template_type": "email"},
+                values,
+            )
+        )
+        == "mocked"
+    )
+    assert mock_jinja_template.call_args[0][0]["preheader"] == expected_preheader
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "extra_args", "result", "markdown_renderer"),
+    [
+        (
+            HTMLEmailTemplate,
+            "email",
+            {},
+            ("the quick brown fox\n" "\n" "jumped over the lazy dog\n"),
+            "notifications_utils.template.notify_email_markdown",
+        ),
+        (
+            LetterPreviewTemplate,
+            "letter",
+            {},
+            ("the quick brown fox\n" "\n" "jumped over the lazy dog\n"),
+            "notifications_utils.template.notify_letter_preview_markdown",
+        ),
+    ],
+)
+def test_markdown_in_templates(
+    template_class,
+    template_type,
+    extra_args,
+    result,
+    markdown_renderer,
+):
+    with mock.patch(markdown_renderer, return_value="") as mock_markdown_renderer:
+        str(
+            template_class(
+                {
+                    "content": (
+                        "the quick ((colour)) ((animal))\n"
+                        "\n"
+                        "jumped over the lazy dog"
+                    ),
+                    "subject": "animal story",
+                    "template_type": template_type,
+                },
+                {"animal": "fox", "colour": "brown"},
+                **extra_args,
+            )
+        )
+    mock_markdown_renderer.assert_called_once_with(result)
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "extra_attributes"),
+    [
+        (HTMLEmailTemplate, "email", 'style="word-wrap: break-word; color: #1D70B8;"'),
+        (
+            EmailPreviewTemplate,
+            "email",
+            'style="word-wrap: break-word; color: #1D70B8;"',
+        ),
+        (SMSPreviewTemplate, "sms", 'class="govuk-link govuk-link--no-visited-state"'),
+        (
+            BroadcastPreviewTemplate,
+            "broadcast",
+            'class="govuk-link govuk-link--no-visited-state"',
+        ),
+        pytest.param(
+            SMSBodyPreviewTemplate,
+            "sms",
+            'style="word-wrap: break-word;',
+            marks=pytest.mark.xfail,
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("url", "url_with_entities_replaced"),
+    [
+        ("http://example.com", "http://example.com"),
+        ("http://www.gov.uk/", "http://www.gov.uk/"),
+        ("https://www.gov.uk/", "https://www.gov.uk/"),
+        ("http://service.gov.uk", "http://service.gov.uk"),
+        (
+            "http://service.gov.uk/blah.ext?q=a%20b%20c&order=desc#fragment",
+            "http://service.gov.uk/blah.ext?q=a%20b%20c&amp;order=desc#fragment",
+        ),
+        pytest.param("example.com", "example.com", marks=pytest.mark.xfail),
+        pytest.param("www.example.com", "www.example.com", marks=pytest.mark.xfail),
+        pytest.param(
+            "http://service.gov.uk/blah.ext?q=one two three",
+            "http://service.gov.uk/blah.ext?q=one two three",
+            marks=pytest.mark.xfail,
+        ),
+        pytest.param("ftp://example.com", "ftp://example.com", marks=pytest.mark.xfail),
+        pytest.param(
+            "mailto:test@example.com",
+            "mailto:test@example.com",
+            marks=pytest.mark.xfail,
+        ),
+    ],
+)
+def test_makes_links_out_of_URLs(
+    extra_attributes, template_class, template_type, url, url_with_entities_replaced
+):
+    assert '<a {} href="{}">{}</a>'.format(
+        extra_attributes, url_with_entities_replaced, url_with_entities_replaced
+    ) in str(
+        template_class({"content": url, "subject": "", "template_type": template_type})
+    )
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type"),
+    [
+        (SMSPreviewTemplate, "sms"),
+        (BroadcastPreviewTemplate, "broadcast"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("url", "url_with_entities_replaced"),
+    [
+        ("example.com", "example.com"),
+        ("www.gov.uk/", "www.gov.uk/"),
+        ("service.gov.uk", "service.gov.uk"),
+        ("gov.uk/coronavirus", "gov.uk/coronavirus"),
+        (
+            "service.gov.uk/blah.ext?q=a%20b%20c&order=desc#fragment",
+            "service.gov.uk/blah.ext?q=a%20b%20c&amp;order=desc#fragment",
+        ),
+    ],
+)
+def test_makes_links_out_of_URLs_without_protocol_in_sms_and_broadcast(
+    template_class,
+    template_type,
+    url,
+    url_with_entities_replaced,
+):
+    assert (
+        f"<a "
+        f'class="govuk-link govuk-link--no-visited-state" '
+        f'href="http://{url_with_entities_replaced}">'
+        f"{url_with_entities_replaced}"
+        f"</a>"
+    ) in str(
+        template_class({"content": url, "subject": "", "template_type": template_type})
+    )
+
+
+@pytest.mark.parametrize(
+    ("content", "html_snippet"),
+    [
+        (
+            (
+                "You've been invited to a service. Click this link:\n"
+                "https://service.example.com/accept_invite/a1b2c3d4\n"
+                "\n"
+                "Thanks\n"
+            ),
+            (
+                '<a style="word-wrap: break-word; color: #1D70B8;"'
+                ' href="https://service.example.com/accept_invite/a1b2c3d4">'
+                "https://service.example.com/accept_invite/a1b2c3d4"
+                "</a>"
+            ),
+        ),
+        (
+            ("https://service.example.com/accept_invite/?a=b&c=d&"),
+            (
+                '<a style="word-wrap: break-word; color: #1D70B8;"'
+                ' href="https://service.example.com/accept_invite/?a=b&amp;c=d&amp;">'
+                "https://service.example.com/accept_invite/?a=b&amp;c=d&amp;"
+                "</a>"
+            ),
+        ),
+    ],
+)
+def test_HTML_template_has_URLs_replaced_with_links(content, html_snippet):
+    assert html_snippet in str(
+        HTMLEmailTemplate({"content": content, "subject": "", "template_type": "email"})
+    )
+
+
+@pytest.mark.parametrize(
+    ("template_content", "expected"),
+    [
+        ("gov.uk", "gov.\u200Buk"),
+        ("GOV.UK", "GOV.\u200BUK"),
+        ("Gov.uk", "Gov.\u200Buk"),
+        ("https://gov.uk", "https://gov.uk"),
+        ("https://www.gov.uk", "https://www.gov.uk"),
+        ("www.gov.uk", "www.gov.uk"),
+        ("gov.uk/register-to-vote", "gov.uk/register-to-vote"),
+        ("gov.uk?q=", "gov.uk?q="),
+    ],
+)
+def test_escaping_govuk_in_email_templates(template_content, expected):
+    assert unlink_govuk_escaped(template_content) == expected
+    assert expected in str(
+        PlainTextEmailTemplate(
+            {
+                "content": template_content,
+                "subject": "",
+                "template_type": "email",
+            }
+        )
+    )
+    assert expected in str(
+        HTMLEmailTemplate(
+            {
+                "content": template_content,
+                "subject": "",
+                "template_type": "email",
+            }
+        )
+    )
+
+
+def test_stripping_of_unsupported_characters_in_email_templates():
+    template_content = "line one\u2028line two"
+    expected = "line oneline two"
+    assert expected in str(
+        PlainTextEmailTemplate(
+            {
+                "content": template_content,
+                "subject": "",
+                "template_type": "email",
+            }
+        )
+    )
+    assert expected in str(
+        HTMLEmailTemplate(
+            {
+                "content": template_content,
+                "subject": "",
+                "template_type": "email",
+            }
+        )
+    )
+
+
+@mock.patch("notifications_utils.template.add_prefix", return_value="")
+@pytest.mark.parametrize(
+    ("template_class", "prefix", "body", "expected_call"),
+    [
+        (SMSMessageTemplate, "a", "b", (Markup("b"), "a")),
+        (SMSPreviewTemplate, "a", "b", (Markup("b"), "a")),
+        (BroadcastPreviewTemplate, "a", "b", (Markup("b"), "a")),
+        (SMSMessageTemplate, None, "b", (Markup("b"), None)),
+        (SMSPreviewTemplate, None, "b", (Markup("b"), None)),
+        (BroadcastPreviewTemplate, None, "b", (Markup("b"), None)),
+        (SMSMessageTemplate, "<em>ht&ml</em>", "b", (Markup("b"), "<em>ht&ml</em>")),
+        (
+            SMSPreviewTemplate,
+            "<em>ht&ml</em>",
+            "b",
+            (Markup("b"), "&lt;em&gt;ht&amp;ml&lt;/em&gt;"),
+        ),
+        (
+            BroadcastPreviewTemplate,
+            "<em>ht&ml</em>",
+            "b",
+            (Markup("b"), "&lt;em&gt;ht&amp;ml&lt;/em&gt;"),
+        ),
+    ],
+)
+def test_sms_message_adds_prefix(
+    add_prefix, template_class, prefix, body, expected_call
+):
+    template = template_class(
+        {"content": body, "template_type": template_class.template_type}
+    )
+    template.prefix = prefix
+    template.sender = None
+    str(template)
+    add_prefix.assert_called_once_with(*expected_call)
+
+
+@mock.patch("notifications_utils.template.add_prefix", return_value="")
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSMessageTemplate,
+        SMSPreviewTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    ("show_prefix", "prefix", "body", "sender", "expected_call"),
+    [
+        (False, "a", "b", "c", (Markup("b"), None)),
+        (True, "a", "b", None, (Markup("b"), "a")),
+        (True, "a", "b", False, (Markup("b"), "a")),
+    ],
+)
+def test_sms_message_adds_prefix_only_if_asked_to(
+    add_prefix,
+    show_prefix,
+    prefix,
+    body,
+    sender,
+    expected_call,
+    template_class,
+):
+    template = template_class(
+        {"content": body, "template_type": template_class.template_type},
+        prefix=prefix,
+        show_prefix=show_prefix,
+        sender=sender,
+    )
+    str(template)
+    add_prefix.assert_called_once_with(*expected_call)
+
+
+@pytest.mark.parametrize("content_to_look_for", ["GOVUK", "sms-message-sender"])
+@pytest.mark.parametrize(
+    "show_sender",
+    [
+        True,
+        pytest.param(False, marks=pytest.mark.xfail),
+    ],
+)
+def test_sms_message_preview_shows_sender(
+    show_sender,
+    content_to_look_for,
+):
+    assert content_to_look_for in str(
+        SMSPreviewTemplate(
+            {"content": "foo", "template_type": "sms"},
+            sender="GOVUK",
+            show_sender=show_sender,
+        )
+    )
+
+
+def test_sms_message_preview_hides_sender_by_default():
+    assert (
+        SMSPreviewTemplate({"content": "foo", "template_type": "sms"}).show_sender
+        is False
+    )
+
+
+@mock.patch("notifications_utils.template.sms_encode", return_value="downgraded")
+@pytest.mark.parametrize(
+    ("template_class", "extra_args", "expected_call"),
+    [
+        (SMSMessageTemplate, {"prefix": "Service name"}, "Service name: Message"),
+        (SMSPreviewTemplate, {"prefix": "Service name"}, "Service name: Message"),
+        (BroadcastMessageTemplate, {}, "Message"),
+        (BroadcastPreviewTemplate, {"prefix": "Service name"}, "Service name: Message"),
+        (SMSBodyPreviewTemplate, {}, "Message"),
+    ],
+)
+def test_sms_messages_downgrade_non_sms(
+    mock_sms_encode,
+    template_class,
+    extra_args,
+    expected_call,
+):
+    template = str(
+        template_class(
+            {"content": "Message", "template_type": template_class.template_type},
+            **extra_args,
+        )
+    )
+    assert "downgraded" in str(template)
+    mock_sms_encode.assert_called_once_with(expected_call)
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSPreviewTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@mock.patch("notifications_utils.template.sms_encode", return_value="downgraded")
+def test_sms_messages_dont_downgrade_non_sms_if_setting_is_false(
+    mock_sms_encode, template_class
+):
+    template = str(
+        template_class(
+            {"content": "😎", "template_type": template_class.template_type},
+            prefix="👉",
+            downgrade_non_sms_characters=False,
+        )
+    )
+    assert "👉: 😎" in str(template)
+    assert mock_sms_encode.called is False
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSPreviewTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@mock.patch("notifications_utils.template.nl2br")
+def test_sms_preview_adds_newlines(nl2br, template_class):
+    content = "the\nquick\n\nbrown fox"
+    str(
+        template_class(
+            {"content": content, "template_type": template_class.template_type}
+        )
+    )
+    nl2br.assert_called_once_with(content)
+
+
+@pytest.mark.parametrize(
+    "content",
+    [
+        ("one newline\n" "two newlines\n" "\n" "end"),  # Unix-style
+        ("one newline\r\n" "two newlines\r\n" "\r\n" "end"),  # Windows-style
+        ("one newline\r" "two newlines\r" "\r" "end"),  # Mac Classic style
+        (  # A mess
+            "\t\t\n\r one newline\n" "two newlines\r" "\r\n" "end\n\n  \r \n \t "
+        ),
+    ],
+)
+def test_sms_message_normalises_newlines(content):
+    assert repr(
+        str(SMSMessageTemplate({"content": content, "template_type": "sms"}))
+    ) == repr("one newline\n" "two newlines\n" "\n" "end")
+
+
+@pytest.mark.parametrize(
+    "content",
+    [
+        ("one newline\n" "two newlines\n" "\n" "end"),  # Unix-style
+        ("one newline\r\n" "two newlines\r\n" "\r\n" "end"),  # Windows-style
+        ("one newline\r" "two newlines\r" "\r" "end"),  # Mac Classic style
+        (  # A mess
+            "\t\t\n\r one newline\xa0\n" "two newlines\r" "\r\n" "end\n\n  \r \n \t "
+        ),
+    ],
+)
+def test_broadcast_message_normalises_newlines(content):
+    assert str(
+        BroadcastMessageTemplate({"content": content, "template_type": "broadcast"})
+    ) == ("one newline\n" "two newlines\n" "\n" "end")
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSMessageTemplate,
+        SMSBodyPreviewTemplate,
+        BroadcastMessageTemplate,
+        # Note: SMSPreviewTemplate and BroadcastPreviewTemplate not tested here
+        # as both will render full HTML template, not just the body
+    ],
+)
+def test_phone_templates_normalise_whitespace(template_class):
+    content = "  Hi\u00A0there\u00A0 what's\u200D up\t"
+    assert (
+        str(
+            template_class(
+                {"content": content, "template_type": template_class.template_type}
+            )
+        )
+        == "Hi there what's up"
+    )
+
+
+@freeze_time("2012-12-12 12:12:12")
+@mock.patch("notifications_utils.template.LetterPreviewTemplate.jinja_template.render")
+@mock.patch("notifications_utils.template.unlink_govuk_escaped")
+@mock.patch(
+    "notifications_utils.template.notify_letter_preview_markdown", return_value="Bar"
+)
+@pytest.mark.parametrize(
+    ("values", "expected_address"),
+    [
+        (
+            {},
+            [
+                "<span class='placeholder-no-brackets'>address line 1</span>",
+                "<span class='placeholder-no-brackets'>address line 2</span>",
+                "<span class='placeholder-no-brackets'>address line 3</span>",
+                "<span class='placeholder-no-brackets'>address line 4</span>",
+                "<span class='placeholder-no-brackets'>address line 5</span>",
+                "<span class='placeholder-no-brackets'>address line 6</span>",
+                "<span class='placeholder-no-brackets'>address line 7</span>",
+            ],
+        ),
+        (
+            {
+                "address line 1": "123 Fake Street",
+                "address line 6": "United Kingdom",
+            },
+            [
+                "123 Fake Street",
+                "<span class='placeholder-no-brackets'>address line 2</span>",
+                "<span class='placeholder-no-brackets'>address line 3</span>",
+                "<span class='placeholder-no-brackets'>address line 4</span>",
+                "<span class='placeholder-no-brackets'>address line 5</span>",
+                "United Kingdom",
+                "<span class='placeholder-no-brackets'>address line 7</span>",
+            ],
+        ),
+        (
+            {
+                "address line 1": "123 Fake Street",
+                "address line 2": "City of Town",
+                "postcode": "SW1A 1AA",
+            },
+            [
+                "123 Fake Street",
+                "City of Town",
+                "SW1A 1AA",
+            ],
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("contact_block", "expected_rendered_contact_block"),
+    [
+        (None, ""),
+        ("", ""),
+        (
+            """
+            The Pension Service
+            Mail Handling Site A
+            Wolverhampton  WV9 1LU
+
+            Telephone: 0845 300 0168
+            Email: fpc.customercare@dwp.gsi.gov.uk
+            Monday - Friday  8am - 6pm
+            www.gov.uk
+        """,
+            (
+                "The Pension Service<br>"
+                "Mail Handling Site A<br>"
+                "Wolverhampton  WV9 1LU<br>"
+                "<br>"
+                "Telephone: 0845 300 0168<br>"
+                "Email: fpc.customercare@dwp.gsi.gov.uk<br>"
+                "Monday - Friday  8am - 6pm<br>"
+                "www.gov.uk"
+            ),
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("extra_args", "expected_logo_file_name", "expected_logo_class"),
+    [
+        ({}, None, None),
+        ({"logo_file_name": "example.foo"}, "example.foo", "foo"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("additional_extra_args", "expected_date"),
+    [
+        ({}, "12 December 2012"),
+        ({"date": None}, "12 December 2012"),
+        # ({'date': datetime.date.fromtimestamp(0)}, '1 January 1970'),
+    ],
+)
+def test_letter_preview_renderer(
+    letter_markdown,
+    unlink_govuk,
+    jinja_template,
+    values,
+    expected_address,
+    contact_block,
+    expected_rendered_contact_block,
+    extra_args,
+    expected_logo_file_name,
+    expected_logo_class,
+    additional_extra_args,
+    expected_date,
+):
+    extra_args.update(additional_extra_args)
+    str(
+        LetterPreviewTemplate(
+            {"content": "Foo", "subject": "Subject", "template_type": "letter"},
+            values,
+            contact_block=contact_block,
+            **extra_args,
+        )
+    )
+    jinja_template.assert_called_once_with(
+        {
+            "address": expected_address,
+            "subject": "Subject",
+            "message": "Bar",
+            "date": expected_date,
+            "contact_block": expected_rendered_contact_block,
+            "admin_base_url": "http://localhost:6012",
+            "logo_file_name": expected_logo_file_name,
+            "logo_class": expected_logo_class,
+        }
+    )
+    letter_markdown.assert_called_once_with(Markup("Foo\n"))
+    unlink_govuk.assert_not_called()
+
+
+@freeze_time("2001-01-01 12:00:00.000000")
+@mock.patch("notifications_utils.template.LetterPreviewTemplate.jinja_template.render")
+def test_letter_preview_renderer_without_mocks(jinja_template):
+    str(
+        LetterPreviewTemplate(
+            {"content": "Foo", "subject": "Subject", "template_type": "letter"},
+            {"addressline1": "name", "addressline2": "street", "postcode": "SW1 1AA"},
+            contact_block="",
+        )
+    )
+
+    jinja_template_locals = jinja_template.call_args_list[0][0][0]
+
+    assert jinja_template_locals["address"] == [
+        "name",
+        "street",
+        "SW1 1AA",
+    ]
+    assert jinja_template_locals["subject"] == "Subject"
+    assert jinja_template_locals["message"] == "<p>Foo</p>"
+    assert jinja_template_locals["date"] == "1 January 2001"
+    assert jinja_template_locals["contact_block"] == ""
+    assert jinja_template_locals["admin_base_url"] == "http://localhost:6012"
+    assert jinja_template_locals["logo_file_name"] is None
+
+
+@freeze_time("2012-12-12 12:12:12")
+@mock.patch("notifications_utils.template.LetterImageTemplate.jinja_template.render")
+@pytest.mark.parametrize(
+    ("page_count", "expected_oversized", "expected_page_numbers"),
+    [
+        (
+            1,
+            False,
+            [1],
+        ),
+        (
+            5,
+            False,
+            [1, 2, 3, 4, 5],
+        ),
+        (
+            10,
+            False,
+            [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+        ),
+        (
+            11,
+            True,
+            [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+        ),
+        (
+            99,
+            True,
+            [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    (
+        "postage_args",
+        "expected_show_postage",
+        "expected_postage_class_value",
+        "expected_postage_description",
+    ),
+    [
+        pytest.param({}, False, None, None),
+        pytest.param({"postage": None}, False, None, None),
+        pytest.param({"postage": "first"}, True, "letter-postage-first", "first class"),
+        pytest.param(
+            {"postage": "second"}, True, "letter-postage-second", "second class"
+        ),
+        pytest.param(
+            {"postage": "europe"}, True, "letter-postage-international", "international"
+        ),
+        pytest.param(
+            {"postage": "rest-of-world"},
+            True,
+            "letter-postage-international",
+            "international",
+        ),
+        pytest.param(
+            {"postage": "third"},
+            True,
+            "letter-postage-third",
+            "third class",
+            marks=pytest.mark.xfail(raises=TypeError),
+        ),
+    ],
+)
+def test_letter_image_renderer(
+    jinja_template,
+    page_count,
+    expected_page_numbers,
+    expected_oversized,
+    postage_args,
+    expected_show_postage,
+    expected_postage_class_value,
+    expected_postage_description,
+):
+    str(
+        LetterImageTemplate(
+            {"content": "Content", "subject": "Subject", "template_type": "letter"},
+            image_url="http://example.com/endpoint.png",
+            page_count=page_count,
+            contact_block="10 Downing Street",
+            **postage_args,
+        )
+    )
+    jinja_template.assert_called_once_with(
+        {
+            "image_url": "http://example.com/endpoint.png",
+            "page_numbers": expected_page_numbers,
+            "address": [
+                "<span class='placeholder-no-brackets'>address line 1</span>",
+                "<span class='placeholder-no-brackets'>address line 2</span>",
+                "<span class='placeholder-no-brackets'>address line 3</span>",
+                "<span class='placeholder-no-brackets'>address line 4</span>",
+                "<span class='placeholder-no-brackets'>address line 5</span>",
+                "<span class='placeholder-no-brackets'>address line 6</span>",
+                "<span class='placeholder-no-brackets'>address line 7</span>",
+            ],
+            "contact_block": "10 Downing Street",
+            "date": "12 December 2012",
+            "subject": "Subject",
+            "message": "<p>Content</p>",
+            "show_postage": expected_show_postage,
+            "postage_class_value": expected_postage_class_value,
+            "postage_description": expected_postage_description,
+        }
+    )
+
+
+@freeze_time("2012-12-12 12:12:12")
+@mock.patch("notifications_utils.template.LetterImageTemplate.jinja_template.render")
+@pytest.mark.parametrize(
+    "postage_argument",
+    [
+        None,
+        "first",
+        "second",
+        "europe",
+        "rest-of-world",
+    ],
+)
+def test_letter_image_renderer_shows_international_post(
+    jinja_template,
+    postage_argument,
+):
+    str(
+        LetterImageTemplate(
+            {"content": "Content", "subject": "Subject", "template_type": "letter"},
+            {
+                "address line 1": "123 Example Street",
+                "address line 2": "Lima",
+                "address line 3": "Peru",
+            },
+            image_url="http://example.com/endpoint.png",
+            page_count=1,
+            postage=postage_argument,
+        )
+    )
+    assert jinja_template.call_args_list[0][0][0]["postage_description"] == (
+        "international"
+    )
+
+
+def test_letter_image_template_renders_visually_hidden_address():
+    template = BeautifulSoup(
+        str(
+            LetterImageTemplate(
+                {"content": "", "subject": "", "template_type": "letter"},
+                {
+                    "address_line_1": "line 1",
+                    "address_line_2": "line 2",
+                    "postcode": "postcode",
+                },
+                image_url="http://example.com/endpoint.png",
+                page_count=1,
+            )
+        ),
+        features="html.parser",
+    )
+    assert str(template.select_one(".govuk-visually-hidden ul")) == (
+        "<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>postcode</li>" "</ul>"
+    )
+
+
+@pytest.mark.parametrize(
+    "page_image_url",
+    [
+        pytest.param("http://example.com/endpoint.png?page=0", marks=pytest.mark.xfail),
+        "http://example.com/endpoint.png?page=1",
+        "http://example.com/endpoint.png?page=2",
+        "http://example.com/endpoint.png?page=3",
+        pytest.param("http://example.com/endpoint.png?page=4", marks=pytest.mark.xfail),
+    ],
+)
+def test_letter_image_renderer_pagination(page_image_url):
+    assert page_image_url in str(
+        LetterImageTemplate(
+            {"content": "", "subject": "", "template_type": "letter"},
+            image_url="http://example.com/endpoint.png",
+            page_count=3,
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    ("partial_call", "expected_exception", "expected_message"),
+    [
+        (
+            partial(LetterImageTemplate),
+            TypeError,
+            "image_url is required",
+        ),
+        (
+            partial(LetterImageTemplate, page_count=1),
+            TypeError,
+            "image_url is required",
+        ),
+        (
+            partial(LetterImageTemplate, image_url="foo"),
+            TypeError,
+            "page_count is required",
+        ),
+        (
+            partial(LetterImageTemplate, image_url="foo", page_count="foo"),
+            ValueError,
+            "invalid literal for int() with base 10: 'foo'",
+        ),
+        (
+            partial(
+                LetterImageTemplate, image_url="foo", page_count=1, postage="third"
+            ),
+            TypeError,
+            "postage must be None, 'first', 'second', 'europe' or 'rest-of-world'",
+        ),
+    ],
+)
+def test_letter_image_renderer_requires_arguments(
+    partial_call,
+    expected_exception,
+    expected_message,
+):
+    with pytest.raises(expected_exception) as exception:
+        partial_call({"content": "", "subject": "", "template_type": "letter"})
+    assert str(exception.value) == expected_message
+
+
+@pytest.mark.parametrize(
+    ("postage", "expected_attribute_value", "expected_postage_text"),
+    [
+        (None, None, None),
+        (
+            "first",
+            ["letter-postage", "letter-postage-first"],
+            "Postage: first class",
+        ),
+        (
+            "second",
+            ["letter-postage", "letter-postage-second"],
+            "Postage: second class",
+        ),
+        (
+            "europe",
+            ["letter-postage", "letter-postage-international"],
+            "Postage: international",
+        ),
+        (
+            "rest-of-world",
+            ["letter-postage", "letter-postage-international"],
+            "Postage: international",
+        ),
+    ],
+)
+def test_letter_image_renderer_passes_postage_to_html_attribute(
+    postage,
+    expected_attribute_value,
+    expected_postage_text,
+):
+    template = BeautifulSoup(
+        str(
+            LetterImageTemplate(
+                {"content": "", "subject": "", "template_type": "letter"},
+                image_url="foo",
+                page_count=1,
+                postage=postage,
+            )
+        ),
+        features="html.parser",
+    )
+    if expected_attribute_value:
+        assert (
+            template.select_one(".letter-postage")["class"] == expected_attribute_value
+        )
+        assert (
+            template.select_one(".letter-postage").text.strip() == expected_postage_text
+        )
+    else:
+        assert not template.select(".letter-postage")
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSBodyPreviewTemplate,
+        SMSMessageTemplate,
+        SMSPreviewTemplate,
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    "template_json",
+    [
+        {"content": ""},
+        {"content": "", "subject": "subject"},
+    ],
+)
+def test_sms_templates_have_no_subject(template_class, template_json):
+    template_json.update(template_type=template_class.template_type)
+    assert not hasattr(
+        template_class(template_json),
+        "subject",
+    )
+
+
+def test_subject_line_gets_applied_to_correct_template_types():
+    for cls in [
+        EmailPreviewTemplate,
+        HTMLEmailTemplate,
+        PlainTextEmailTemplate,
+        LetterPreviewTemplate,
+        LetterImageTemplate,
+    ]:
+        assert issubclass(cls, SubjectMixin)
+    for cls in [
+        SMSBodyPreviewTemplate,
+        SMSMessageTemplate,
+        SMSPreviewTemplate,
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ]:
+        assert not issubclass(cls, SubjectMixin)
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "extra_args"),
+    [
+        (EmailPreviewTemplate, "email", {}),
+        (HTMLEmailTemplate, "email", {}),
+        (PlainTextEmailTemplate, "email", {}),
+        (LetterPreviewTemplate, "letter", {}),
+        (LetterPrintTemplate, "letter", {}),
+        (
+            LetterImageTemplate,
+            "letter",
+            {
+                "image_url": "http://example.com",
+                "page_count": 1,
+            },
+        ),
+    ],
+)
+def test_subject_line_gets_replaced(template_class, template_type, extra_args):
+    template = template_class(
+        {"content": "", "template_type": template_type, "subject": "((name))"},
+        **extra_args,
+    )
+    assert template.subject == Markup("<span class='placeholder'>((name))</span>")
+    template.values = {"name": "Jo"}
+    assert template.subject == "Jo"
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "extra_args"),
+    [
+        (EmailPreviewTemplate, "email", {}),
+        (HTMLEmailTemplate, "email", {}),
+        (PlainTextEmailTemplate, "email", {}),
+        (LetterPreviewTemplate, "letter", {}),
+        (LetterPrintTemplate, "letter", {}),
+        (
+            LetterImageTemplate,
+            "letter",
+            {
+                "image_url": "http://example.com",
+                "page_count": 1,
+            },
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("content", "values", "expected_count"),
+    [
+        ("Content with ((placeholder))", {"placeholder": "something extra"}, 28),
+        ("Content with ((placeholder))", {"placeholder": ""}, 12),
+        ("Just content", {}, 12),
+        ("((placeholder))  ", {"placeholder": "  "}, 0),
+        ("  ", {}, 0),
+    ],
+)
+def test_character_count_for_non_sms_templates(
+    template_class,
+    template_type,
+    extra_args,
+    content,
+    values,
+    expected_count,
+):
+    template = template_class(
+        {
+            "content": content,
+            "subject": "Hi",
+            "template_type": template_type,
+        },
+        **extra_args,
+    )
+    template.values = values
+    assert template.content_count == expected_count
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSMessageTemplate,
+        SMSPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    (
+        "content",
+        "values",
+        "prefix",
+        "expected_count_in_template",
+        "expected_count_in_notification",
+    ),
+    [
+        # is an unsupported unicode character so should be replaced with a ?
+        ("深", {}, None, 1, 1),
+        # is a supported unicode character so should be kept as is
+        ("Ŵ", {}, None, 1, 1),
+        ("'First line.\n", {}, None, 12, 12),
+        ("\t\n\r", {}, None, 0, 0),
+        (
+            "Content with ((placeholder))",
+            {"placeholder": "something extra here"},
+            None,
+            13,
+            33,
+        ),
+        ("Content with ((placeholder))", {"placeholder": ""}, None, 13, 12),
+        ("Just content", {}, None, 12, 12),
+        ("((placeholder))  ", {"placeholder": "  "}, None, 0, 0),
+        ("  ", {}, None, 0, 0),
+        (
+            "Content with ((placeholder))",
+            {"placeholder": "something extra here"},
+            "GDS",
+            18,
+            38,
+        ),
+        ("Just content", {}, "GDS", 17, 17),
+        ("((placeholder))  ", {"placeholder": "  "}, "GDS", 5, 4),
+        ("  ", {}, "GDS", 4, 4),  # Becomes `GDS:`
+        ("  G      D       S  ", {}, None, 5, 5),  # Becomes `G D S`
+        ("P1 \n\n\n\n\n\n P2", {}, None, 6, 6),  # Becomes `P1\n\nP2`
+        (
+            "a    ((placeholder))    b",
+            {"placeholder": ""},
+            None,
+            4,
+            3,
+        ),  # Counted as `a  b` then `a b`
+    ],
+)
+def test_character_count_for_sms_templates(
+    content,
+    values,
+    prefix,
+    expected_count_in_template,
+    expected_count_in_notification,
+    template_class,
+):
+    template = template_class(
+        {"content": content, "template_type": "sms"},
+        prefix=prefix,
+    )
+    template.sender = None
+    assert template.content_count == expected_count_in_template
+    template.values = values
+    assert template.content_count == expected_count_in_notification
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    (
+        "content",
+        "values",
+        "expected_count_in_template",
+        "expected_count_in_notification",
+    ),
+    [
+        # is an unsupported unicode character so should be replaced with a ?
+        ("深", {}, 1, 1),
+        # is a supported unicode character so should be kept as is
+        ("Ŵ", {}, 1, 1),
+        ("'First line.\n", {}, 12, 12),
+        ("\t\n\r", {}, 0, 0),
+        (
+            "Content with ((placeholder))",
+            {"placeholder": "something extra here"},
+            13,
+            33,
+        ),
+        ("Content with ((placeholder))", {"placeholder": ""}, 13, 12),
+        ("Just content", {}, 12, 12),
+        ("((placeholder))  ", {"placeholder": "  "}, 0, 0),
+        ("  ", {}, 0, 0),
+        ("  G      D       S  ", {}, 5, 5),  # Becomes `G D S`
+        ("P1 \n\n\n\n\n\n P2", {}, 6, 6),  # Becomes `P1\n\nP2`
+    ],
+)
+def test_character_count_for_broadcast_templates(
+    content,
+    values,
+    expected_count_in_template,
+    expected_count_in_notification,
+    template_class,
+):
+    template = template_class(
+        {"content": content, "template_type": "broadcast"},
+    )
+    assert template.content_count == expected_count_in_template
+    template.values = values
+    assert template.content_count == expected_count_in_notification
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSMessageTemplate,
+        BroadcastMessageTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    ("msg", "expected_sms_fragment_count"),
+    [
+        (
+            """This is a very long long long long long long long long long long
+             long long long long long long long long long long long long long long text message.""",
+            1,
+        ),
+        ("This is a short message.", 1),
+    ],
+)
+def test_sms_fragment_count_accounts_for_unicode_and_welsh_characters(
+    template_class,
+    msg,
+    expected_sms_fragment_count,
+):
+    template = template_class(
+        {"content": msg, "template_type": template_class.template_type}
+    )
+    assert template.fragment_count == expected_sms_fragment_count
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSMessageTemplate,
+        BroadcastMessageTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    ("msg", "expected_sms_fragment_count"),
+    [
+        # all extended GSM characters
+        (
+            "Это длинное сообщение на русском языке, чтобы проверить, как система рассчитывает его стоимость.",
+            2,
+        ),
+        (
+            "이것은 매우 길고 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 오래 긴 문자 메시지입니다.",
+            2,
+        ),
+        ("Αυτό είναι ένα μεγάλο μήνυμα στα ρωσικά για να ελέγξετε πώς το για αυτό", 2),
+        (
+            "これは、システムがコストをどのように計算するかをテストするためのロシア語の長いメッセージです",
+            1,
+        ),
+        ("这是一条很长的俄语消息，用于测试系统如何计算其成本", 1),
+        (
+            "这是一个非常长的长长长长的长长长长的长长长长的长长长长的长长长长长长长长长长长长的长长长长的长篇短信",
+            1,
+        ),
+        (
+            "これは、システムがコストをどのように計算するかをテストするためのロシア語の長いメッセージです foo foofoofoofoofoofoofoofoo",
+            2,
+        ),
+        (
+            "Это длинное сообщение на русском языке, чтобы проверить, как система рассчитывает его стоимость.\
+          foo foo foo foo foo foo foo foo foo foo",
+            3,
+        ),
+        (
+            "Hello Carlos. Your Example Corp. bill of $100 is now available. Autopay is scheduled for next Thursday,\
+         April 9. To view the details of your bill, go to https://example.com/bill1.",
+            2,
+        ),
+        (
+            "亚马逊公司是一家总部位于美国西雅图的跨国电子商务企业，业务起始于线上书店，不久之后商品走向多元化。杰夫·贝佐斯于1994年7月创建了这家公司。",
+            2,
+        ),
+        # This test should break into two messages, but \u2019 gets converted to (')
+        (
+            "John: Your appointment with Dr. Salazar’s office is scheduled for next Thursday at 4:30pm.\
+          Reply YES to confirm, NO to reschedule.",
+            1,
+        ),
+    ],
+)
+def test_sms_fragment_count_accounts_for_non_latin_characters(
+    template_class,
+    msg,
+    expected_sms_fragment_count,
+):
+    template = template_class(
+        {"content": msg, "template_type": template_class.template_type}
+    )
+    assert template.fragment_count == expected_sms_fragment_count
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSMessageTemplate,
+        SMSPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    ("content", "values", "prefix", "expected_result"),
+    [
+        ("", {}, None, True),
+        ("", {}, "GDS", True),
+        ("((placeholder))", {"placeholder": ""}, "GDS", True),
+        ("((placeholder))", {"placeholder": "Some content"}, None, False),
+        ("Some content", {}, "GDS", False),
+    ],
+)
+def test_is_message_empty_sms_templates(
+    content, values, prefix, expected_result, template_class
+):
+    template = template_class(
+        {"content": content, "template_type": "sms"},
+        prefix=prefix,
+    )
+    template.sender = None
+    template.values = values
+    assert template.is_message_empty() == expected_result
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    ("content", "values", "expected_result"),
+    [
+        ("", {}, True),
+        ("((placeholder))", {"placeholder": ""}, True),
+        ("((placeholder))", {"placeholder": "Some content"}, False),
+        ("Some content", {}, False),
+    ],
+)
+def test_is_message_empty_broadcast_templates(
+    content, values, expected_result, template_class
+):
+    template = template_class(
+        {"content": content, "template_type": "broadcast"},
+    )
+    template.sender = None
+    template.values = values
+    assert template.is_message_empty() == expected_result
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type"),
+    [
+        (HTMLEmailTemplate, "email"),
+        (LetterPrintTemplate, "letter"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("content", "values", "expected_result"),
+    [
+        ("", {}, True),
+        ("((placeholder))", {"placeholder": ""}, True),
+        ("((placeholder))", {"placeholder": "   \t   \r\n"}, True),
+        ("((placeholder))", {"placeholder": "Some content"}, False),
+        ("((placeholder??show_or_hide))", {"placeholder": False}, True),
+        ("Some content", {}, False),
+        ("((placeholder)) some content", {"placeholder": ""}, False),
+        ("Some content ((placeholder))", {"placeholder": ""}, False),
+    ],
+)
+def test_is_message_empty_email_and_letter_templates(
+    template_class,
+    template_type,
+    content,
+    values,
+    expected_result,
+):
+    template = template_class(
+        {
+            "content": content,
+            "subject": "Hi",
+            "template_type": template_class.template_type,
+        }
+    )
+    template.sender = None
+    template.values = values
+    assert template.is_message_empty() == expected_result
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type"),
+    [
+        (HTMLEmailTemplate, "email"),
+        (LetterPrintTemplate, "letter"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("content", "values"),
+    [
+        ("Some content", {}),
+        ("((placeholder)) some content", {"placeholder": ""}),
+        ("Some content ((placeholder))", {"placeholder": ""}),
+        pytest.param(
+            "((placeholder))",
+            {"placeholder": "Some content"},
+            marks=pytest.mark.xfail(raises=AssertionError),
+        ),
+    ],
+)
+def test_is_message_empty_email_and_letter_templates_tries_not_to_count_chars(
+    mocker,
+    template_class,
+    template_type,
+    content,
+    values,
+):
+    template = template_class(
+        {
+            "content": content,
+            "subject": "Hi",
+            "template_type": template_type,
+        }
+    )
+    mock_content = mocker.patch.object(
+        template_class,
+        "content_count",
+        create=True,
+        new_callable=mock.PropertyMock,
+        return_value=None,
+    )
+    template.values = values
+    template.is_message_empty()
+    assert mock_content.called is False
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "extra_args", "expected_field_calls"),
+    [
+        (
+            PlainTextEmailTemplate,
+            "email",
+            {},
+            [mock.call("content", {}, html="passthrough", markdown_lists=True)],
+        ),
+        (
+            HTMLEmailTemplate,
+            "email",
+            {},
+            [
+                mock.call(
+                    "subject", {}, html="escape", redact_missing_personalisation=False
+                ),
+                mock.call(
+                    "content",
+                    {},
+                    html="escape",
+                    markdown_lists=True,
+                    redact_missing_personalisation=False,
+                ),
+                mock.call("content", {}, html="escape", markdown_lists=True),
+            ],
+        ),
+        (
+            EmailPreviewTemplate,
+            "email",
+            {},
+            [
+                mock.call(
+                    "content",
+                    {},
+                    html="escape",
+                    markdown_lists=True,
+                    redact_missing_personalisation=False,
+                ),
+                mock.call(
+                    "subject", {}, html="escape", redact_missing_personalisation=False
+                ),
+                mock.call("((email address))", {}, with_brackets=False),
+            ],
+        ),
+        (
+            SMSMessageTemplate,
+            "sms",
+            {},
+            [
+                mock.call("content"),  # This is to get the placeholders
+                mock.call("content", {}, html="passthrough"),
+            ],
+        ),
+        (
+            SMSPreviewTemplate,
+            "sms",
+            {},
+            [
+                mock.call("((phone number))", {}, with_brackets=False, html="escape"),
+                mock.call(
+                    "content", {}, html="escape", redact_missing_personalisation=False
+                ),
+            ],
+        ),
+        (
+            BroadcastMessageTemplate,
+            "broadcast",
+            {},
+            [
+                mock.call("content", {}, html="escape"),
+            ],
+        ),
+        (
+            BroadcastPreviewTemplate,
+            "broadcast",
+            {},
+            [
+                mock.call("((phone number))", {}, with_brackets=False, html="escape"),
+                mock.call(
+                    "content", {}, html="escape", redact_missing_personalisation=False
+                ),
+            ],
+        ),
+        (
+            LetterPreviewTemplate,
+            "letter",
+            {"contact_block": "www.gov.uk"},
+            [
+                mock.call(
+                    "subject", {}, html="escape", redact_missing_personalisation=False
+                ),
+                mock.call(
+                    "content",
+                    {},
+                    html="escape",
+                    markdown_lists=True,
+                    redact_missing_personalisation=False,
+                ),
+                mock.call(
+                    (
+                        "((address line 1))\n"
+                        "((address line 2))\n"
+                        "((address line 3))\n"
+                        "((address line 4))\n"
+                        "((address line 5))\n"
+                        "((address line 6))\n"
+                        "((address line 7))"
+                    ),
+                    {},
+                    with_brackets=False,
+                    html="escape",
+                ),
+                mock.call(
+                    "www.gov.uk",
+                    {},
+                    html="escape",
+                    redact_missing_personalisation=False,
+                ),
+            ],
+        ),
+        (
+            LetterImageTemplate,
+            "letter",
+            {
+                "image_url": "http://example.com",
+                "page_count": 1,
+                "contact_block": "www.gov.uk",
+            },
+            [
+                mock.call(
+                    (
+                        "((address line 1))\n"
+                        "((address line 2))\n"
+                        "((address line 3))\n"
+                        "((address line 4))\n"
+                        "((address line 5))\n"
+                        "((address line 6))\n"
+                        "((address line 7))"
+                    ),
+                    {},
+                    with_brackets=False,
+                    html="escape",
+                ),
+                mock.call(
+                    "www.gov.uk",
+                    {},
+                    html="escape",
+                    redact_missing_personalisation=False,
+                ),
+                mock.call(
+                    "subject", {}, html="escape", redact_missing_personalisation=False
+                ),
+                mock.call(
+                    "content",
+                    {},
+                    html="escape",
+                    markdown_lists=True,
+                    redact_missing_personalisation=False,
+                ),
+            ],
+        ),
+        (
+            EmailPreviewTemplate,
+            "email",
+            {"redact_missing_personalisation": True},
+            [
+                mock.call(
+                    "content",
+                    {},
+                    html="escape",
+                    markdown_lists=True,
+                    redact_missing_personalisation=True,
+                ),
+                mock.call(
+                    "subject", {}, html="escape", redact_missing_personalisation=True
+                ),
+                mock.call("((email address))", {}, with_brackets=False),
+            ],
+        ),
+        (
+            SMSPreviewTemplate,
+            "sms",
+            {"redact_missing_personalisation": True},
+            [
+                mock.call("((phone number))", {}, with_brackets=False, html="escape"),
+                mock.call(
+                    "content", {}, html="escape", redact_missing_personalisation=True
+                ),
+            ],
+        ),
+        (
+            BroadcastPreviewTemplate,
+            "broadcast",
+            {"redact_missing_personalisation": True},
+            [
+                mock.call("((phone number))", {}, with_brackets=False, html="escape"),
+                mock.call(
+                    "content", {}, html="escape", redact_missing_personalisation=True
+                ),
+            ],
+        ),
+        (
+            SMSBodyPreviewTemplate,
+            "sms",
+            {},
+            [
+                mock.call(
+                    "content", {}, html="escape", redact_missing_personalisation=True
+                ),
+            ],
+        ),
+        (
+            LetterPreviewTemplate,
+            "letter",
+            {"contact_block": "www.gov.uk", "redact_missing_personalisation": True},
+            [
+                mock.call(
+                    "subject", {}, html="escape", redact_missing_personalisation=True
+                ),
+                mock.call(
+                    "content",
+                    {},
+                    html="escape",
+                    markdown_lists=True,
+                    redact_missing_personalisation=True,
+                ),
+                mock.call(
+                    (
+                        "((address line 1))\n"
+                        "((address line 2))\n"
+                        "((address line 3))\n"
+                        "((address line 4))\n"
+                        "((address line 5))\n"
+                        "((address line 6))\n"
+                        "((address line 7))"
+                    ),
+                    {},
+                    with_brackets=False,
+                    html="escape",
+                ),
+                mock.call(
+                    "www.gov.uk", {}, html="escape", redact_missing_personalisation=True
+                ),
+            ],
+        ),
+    ],
+)
+@mock.patch("notifications_utils.template.Field.__init__", return_value=None)
+@mock.patch(
+    "notifications_utils.template.Field.__str__", return_value="1\n2\n3\n4\n5\n6\n7\n8"
+)
+def test_templates_handle_html_and_redacting(
+    mock_field_str,
+    mock_field_init,
+    template_class,
+    template_type,
+    extra_args,
+    expected_field_calls,
+):
+    assert str(
+        template_class(
+            {
+                "content": "content",
+                "subject": "subject",
+                "template_type": template_type,
+            },
+            **extra_args,
+        )
+    )
+    assert mock_field_init.call_args_list == expected_field_calls
+
+
+@pytest.mark.parametrize(
+    (
+        "template_class",
+        "template_type",
+        "extra_args",
+        "expected_remove_whitespace_calls",
+    ),
+    [
+        (
+            PlainTextEmailTemplate,
+            "email",
+            {},
+            [
+                mock.call("\n\ncontent"),
+                mock.call(Markup("subject")),
+                mock.call(Markup("subject")),
+            ],
+        ),
+        (
+            HTMLEmailTemplate,
+            "email",
+            {},
+            [
+                mock.call(Markup("subject")),
+                mock.call(
+                    '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+                    "content"
+                    "</p>"
+                ),
+                mock.call("\n\ncontent"),
+                mock.call(Markup("subject")),
+                mock.call(Markup("subject")),
+            ],
+        ),
+        (
+            EmailPreviewTemplate,
+            "email",
+            {},
+            [
+                mock.call(
+                    '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+                    "content"
+                    "</p>"
+                ),
+                mock.call(Markup("subject")),
+                mock.call(Markup("subject")),
+                mock.call(Markup("subject")),
+            ],
+        ),
+        (
+            SMSMessageTemplate,
+            "sms",
+            {},
+            [
+                mock.call("content"),
+            ],
+        ),
+        (
+            SMSPreviewTemplate,
+            "sms",
+            {},
+            [
+                mock.call("content"),
+            ],
+        ),
+        (
+            SMSBodyPreviewTemplate,
+            "sms",
+            {},
+            [
+                mock.call("content"),
+            ],
+        ),
+        (
+            BroadcastMessageTemplate,
+            "broadcast",
+            {},
+            [
+                mock.call("content"),
+            ],
+        ),
+        (
+            BroadcastPreviewTemplate,
+            "broadcast",
+            {},
+            [
+                mock.call("content"),
+            ],
+        ),
+        (
+            LetterPreviewTemplate,
+            "letter",
+            {"contact_block": "www.gov.uk"},
+            [
+                mock.call(Markup("subject")),
+                mock.call(Markup("<p>content</p>")),
+                mock.call(Markup("www.gov.uk")),
+                mock.call(Markup("subject")),
+                mock.call(Markup("subject")),
+            ],
+        ),
+    ],
+)
+@mock.patch(
+    "notifications_utils.template.remove_whitespace_before_punctuation",
+    side_effect=lambda x: x,
+)
+def test_templates_remove_whitespace_before_punctuation(
+    mock_remove_whitespace,
+    template_class,
+    template_type,
+    extra_args,
+    expected_remove_whitespace_calls,
+):
+    template = template_class(
+        {"content": "content", "subject": "subject", "template_type": template_type},
+        **extra_args,
+    )
+
+    assert str(template)
+
+    if hasattr(template, "subject"):
+        assert template.subject
+
+    assert mock_remove_whitespace.call_args_list == expected_remove_whitespace_calls
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "extra_args", "expected_calls"),
+    [
+        (
+            PlainTextEmailTemplate,
+            "email",
+            {},
+            [
+                mock.call("\n\ncontent"),
+                mock.call(Markup("subject")),
+            ],
+        ),
+        (
+            HTMLEmailTemplate,
+            "email",
+            {},
+            [
+                mock.call(
+                    '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+                    "content"
+                    "</p>"
+                ),
+                mock.call("\n\ncontent"),
+                mock.call(Markup("subject")),
+            ],
+        ),
+        (
+            EmailPreviewTemplate,
+            "email",
+            {},
+            [
+                mock.call(
+                    '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">'
+                    "content"
+                    "</p>"
+                ),
+                mock.call(Markup("subject")),
+            ],
+        ),
+        (SMSMessageTemplate, "sms", {}, []),
+        (SMSPreviewTemplate, "sms", {}, []),
+        (SMSBodyPreviewTemplate, "sms", {}, []),
+        (BroadcastMessageTemplate, "broadcast", {}, []),
+        (BroadcastPreviewTemplate, "broadcast", {}, []),
+        (
+            LetterPreviewTemplate,
+            "letter",
+            {"contact_block": "www.gov.uk"},
+            [
+                mock.call(Markup("subject")),
+                mock.call(Markup("<p>content</p>")),
+            ],
+        ),
+    ],
+)
+@mock.patch("notifications_utils.template.make_quotes_smart", side_effect=lambda x: x)
+@mock.patch(
+    "notifications_utils.template.replace_hyphens_with_en_dashes",
+    side_effect=lambda x: x,
+)
+def test_templates_make_quotes_smart_and_dashes_en(
+    mock_en_dash_replacement,
+    mock_smart_quotes,
+    template_class,
+    template_type,
+    extra_args,
+    expected_calls,
+):
+    template = template_class(
+        {"content": "content", "subject": "subject", "template_type": template_type},
+        **extra_args,
+    )
+
+    assert str(template)
+
+    if hasattr(template, "subject"):
+        assert template.subject
+
+    mock_smart_quotes.assert_has_calls(expected_calls)
+    mock_en_dash_replacement.assert_has_calls(expected_calls)
+
+
+@pytest.mark.parametrize(
+    "content",
+    [
+        "first.o'last@example.com",
+        "first.o’last@example.com",
+    ],
+)
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        HTMLEmailTemplate,
+        PlainTextEmailTemplate,
+        EmailPreviewTemplate,
+    ],
+)
+def test_no_smart_quotes_in_email_addresses(template_class, content):
+    template = template_class(
+        {
+            "content": content,
+            "subject": content,
+            "template_type": "email",
+        }
+    )
+    assert "first.o'last@example.com" in str(template)
+    assert template.subject == "first.o'last@example.com"
+
+
+def test_smart_quotes_removed_from_long_template_in_under_a_second():
+    long_string = "a" * 100000
+    template = PlainTextEmailTemplate(
+        {
+            "content": long_string,
+            "subject": "",
+            "template_type": "email",
+        }
+    )
+
+    start_time = process_time()
+
+    str(template)
+
+    assert process_time() - start_time < 1
+
+
+@pytest.mark.parametrize(
+    ("template_instance", "expected_placeholders"),
+    [
+        (
+            SMSMessageTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "sms",
+                },
+            ),
+            ["content"],
+        ),
+        (
+            SMSPreviewTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "sms",
+                },
+            ),
+            ["content"],
+        ),
+        (
+            SMSBodyPreviewTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "sms",
+                },
+            ),
+            ["content"],
+        ),
+        (
+            BroadcastMessageTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "broadcast",
+                },
+            ),
+            ["content"],
+        ),
+        (
+            BroadcastPreviewTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "broadcast",
+                },
+            ),
+            ["content"],
+        ),
+        (
+            PlainTextEmailTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "email",
+                },
+            ),
+            ["subject", "content"],
+        ),
+        (
+            HTMLEmailTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "email",
+                },
+            ),
+            ["subject", "content"],
+        ),
+        (
+            EmailPreviewTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "email",
+                },
+            ),
+            ["subject", "content"],
+        ),
+        (
+            LetterPreviewTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "letter",
+                },
+                contact_block="((contact_block))",
+            ),
+            ["contact_block", "subject", "content"],
+        ),
+        (
+            LetterImageTemplate(
+                {
+                    "content": "((content))",
+                    "subject": "((subject))",
+                    "template_type": "letter",
+                },
+                contact_block="((contact_block))",
+                image_url="http://example.com",
+                page_count=99,
+            ),
+            ["contact_block", "subject", "content"],
+        ),
+    ],
+)
+def test_templates_extract_placeholders(
+    template_instance,
+    expected_placeholders,
+):
+    assert template_instance.placeholders == OrderedSet(expected_placeholders)
+
+
+@pytest.mark.parametrize(
+    "extra_args",
+    [
+        {"from_name": "Example service"},
+        {
+            "from_name": "Example service",
+            "from_address": "test@example.com",
+        },
+        pytest.param({}, marks=pytest.mark.xfail),
+    ],
+)
+def test_email_preview_shows_from_name(extra_args):
+    template = EmailPreviewTemplate(
+        {"content": "content", "subject": "subject", "template_type": "email"},
+        **extra_args,
+    )
+    assert '<th scope="row">From</th>' in str(template)
+    assert "Example service" in str(template)
+    assert "test@example.com" not in str(template)
+
+
+def test_email_preview_escapes_html_in_from_name():
+    template = EmailPreviewTemplate(
+        {"content": "content", "subject": "subject", "template_type": "email"},
+        from_name='<script>alert("")</script>',
+        from_address="test@example.com",
+    )
+    assert "<script>" not in str(template)
+    assert '&lt;script&gt;alert("")&lt;/script&gt;' in str(template)
+
+
+@pytest.mark.parametrize(
+    "extra_args",
+    [
+        {"reply_to": "test@example.com"},
+        pytest.param({}, marks=pytest.mark.xfail),
+    ],
+)
+def test_email_preview_shows_reply_to_address(extra_args):
+    template = EmailPreviewTemplate(
+        {"content": "content", "subject": "subject", "template_type": "email"},
+        **extra_args,
+    )
+    assert '<th scope="row">Reply&nbsp;to</th>' in str(template)
+    assert "test@example.com" in str(template)
+
+
+@pytest.mark.parametrize(
+    ("template_values", "expected_content"),
+    [
+        ({}, "<span class='placeholder-no-brackets'>email address</span>"),
+        ({"email address": "test@example.com"}, "test@example.com"),
+    ],
+)
+def test_email_preview_shows_recipient_address(
+    template_values,
+    expected_content,
+):
+    template = EmailPreviewTemplate(
+        {"content": "content", "subject": "subject", "template_type": "email"},
+        template_values,
+    )
+    assert expected_content in str(template)
+
+
+@pytest.mark.parametrize(
+    ("address", "expected"),
+    [
+        (
+            {
+                "address line 1": "line 1",
+                "address line 2": "line 2",
+                "address line 3": "line 3",
+                "address line 4": "line 4",
+                "address line 5": "line 5",
+                "address line 6": "line 6",
+                "postcode": "n14w q",
+            },
+            (
+                "<ul>"
+                "<li>line 1</li>"
+                "<li>line 2</li>"
+                "<li>line 3</li>"
+                "<li>line 4</li>"
+                "<li>line 5</li>"
+                "<li>line 6</li>"
+                "<li>N1 4WQ</li>"
+                "</ul>"
+            ),
+        ),
+        (
+            {
+                "addressline1": "line 1",
+                "addressline2": "line 2",
+                "addressline3": "line 3",
+                "addressline4": "line 4",
+                "addressline5": "line 5",
+                "addressLine6": "line 6",
+                "postcode": "not a postcode",
+            },
+            (
+                "<ul>"
+                "<li>line 1</li>"
+                "<li>line 2</li>"
+                "<li>line 3</li>"
+                "<li>line 4</li>"
+                "<li>line 5</li>"
+                "<li>line 6</li>"
+                "<li>not a postcode</li>"
+                "</ul>"
+            ),
+        ),
+        (
+            {
+                "address line 1": "line 1",
+                "postcode": "n1 4wq",
+            },
+            (
+                "<ul>"
+                "<li>line 1</li>"
+                '<li><span class="placeholder-no-brackets">address line 2</span></li>'
+                '<li><span class="placeholder-no-brackets">address line 3</span></li>'
+                '<li><span class="placeholder-no-brackets">address line 4</span></li>'
+                '<li><span class="placeholder-no-brackets">address line 5</span></li>'
+                '<li><span class="placeholder-no-brackets">address line 6</span></li>'
+                # Postcode is not normalised until the address is complete
+                "<li>n1 4wq</li>"
+                "</ul>"
+            ),
+        ),
+        (
+            {
+                "addressline1": "line 1",
+                "addressline2": "line 2",
+                "addressline3": None,
+                "addressline6": None,
+                "postcode": "N1 4Wq",
+            },
+            ("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
+        ),
+        (
+            {
+                "addressline1": "line 1",
+                "addressline2": "line 2     ,   ",
+                "addressline3": "\t     ,",
+                "postcode": "N1 4WQ",
+            },
+            ("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
+        ),
+        (
+            {
+                "addressline1": "line 1",
+                "addressline2": "line 2",
+                "postcode": "SW1A 1AA",  # ignored in favour of line 7
+                "addressline7": "N1 4WQ",
+            },
+            ("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
+        ),
+        (
+            {
+                "addressline1": "line 1",
+                "addressline2": "line 2",
+                "addressline7": "N1 4WQ",  # means postcode isn’t needed
+            },
+            ("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
+        ),
+    ],
+)
+@pytest.mark.parametrize("template_class", [LetterPreviewTemplate, LetterPrintTemplate])
+def test_letter_address_format(template_class, address, expected):
+    template = BeautifulSoup(
+        str(
+            template_class(
+                {"content": "", "subject": "", "template_type": "letter"},
+                address,
+            )
+        ),
+        features="html.parser",
+    )
+    assert str(template.select_one("#to ul")) == expected
+
+
+@freeze_time("2001-01-01 12:00:00.000000")
+@pytest.mark.parametrize(
+    ("markdown", "expected"),
+    [
+        (
+            (
+                "Here is a list of bullets:\n"
+                "\n"
+                "* one\n"
+                "* two\n"
+                "* three\n"
+                "\n"
+                "New paragraph"
+            ),
+            (
+                "<ul>\n"
+                "<li>one</li>\n"
+                "<li>two</li>\n"
+                "<li>three</li>\n"
+                "</ul>\n"
+                "<p>New paragraph</p>\n"
+            ),
+        ),
+        (
+            ("# List title:\n" "\n" "* one\n" "* two\n" "* three\n"),
+            (
+                "<h2>List title:</h2>\n"
+                "<ul>\n"
+                "<li>one</li>\n"
+                "<li>two</li>\n"
+                "<li>three</li>\n"
+                "</ul>\n"
+            ),
+        ),
+        (
+            ("Here’s an ordered list:\n" "\n" "1. one\n" "2. two\n" "3. three\n"),
+            (
+                "<p>Here’s an ordered list:</p><ol>\n"
+                "<li>one</li>\n"
+                "<li>two</li>\n"
+                "<li>three</li>\n"
+                "</ol>"
+            ),
+        ),
+    ],
+)
+def test_lists_in_combination_with_other_elements_in_letters(markdown, expected):
+    assert expected in str(
+        LetterPreviewTemplate(
+            {"content": markdown, "subject": "Hello", "template_type": "letter"},
+            {},
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSMessageTemplate,
+        SMSPreviewTemplate,
+    ],
+)
+def test_message_too_long_ignoring_prefix(template_class):
+    body = ("b" * 917) + "((foo))"
+    template = template_class(
+        {"content": body, "template_type": template_class.template_type},
+        prefix="a" * 100,
+        values={"foo": "cc"},
+    )
+    # content length is prefix + 919 characters (more than limit of 918)
+    assert template.is_message_too_long() is True
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        SMSMessageTemplate,
+        SMSPreviewTemplate,
+    ],
+)
+def test_message_is_not_too_long_ignoring_prefix(template_class):
+    body = ("b" * 917) + "((foo))"
+    template = template_class(
+        {"content": body, "template_type": template_class.template_type},
+        prefix="a" * 100,
+        values={"foo": "c"},
+    )
+    # content length is prefix + 918 characters (not more than limit of 918)
+    assert template.is_message_too_long() is False
+
+
+@pytest.mark.parametrize(
+    ("extra_characters", "expected_too_long"),
+    [
+        ("cc", True),  # content length is 919 characters (more than limit of 918)
+        ("c", False),  # content length is 918 characters (not more than limit of 918)
+    ],
+)
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+def test_broadcast_message_too_long(
+    template_class, extra_characters, expected_too_long
+):
+    body = ("b" * 917) + "((foo))"
+    template = template_class(
+        {"content": body, "template_type": "broadcast"},
+        values={"foo": extra_characters},
+    )
+    assert template.is_message_too_long() is expected_too_long
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "kwargs"),
+    [
+        (EmailPreviewTemplate, "email", {}),
+        (HTMLEmailTemplate, "email", {}),
+        (PlainTextEmailTemplate, "email", {}),
+        (LetterPreviewTemplate, "letter", {}),
+        (LetterImageTemplate, "letter", {"image_url": "foo", "page_count": 1}),
+    ],
+)
+def test_message_too_long_limit_bigger_or_nonexistent_for_non_sms_templates(
+    template_class, template_type, kwargs
+):
+    body = "a" * 1000
+    template = template_class(
+        {"content": body, "subject": "foo", "template_type": template_type}, **kwargs
+    )
+    assert template.is_message_too_long() is False
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "kwargs"),
+    [
+        (EmailPreviewTemplate, "email", {}),
+        (HTMLEmailTemplate, "email", {}),
+        (PlainTextEmailTemplate, "email", {}),
+    ],
+)
+def test_content_size_in_bytes_for_email_messages(
+    template_class, template_type, kwargs
+):
+    # Message being a Markup objects adds 81 bytes overhead, so it's 100 bytes for 100 x 'b' and 81 bytes overhead
+    body = "b" * 100
+    template = template_class(
+        {"content": body, "subject": "foo", "template_type": template_type}, **kwargs
+    )
+    assert template.content_size_in_bytes == 100
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "kwargs"),
+    [
+        (EmailPreviewTemplate, "email", {}),
+        (HTMLEmailTemplate, "email", {}),
+        (PlainTextEmailTemplate, "email", {}),
+    ],
+)
+def test_message_too_long_for_a_too_big_email_message(
+    template_class, template_type, kwargs
+):
+    # Message being a Markup objects adds 81 bytes overhead, taking our message over the limit
+    body = "b" * 2000001
+    template = template_class(
+        {"content": body, "subject": "foo", "template_type": template_type}, **kwargs
+    )
+    assert template.is_message_too_long() is True
+
+
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "kwargs"),
+    [
+        (EmailPreviewTemplate, "email", {}),
+        (HTMLEmailTemplate, "email", {}),
+        (PlainTextEmailTemplate, "email", {}),
+    ],
+)
+def test_message_too_long_for_an_email_message_within_limits(
+    template_class, template_type, kwargs
+):
+    body = "b" * 1999999
+    template = template_class(
+        {"content": body, "subject": "foo", "template_type": template_type}, **kwargs
+    )
+    assert template.is_message_too_long() is False
+
+
+@pytest.mark.parametrize(
+    ("content", "expected_preview_markup"),
+    [
+        (
+            "a\n\n\nb",
+            ("<p>a</p>" "<p>b</p>"),
+        ),
+        (
+            (
+                "a\n"
+                "\n"
+                "* one\n"
+                "* two\n"
+                "* three\n"
+                "and a half\n"
+                "\n"
+                "\n"
+                "\n"
+                "\n"
+                "foo"
+            ),
+            (
+                "<p>a</p><ul>\n"
+                "<li>one</li>\n"
+                "<li>two</li>\n"
+                "<li>three<br>and a half</li>\n"
+                "</ul>\n"
+                "<p>foo</p>"
+            ),
+        ),
+    ],
+)
+def test_multiple_newlines_in_letters(
+    content,
+    expected_preview_markup,
+):
+    assert expected_preview_markup in str(
+        LetterPreviewTemplate(
+            {"content": content, "subject": "foo", "template_type": "letter"}
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    "subject",
+    [
+        " no break ",
+        " no\tbreak ",
+        "\tno break\t",
+        "no \r\nbreak",
+        "no \nbreak",
+        "no \rbreak",
+        "\rno break\n",
+    ],
+)
+@pytest.mark.parametrize(
+    ("template_class", "template_type", "extra_args"),
+    [
+        (PlainTextEmailTemplate, "email", {}),
+        (HTMLEmailTemplate, "email", {}),
+        (EmailPreviewTemplate, "email", {}),
+        (LetterPreviewTemplate, "letter", {}),
+    ],
+)
+def test_whitespace_in_subjects(template_class, template_type, subject, extra_args):
+    template_instance = template_class(
+        {"content": "foo", "subject": subject, "template_type": template_type},
+        **extra_args,
+    )
+    assert template_instance.subject == "no break"
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        EmailPreviewTemplate,
+        HTMLEmailTemplate,
+        PlainTextEmailTemplate,
+    ],
+)
+def test_whitespace_in_subject_placeholders(template_class):
+    assert (
+        template_class(
+            {
+                "content": "",
+                "subject": "\u200C Your tax   ((status))",
+                "template_type": "email",
+            },
+            values={"status": " is\ndue "},
+        ).subject
+        == "Your tax is due"
+    )
+
+
+@pytest.mark.parametrize(
+    ("template_class", "expected_output"),
+    [
+        (
+            PlainTextEmailTemplate,
+            "paragraph one\n\n\xa0\n\nparagraph two",
+        ),
+        (
+            HTMLEmailTemplate,
+            (
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">paragraph one</p>'
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">&nbsp;</p>'
+                '<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">paragraph two</p>'
+            ),
+        ),
+    ],
+)
+def test_govuk_email_whitespace_hack(template_class, expected_output):
+    template_instance = template_class(
+        {
+            "content": "paragraph one\n\n&nbsp;\n\nparagraph two",
+            "subject": "foo",
+            "template_type": "email",
+        }
+    )
+    assert expected_output in str(template_instance)
+
+
+def test_letter_preview_uses_non_breaking_hyphens():
+    assert "non\u2011breaking" in str(
+        LetterPreviewTemplate(
+            {
+                "content": "non-breaking",
+                "subject": "foo",
+                "template_type": "letter",
+            }
+        )
+    )
+    assert "–" in str(
+        LetterPreviewTemplate(
+            {
+                "content": "en dash - not hyphen - when set with spaces",
+                "subject": "foo",
+                "template_type": "letter",
+            }
+        )
+    )
+
+
+@freeze_time("2001-01-01 12:00:00.000000")
+def test_nested_lists_in_lettr_markup():
+    template_content = str(
+        LetterPreviewTemplate(
+            {
+                "content": (
+                    "nested list:\n"
+                    "\n"
+                    "1. one\n"
+                    "2. two\n"
+                    "3. three\n"
+                    "  - three one\n"
+                    "  - three two\n"
+                    "  - three three\n"
+                ),
+                "subject": "foo",
+                "template_type": "letter",
+            }
+        )
+    )
+
+    assert (
+        "      <p>\n"
+        "        1 January 2001\n"
+        "      </p>\n"
+        # Note that the H1 tag has no trailing whitespace
+        "      <h1>foo</h1>\n"
+        "      <p>nested list:</p><ol>\n"
+        "<li>one</li>\n"
+        "<li>two</li>\n"
+        "<li>three<ul>\n"
+        "<li>three one</li>\n"
+        "<li>three two</li>\n"
+        "<li>three three</li>\n"
+        "</ul></li>\n"
+        "</ol>\n"
+        "\n"
+        "    </div>\n"
+        "  </body>\n"
+        "</html>"
+    ) in template_content
+
+
+def test_that_print_template_is_the_same_as_preview():
+    assert dir(LetterPreviewTemplate) == dir(LetterPrintTemplate)
+    assert (
+        os.path.basename(LetterPreviewTemplate.jinja_template.filename)
+        == "preview.jinja2"
+    )
+    assert (
+        os.path.basename(LetterPrintTemplate.jinja_template.filename) == "print.jinja2"
+    )
+
+
+def test_plain_text_email_whitespace():
+    email = PlainTextEmailTemplate(
+        {
+            "template_type": "email",
+            "subject": "foo",
+            "content": (
+                "# Heading\n"
+                "\n"
+                "1. one\n"
+                "2. two\n"
+                "3. three\n"
+                "\n"
+                "***\n"
+                "\n"
+                "# Heading\n"
+                "\n"
+                "Paragraph\n"
+                "\n"
+                "Paragraph\n"
+                "\n"
+                "^ callout\n"
+                "\n"
+                "1. one not four\n"
+                "1. two not five"
+            ),
+        }
+    )
+    assert str(email) == (
+        "Heading\n"
+        "-----------------------------------------------------------------\n"
+        "\n"
+        "1. one\n"
+        "2. two\n"
+        "3. three\n"
+        "\n"
+        "=================================================================\n"
+        "\n"
+        "\n"
+        "Heading\n"
+        "-----------------------------------------------------------------\n"
+        "\n"
+        "Paragraph\n"
+        "\n"
+        "Paragraph\n"
+        "\n"
+        "callout\n"
+        "\n"
+        "1. one not four\n"
+        "2. two not five\n"
+    )
+
+
+@pytest.mark.parametrize(
+    ("renderer", "template_type", "expected_content"),
+    [
+        (
+            PlainTextEmailTemplate,
+            "email",
+            (
+                "Heading link: https://example.com\n"
+                "-----------------------------------------------------------------\n"
+            ),
+        ),
+        (
+            HTMLEmailTemplate,
+            "email",
+            (
+                '<h2 style="Margin: 0 0 20px 0; padding: 0; font-size: 27px; '
+                'line-height: 35px; font-weight: bold; color: #0B0C0C;">'
+                'Heading <a style="word-wrap: break-word; color: #1D70B8;" href="https://example.com">link</a>'
+                "</h2>"
+            ),
+        ),
+        (
+            LetterPreviewTemplate,
+            "letter",
+            ("<h2>Heading link: <strong>example.com</strong></h2>"),
+        ),
+        (
+            LetterPrintTemplate,
+            "letter",
+            ("<h2>Heading link: <strong>example.com</strong></h2>"),
+        ),
+    ],
+)
+def test_heading_only_template_renders(renderer, template_type, expected_content):
+    assert expected_content in str(
+        renderer(
+            {
+                "subject": "foo",
+                "content": ("# Heading [link](https://example.com)"),
+                "template_type": template_type,
+            }
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        LetterPreviewTemplate,
+        LetterPrintTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    ("filename", "expected_html_class"),
+    [
+        ("example.png", 'class="png"'),
+        ("example.svg", 'class="svg"'),
+    ],
+)
+def test_image_class_applied_to_logo(template_class, filename, expected_html_class):
+    assert expected_html_class in str(
+        template_class(
+            {"content": "Foo", "subject": "Subject", "template_type": "letter"},
+            logo_file_name=filename,
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        LetterPreviewTemplate,
+        LetterPrintTemplate,
+    ],
+)
+def test_image_not_present_if_no_logo(template_class):
+    # can't test that the html doesn't move in utils - tested in template preview instead
+    assert "<img" not in str(
+        template_class(
+            {"content": "Foo", "subject": "Subject", "template_type": "letter"},
+            logo_file_name=None,
+        )
+    )
+
+
+@pytest.mark.parametrize(
+    "content",
+    [
+        (
+            "The     quick brown fox.\n"
+            "\n\n\n\n"
+            "Jumps over the lazy dog.   \n"
+            "Single linebreak above."
+        ),
+        (
+            "\n   \n"
+            "The quick brown fox.  \n\n"
+            "          Jumps over the lazy dog   .  \n"
+            "Single linebreak above. \n  \n \n"
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("template_class", "expected"),
+    [
+        (
+            SMSBodyPreviewTemplate,
+            (
+                "The quick brown fox.\n"
+                "\n"
+                "Jumps over the lazy dog.\n"
+                "Single linebreak above."
+            ),
+        ),
+        (
+            SMSMessageTemplate,
+            (
+                "The quick brown fox.\n"
+                "\n"
+                "Jumps over the lazy dog.\n"
+                "Single linebreak above."
+            ),
+        ),
+        (
+            SMSPreviewTemplate,
+            (
+                "\n\n"
+                '<div class="sms-message-wrapper">\n'
+                "  The quick brown fox.<br><br>Jumps over the lazy dog.<br>Single linebreak above.\n"
+                "</div>"
+            ),
+        ),
+        (
+            BroadcastPreviewTemplate,
+            (
+                '<div class="broadcast-message-wrapper">\n'
+                '  <h2 class="broadcast-message-heading">\n'
+                '    <svg class="broadcast-message-heading__icon" xmlns="http://www.w3.org/2000/svg" '
+                'width="22" height="18.23" viewBox="0 0 17.5 14.5" aria-hidden="true">\n'
+                '      <path fill-rule="evenodd"\n'
+                '            fill="currentcolor"\n'
+                '            d="M8.6 0L0 14.5h17.5L8.6 0zm.2 10.3c-.8 0-1.5.7-1.5 1.5s.7 1.5 1.5 1.5 1.5-.7 '
+                "1.5-1.5c-.1-.8-.7-1.5-1.5-1.5zm1.3-4.5c.1.8-.3 3.2-.3 3.2h-2s-.5-2.3-.5-3c0 0 0-1.6 1.4-1.6s1.4 "
+                '1.4 1.4 1.4z"\n'
+                "      />\n"
+                "    </svg>\n"
+                "    Emergency alert\n"
+                "  </h2>\n"
+                "  The quick brown fox.<br><br>Jumps over the lazy dog.<br>Single linebreak above.\n"
+                "</div>"
+            ),
+        ),
+    ],
+)
+def test_text_messages_collapse_consecutive_whitespace(
+    template_class,
+    content,
+    expected,
+):
+    template = template_class(
+        {"content": content, "template_type": template_class.template_type}
+    )
+    assert str(template) == expected
+    assert (
+        template.content_count
+        == 70
+        == len(
+            "The quick brown fox.\n"
+            "\n"
+            "Jumps over the lazy dog.\n"
+            "Single linebreak above."
+        )
+    )
+
+
+def test_letter_preview_template_lazy_loads_images():
+    page = BeautifulSoup(
+        str(
+            LetterImageTemplate(
+                {"content": "Content", "subject": "Subject", "template_type": "letter"},
+                image_url="http://example.com/endpoint.png",
+                page_count=3,
+            )
+        ),
+        "html.parser",
+    )
+    assert [(img["src"], img["loading"]) for img in page.select("img")] == [
+        ("http://example.com/endpoint.png?page=1", "eager"),
+        ("http://example.com/endpoint.png?page=2", "lazy"),
+        ("http://example.com/endpoint.png?page=3", "lazy"),
+    ]
+
+
+def test_broadcast_message_from_content():
+    template = BroadcastMessageTemplate.from_content("test content")
+
+    assert isinstance(template, BroadcastMessageTemplate)
+    assert str(template) == "test content"
+
+
+def test_broadcast_message_from_event():
+    event = {
+        "transmitted_content": {"body": "test content"},
+    }
+    template = BroadcastMessageTemplate.from_event(event)
+
+    assert isinstance(template, BroadcastMessageTemplate)
+    assert str(template) == "test content"
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    ("content", "expected_non_gsm", "expected_max", "expected_too_long"),
+    [
+        (
+            "a" * 1395,
+            set(),
+            1395,
+            False,
+        ),
+        (
+            "a" * 1396,
+            set(),
+            1395,
+            True,
+        ),
+        (
+            "ŵ" * 615,
+            {"ŵ"},
+            615,
+            False,
+        ),
+        (
+            # Using a non-GSM character reduces the max content count
+            "ŵ" * 616,
+            {"ŵ"},
+            615,
+            True,
+        ),
+        (
+            "[" * 697,  # Half of 1395, rounded down
+            set(),
+            1395,
+            False,
+        ),
+        (
+            "[" * 698,  # Half of 1395, rounded up
+            set(),
+            1395,
+            True,
+        ),
+        (
+            # In USC2 extended GSM characters are not double counted
+            "ŵ]" * 307,
+            {"ŵ"},
+            615,
+            False,
+        ),
+    ],
+)
+def test_broadcast_message_content_count(
+    content, expected_non_gsm, expected_max, expected_too_long, template_class
+):
+    template = template_class(
+        {
+            "template_type": "broadcast",
+            "content": content,
+        }
+    )
+    assert template.non_gsm_characters == expected_non_gsm
+    assert template.max_content_count == expected_max
+    assert template.content_too_long is expected_too_long
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize("content", ("^{}\\[~]|€"))
+def test_broadcast_message_double_counts_extended_gsm(
+    content,
+    template_class,
+):
+    template = template_class(
+        {
+            "template_type": "broadcast",
+            "content": content,
+        }
+    )
+    assert template.encoded_content_count == 2
+    assert template.max_content_count == 1_395
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize(
+    "content", ("ÁÍÓÚẂÝ" "ËÏẄŸ" "ÂÊÎÔÛŴŶ" "ÀÈÌÒẀÙỲ" "áíóúẃý" "ëïẅÿ" "âêîôûŵŷ" "ẁỳ")
+)
+def test_broadcast_message_single_counts_diacritics_in_extended_gsm(
+    content,
+    template_class,
+):
+    template = template_class(
+        {
+            "template_type": "broadcast",
+            "content": content,
+        }
+    )
+    assert template.encoded_content_count == 1
+    assert template.max_content_count == 615
+
+
+@pytest.mark.parametrize(
+    "template_class",
+    [
+        BroadcastMessageTemplate,
+        BroadcastPreviewTemplate,
+    ],
+)
+@pytest.mark.parametrize("content", ("ÄÖÜ" "É" "äöü" "é" "àèìòù"))
+def test_broadcast_message_single_counts_diacritics_in_gsm(
+    content,
+    template_class,
+):
+    template = template_class(
+        {
+            "template_type": "broadcast",
+            "content": content,
+        }
+    )
+    assert template.encoded_content_count == 1
+    assert template.max_content_count == 1_395
diff --git a/tests/notifications_utils/test_timezones.py b/tests/notifications_utils/test_timezones.py
new file mode 100644
index 0000000000..d92bb54b75
--- /dev/null
+++ b/tests/notifications_utils/test_timezones.py
@@ -0,0 +1,36 @@
+import dateutil
+import pytest
+
+from notifications_utils.timezones import utc_string_to_aware_gmt_datetime
+
+
+@pytest.mark.parametrize(
+    ("input_value", "expectation"),
+    [
+        ("foo", pytest.raises(dateutil.parser._parser.ParserError)),
+        (100, pytest.raises(TypeError)),
+        (True, pytest.raises(TypeError)),
+        (False, pytest.raises(TypeError)),
+        (None, pytest.raises(TypeError)),
+    ],
+)
+def test_utc_string_to_aware_gmt_datetime_rejects_bad_input(input_value, expectation):
+    with expectation:
+        utc_string_to_aware_gmt_datetime(input_value)
+
+
+@pytest.mark.parametrize(
+    ("naive_time", "expected_aware_hour"),
+    [
+        ("2000-12-1 20:01", "15:01"),
+        ("2000-06-1 20:01", "16:01"),
+    ],
+)
+def test_utc_string_to_aware_gmt_datetime_handles_summer_and_winter(
+    naive_time,
+    expected_aware_hour,
+):
+    assert (
+        utc_string_to_aware_gmt_datetime(naive_time).strftime("%H:%M")
+        == expected_aware_hour
+    )
diff --git a/tests/notifications_utils/test_url_safe_tokens.py b/tests/notifications_utils/test_url_safe_tokens.py
new file mode 100644
index 0000000000..68eb9c9624
--- /dev/null
+++ b/tests/notifications_utils/test_url_safe_tokens.py
@@ -0,0 +1,36 @@
+import urllib
+
+import pytest
+from itsdangerous import BadSignature, SignatureExpired
+
+from notifications_utils.url_safe_token import check_token, generate_token
+
+
+def test_should_return_payload_from_signed_token():
+    payload = "email@something.com"
+    token = generate_token(payload, "secret-key", "dangerous-salt")
+    token = urllib.parse.unquote(token)
+    assert payload == check_token(token, "secret-key", "dangerous-salt", 30)
+
+
+def test_should_throw_exception_when_token_is_tampered_with():
+    import uuid
+
+    token = generate_token(str(uuid.uuid4()), "secret-key", "dangerous-salt")
+    try:
+        check_token(token + "qerqwer", "secret-key", "dangerous-salt", 30)
+        pytest.fail("Expected a BadSignature")
+    except BadSignature:
+        pass
+
+
+def test_return_none_when_token_is_expired():
+    max_age = -1000
+    payload = "some_payload"
+    token = generate_token(payload, "secret-key", "dangerous-salt")
+    token = urllib.parse.unquote(token)
+    try:
+        assert check_token(token, "secret-key", "dangerous-salt", max_age) is None
+        pytest.fail("Expected a SignatureExpired exception")
+    except SignatureExpired:
+        pass