diff --git a/README.md b/README.md
index 5f8a320..cc98965 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,9 @@ Provides additional configuration, styling and components for the Drupal Webform
 * LocalGov Forms Date - A date input field based on the [GDS Date Input pattern](https://design-system.service.gov.uk/components/date-input/)
 * LocalGov address lookup - Webform element with a configurable address lookup backend.  Geocoder plugins act as backends.
 
+## Plugins
+- Personally Identifiable Information (PII) redactor from Webform submissions: At the moment, a plugin manager `plugin.manager.pii_redactor` and a sample plugin are provided.
+
 ## Dependencies
 The geocoder-php/nominatim-provider package is necessary to run automated tests:
 ```
@@ -23,4 +26,3 @@ To avoid the configuration being removed by deployments, install the [Config ign
 webform.webform.*
 webform.webform_options.*
 ```
-
diff --git a/js/address_change.js b/js/address_change.js
index dbc72e0..51b2eb2 100644
--- a/js/address_change.js
+++ b/js/address_change.js
@@ -58,6 +58,7 @@
    * Populate Central Hub Selected Address
    *
    * Adds the selected address to drupalSettings.centralhub.selectedAddress.
+   *
    * @param  {jQuery} selectList
    *   Address selectlist element.
    */
@@ -87,7 +88,7 @@
         var searchButton = addressLookupElement.find('.js-address-searchbutton');
         var selectListContainer = addressLookupElement.find('.js-address-select-container');
         var selectList = selectListContainer.find('.js-address-select');
-        var error = selectListContainer.find('.js-address-error');
+        var error = selectListContainer.find('.js-address-error, .error');
 
         // Change the search button to normal button.
         searchButton.attr('type', 'button');
@@ -154,7 +155,7 @@
         var searchButton = addressLookupElement.find('.js-address-searchbutton');
         var selectListContainer = addressLookupElement.find('.js-address-select-container');
         var selectList = selectListContainer.find('.js-address-select');
-        var error = selectListContainer.find('.js-address-error');
+        var error = selectListContainer.find('.js-address-error, .error');
         var resetButton = addressLookupElement.find('.js-reset-address');
         var manualButton = addressLookupElement.find('.js-manual-address');
         var manualAddressContainer = addressLookupElement.find('+ .js-address-entry-container');
diff --git a/js/address_select.js b/js/address_select.js
index 0498c72..e51513d 100644
--- a/js/address_select.js
+++ b/js/address_select.js
@@ -44,7 +44,6 @@
   function hideManualAddress(centralHubElement, type, settings) {
     var manualAddressContainer = centralHubElement.find('.js-address-entry-container');
     var manualButton = centralHubElement.find('.js-manual-address');
-    var addressSelectContainer = centralHubElement.find('.js-address-select-container');
     manualAddressContainer.addClass('hidden');
 
     if (type == 'hard') {
@@ -63,6 +62,7 @@
 
   /**
    * Show the manual address form elements.
+   *
    * @param  {jQuery} centralHubElement
    *   Centralhub address element.
    */
@@ -70,17 +70,10 @@
     var manualAddressContainer = centralHubElement.find('.js-address-entry-container');
     var manualButton = centralHubElement.find('.js-manual-address');
     var addressSelectContainer = centralHubElement.find('.js-address-select-container');
-    var addressSelect = addressSelectContainer.find('select');
     var searchElement = centralHubElement.find('.js-address-searchstring');
     var addressError = addressSelectContainer.find('.js-address-error');
     manualAddressContainer.removeClass('hidden');
-    // manualAddressContainer.find('input').val('');
     manualButton.hide();
-    // addressSelectContainer.addClass('hidden');
-    // addressSelect.val('0');
-    // Clear the search element when entering a manual address.
-    // This is to pass validation.
-    // searchElement.val('');
     // Remove the error element when making a manual address.
     addressError.remove();
   }
@@ -174,7 +167,6 @@
         central_hub_webform_address_container.find('input.js-localgov-forms-webform-uk-address--' + value).val(addressSelected[value]);
       });
 
-      // hideManualAddress(centralHubElement, 'soft');
       showManualAddress(centralHubElement);
     } else if ($(this).val() == 0) {
       // If choosing the empty option, clear out the address fields.
@@ -211,9 +203,6 @@
           hideManualAddress(centralHubElement, 'soft', settings);
         }
 
-        // centralHubElement.find('.js-address-searchstring').change(function() {
-        //   hideManualAddress(centralHubElement, 'hard');
-        // });
         centralHubElement.find('.js-reset-address').click(function () {
           hideManualAddress(centralHubElement, 'hard', settings);
         });
diff --git a/localgov_forms.services.yml b/localgov_forms.services.yml
index 233229d..959c86b 100644
--- a/localgov_forms.services.yml
+++ b/localgov_forms.services.yml
@@ -6,3 +6,8 @@ services:
   localgov_forms.address_lookup:
     class: Drupal\localgov_forms\AddressLookup
     arguments: ['@geocoder', '@localgov_forms.geocoder_selection']
+
+  # Plugin manager service for PII redaction from Webform submissions.
+  plugin.manager.pii_redactor:
+    class: Drupal\localgov_forms\Plugin\PIIRedactorPluginManager
+    parent: default_plugin_manager
diff --git a/modules/localgov_forms_lts/README.md b/modules/localgov_forms_lts/README.md
new file mode 100644
index 0000000..b0ae34b
--- /dev/null
+++ b/modules/localgov_forms_lts/README.md
@@ -0,0 +1,108 @@
+## Long term storage for Webform submissions
+This module copies Webform submissions to a separate database for Long Term Storage (LTS).  The LTS database can then be used for data warehousing needs such as reporting and analysis.  Optionally, Personally Identifiable Information (PII) can be redacted from Webform submissions while they are copied to the LTS database.
+
+### Setup process
+- Create a database which will serve as the LTS database.
+- Declare it in Drupal's settings.php using the **localgov_forms_lts** key.  Example:
+  ```
+  $databases['localgov_forms_lts']['default'] = [
+    'database'  => 'our-long-term-storage-database',
+    'username'  => 'database-username-goes-here',
+    'password'  => 'database-password-goes-here',
+    'host'      => 'database-hostname-goes-here',
+    'port'      => '3306',
+    'driver'    => 'mysql',
+    'prefix'    => '',
+  ];
+  ```
+- Install the localgov_forms_lts submodule.
+- Check the module requirement report from Drupal's status page at `admin/reports/status`.  This should be under the **LocalGov Forms LTS** key.
+- [Optional] If all looks good in the previous step, run `drush localgov-forms-lts:copy --force` which will copy existing Webform submissions into the LTS database.
+- By default, periodic Webform submissions copying to the LTS database is disabled.  Activate it from `/admin/structure/webform/config/submissions-lts`.
+- Ensure cron is running periodically.  This will copy any new Webform submissions or changes to existing Webform submissions since the last cron run or the last `drush localgov-forms-lts:copy` run.
+- [Optional] Tell individual Webforms to purge submissions older than a chosen period.  This is configured for each Webform from its `Settings > Submissions > Submission purge settings` configuration section.
+
+### Inspection
+To inspect Webform submissions kept in Long term storage, look for the **LTS** tab in the Webform submissions listing page.  This is usually at `/admin/structure/webform/submissions/manage`.
+
+### Good to know
+- Each cron run copies 50 Webform submissions.  If your site is getting more than that many Webform submissions between subsequent cron runs, not all Webform submissions will get copied to LTS during a certain period.  If that happens, adjust cron run frequency.
+- Files attached to Webform submissions are *not* moved to LTS.
+- You can choose to redact elements with Personally Identifiable Information (PII) while they are copied to the LTS database.  For that, select *Best effort PII redactor* (or another redactor) from the `PII redactor plugin` dropdown in the LTS config page at `/admin/structure/webform/config/submissions-lts`.  At the moment, this plugin redacts all name, email, telephone, number, and various address type elements.  Additionally, any text or radio or checkbox element whose machine name (AKA Key) contains the following also gets redacted: name, mail, phone, contact_number, date_of_birth, dob_, personal_, title, nino, passport, postcode, address, serial_number, reg_number, pcn_, and driver_.
+- If you are using this module in multiple instances of the same site (e.g. dev/stage/live), ensure that the database settings array points to *different* databases.  Alternatively, disable copying for the non-live environments from `/admin/structure/webform/config/submissions-lts`.  The relevant settings `localgov_forms_lts.settings:is_copying_enabled` can be [overridden](https://www.drupal.org/docs/drupal-apis/configuration-api/configuration-override-system#s-global-overrides) from settings.php.  The [config_split](https://www.drupal.org/project/config_split) module can be handy as well.
+- This module is currently in experimental stage.
+
+### Todo
+- Removal of Webform submissions from LTS after a predefined period e.g. 5 years.
+
+### Testing in DDEV
+
+To set up testing in ddev, we'll need to set up a second database.
+
+There are a few ways to do this, but the following seems to work.
+
+#### 1. Add a post-start hook to your .ddev/config.yml
+
+Edit `.ddev/config.yml` and add the following to create a new database on start.
+
+```
+hooks:
+  post-start:
+  - exec: mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS localgov_forms_lts; GRANT ALL ON localgov_forms_lts.* to 'db'@'%';"
+    service: db
+```
+
+#### 2. Add the database connection string to settings.php:
+
+Edit sites/default/settings.php and add a new database connection string at the
+end of the file.
+
+```
+// Database connection for localgov_forms_lts.
+$databases['localgov_forms_lts']['default'] = [
+  'database'  => 'localgov_forms_lts',
+  'username'  => 'db',
+  'password'  => 'db',
+  'host'      => 'db',
+  'port'      => '3306',
+  'driver'    => 'mysql',
+  'prefix'    => '',
+];
+```
+
+#### 3. Install Adminer
+
+Adminer is useful if you want to inspect databases and tables.
+
+```
+ddev get ddev/ddev-adminer
+```
+
+#### 4. Restart ddev
+
+```
+ddev restart
+```
+
+#### 5. Require and install the module.
+
+```
+ddev composer require localgovdrupal/localgov_forms
+ddev drush si localgov_forms_lts -y
+```
+
+#### 5. Make some submissions.
+
+For example, in LocalGov Drupal we tend to have a contact form at /form/contact.
+
+Make a couple of submissions there.
+
+#### 6. Run cron.
+
+ddev drush cron
+
+#### 7. Inspect the LTS tab
+
+Go to /admin/structure/webform/submissions/lts
+
+Here you should see your submissions with redacted name and email address.
diff --git a/modules/localgov_forms_lts/config/install/localgov_forms_lts.settings.yml b/modules/localgov_forms_lts/config/install/localgov_forms_lts.settings.yml
new file mode 100644
index 0000000..09fcfc7
--- /dev/null
+++ b/modules/localgov_forms_lts/config/install/localgov_forms_lts.settings.yml
@@ -0,0 +1,2 @@
+is_copying_enabled: false
+pii_redactor_plugin_id: ''
diff --git a/modules/localgov_forms_lts/config/schema/localgov_forms_lts.schema.yml b/modules/localgov_forms_lts/config/schema/localgov_forms_lts.schema.yml
new file mode 100644
index 0000000..b4af9d6
--- /dev/null
+++ b/modules/localgov_forms_lts/config/schema/localgov_forms_lts.schema.yml
@@ -0,0 +1,12 @@
+# Schema for the configuration files of the localgov_forms_lts submodule.
+
+localgov_forms_lts.settings:
+  type: config_object
+  label: 'Webform submissions LTS config'
+  mapping:
+    is_copying_enabled:
+      type: boolean
+      label: 'Is copying to LTS database enabled?'
+    pii_redactor_plugin_id:
+      type: machine_name
+      label: 'PII redactor plugin id'
diff --git a/modules/localgov_forms_lts/localgov_forms_lts.info.yml b/modules/localgov_forms_lts/localgov_forms_lts.info.yml
new file mode 100644
index 0000000..efcf787
--- /dev/null
+++ b/modules/localgov_forms_lts/localgov_forms_lts.info.yml
@@ -0,0 +1,10 @@
+name: LocalGov Forms long term storage
+type: module
+description: Long term storage for Webform submissions.
+core_version_requirement: ^10 || ^11
+php: 8.0
+package: LocalGov Drupal
+lifecycle: experimental
+
+dependencies:
+- webform:webform
diff --git a/modules/localgov_forms_lts/localgov_forms_lts.install b/modules/localgov_forms_lts/localgov_forms_lts.install
new file mode 100644
index 0000000..6994c61
--- /dev/null
+++ b/modules/localgov_forms_lts/localgov_forms_lts.install
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * @file
+ * Install and update hook implementations.
+ */
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\localgov_forms_lts\Constants;
+use Drupal\webform\WebformSubmissionStorageSchema;
+
+/**
+ * Implements hook_install().
+ *
+ * Creates all entity storage tables associated with the webform_submission
+ * entity type.
+ */
+function localgov_forms_lts_install($is_syncing): void {
+
+  if (!localgov_forms_lts_has_db()) {
+    return;
+  }
+
+  $webform_submission_schema = _localgov_forms_lts_get_webform_submission_storage_schema();
+
+  foreach ($webform_submission_schema as $table_name => $table_schema) {
+    _localgov_forms_lts_copy_table($table_name, $table_schema, db: Constants::LTS_DB_KEY);
+  }
+}
+
+/**
+ * Implements hook_requirements().
+ *
+ * Checks for the presence of the localgov_forms_lts database.
+ */
+function localgov_forms_lts_requirements($phase) {
+
+  $requirements = [
+    'localgov_forms_lts' => [
+      'title'       => t('LocalGov Forms LTS'),
+      'value'       => t('Available'),
+      'description' => t('LocalGov Forms LTS database available.'),
+      'severity'    => REQUIREMENT_OK,
+    ],
+  ];
+
+  if (!function_exists('localgov_forms_lts_has_db')) {
+    // Some necessary files have not been loaded yet during the "install" phase.
+    require_once __DIR__ . '/localgov_forms_lts.module';
+    require_once __DIR__ . '/src/Constants.php';
+  }
+
+  if (!localgov_forms_lts_has_db()) {
+    $requirements['localgov_forms_lts']['value'] = t('Unavailable');
+    $requirements['localgov_forms_lts']['description'] = t('The LocalGov Forms LTS database must exist for this module to function.');
+    $requirements['localgov_forms_lts']['severity'] = REQUIREMENT_ERROR;
+  }
+
+  return $requirements;
+}
+
+/**
+ * Extracts entity storage schema.
+ *
+ * Returns the entity storage schema for the webform_submission content entity.
+ */
+function _localgov_forms_lts_get_webform_submission_storage_schema(): array {
+
+  $entity_type_manager  = Drupal::service('entity_type.manager');
+  $entity_storage       = $entity_type_manager->getStorage('webform_submission');
+  $entity_type          = $entity_storage->getEntityType();
+  $entity_field_manager = Drupal::service('entity_field.manager');
+  $db_service           = Drupal::service('database');
+
+  // @phpstan-ignore-next-line Avoid incorrect type inference of $entity_type.
+  $entity_schema = (new class($entity_type_manager, $entity_type, $entity_storage, $db_service, $entity_field_manager) extends WebformSubmissionStorageSchema {
+
+    /**
+     * Public wrapper over protected method.
+     */
+    public function getEntitySchemaWrapper(ContentEntityTypeInterface $entity_type) {
+
+      return parent::getEntitySchema($entity_type);
+    }
+
+  })->getEntitySchemaWrapper($entity_type);
+
+  return $entity_schema;
+}
+
+/**
+ * Creates database tables.
+ */
+function _localgov_forms_lts_copy_table(string $table_name, array $table_schema, string $db): void {
+
+  $db_connection = Database::getConnection(key: $db);
+  $tx = $db_connection->startTransaction();
+
+  try {
+    $db_connection->schema()->createTable($table_name, $table_schema);
+  }
+  catch (Exception $e) {
+    $tx->rollBack();
+  }
+}
diff --git a/modules/localgov_forms_lts/localgov_forms_lts.links.task.yml b/modules/localgov_forms_lts/localgov_forms_lts.links.task.yml
new file mode 100644
index 0000000..f3ad60b
--- /dev/null
+++ b/modules/localgov_forms_lts/localgov_forms_lts.links.task.yml
@@ -0,0 +1,27 @@
+# Submissions > LTS
+entity.webform_submission.lts_collection:
+  title: 'LTS'
+  route_name: entity.webform_submission.lts_collection
+  parent_id: entity.webform_submission.collection
+  weight: 21
+
+# View
+entity.webform_submission.lts_view:
+  title: 'View'
+  route_name: entity.webform_submission.lts_view
+  base_route: entity.webform_submission.lts_view
+  weight: 1
+
+# Notes
+entity.webform_submission.lts_notes:
+  title: 'Notes'
+  route_name: entity.webform_submission.lts_notes
+  base_route: entity.webform_submission.lts_view
+  weight: 3
+
+# Config tab
+localgov_forms_lts.lts_config:
+  title: 'LTS'
+  route_name: localgov_forms_lts.lts_config
+  parent_id: webform.config
+  weight: 43
diff --git a/modules/localgov_forms_lts/localgov_forms_lts.module b/modules/localgov_forms_lts/localgov_forms_lts.module
new file mode 100644
index 0000000..18ed91c
--- /dev/null
+++ b/modules/localgov_forms_lts/localgov_forms_lts.module
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * @file
+ * Hook implementations.
+ */
+
+declare(strict_types=1);
+
+use Drupal\Component\Render\MarkupInterface;
+use Drupal\Core\Database\Database;
+use Drupal\localgov_forms_lts\Constants;
+use Drupal\localgov_forms_lts\LtsCopy;
+
+/**
+ * Tests presence of LTS database.
+ */
+function localgov_forms_lts_has_db(): bool {
+
+  try {
+    Database::getConnection(key: Constants::LTS_DB_KEY);
+  }
+  catch (Exception $e) {
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+/**
+ * Implements hook_cron().
+ */
+function localgov_forms_lts_cron() {
+
+  localgov_forms_lts_copy_recently_added_n_updated_subs();
+}
+
+/**
+ * Copies Webform submissions.
+ *
+ * Copies Webform submissions added or updated since last run to the lts
+ * storage.  At most 50 Webform submissions are copied.
+ */
+function localgov_forms_lts_copy_recently_added_n_updated_subs() :void {
+
+  $service_container = Drupal::service('service_container');
+  $lts_config        = $service_container->get('config.factory')->get(Constants::LTS_CONFIG_ID);
+
+  $is_copying_enabled = $lts_config->get(Constants::LTS_CONFIG_COPY_STATE);
+  if (!$is_copying_enabled) {
+    return;
+  }
+
+  $pii_redactor_plugin_id = $lts_config->get(Constants::LTS_CONFIG_PII_REDACTOR_PLUGIN_ID);
+  $pii_redactor_plugin    = ($pii_redactor_plugin_id && $service_container->has(Constants::PII_REDACTOR_PLUGIN_MANAGER)) ? $service_container->get(Constants::PII_REDACTOR_PLUGIN_MANAGER)->createInstance($pii_redactor_plugin_id) : NULL;
+
+  $lts_copy_obj = LtsCopy::create(Drupal::getContainer(), $pii_redactor_plugin);
+  $copy_results = $lts_copy_obj->copy();
+
+  $feedback_msg = _localgov_forms_lts_prepare_feedback_msg($copy_results);
+  Drupal::service('logger.factory')
+    ->get(Constants::LTS_LOGGER_CHANNEL_ID)
+    ->info($feedback_msg);
+}
+
+/**
+ * Prepares feedback message for copying.
+ *
+ * The feedback message is prepared from the outcome of Webform submission copy
+ * operations.
+ */
+function _localgov_forms_lts_prepare_feedback_msg(array $copy_results): MarkupInterface {
+
+  $copy_successes = array_filter($copy_results);
+  $copy_failures  = array_diff_key($copy_results, $copy_successes);
+
+  $successfully_copied_sid_list   = array_keys($copy_successes);
+  $unsuccessfully_copied_sid_list = array_keys($copy_failures);
+
+  $successfully_copied_sid_list_msg   = $successfully_copied_sid_list ? implode(', ', $successfully_copied_sid_list) : 'None';
+  $unsuccessfully_copied_sid_list_msg = $unsuccessfully_copied_sid_list ? implode(', ', $unsuccessfully_copied_sid_list) : 'None';
+
+  $feedback_msg = t('Successfully copied Webform submission ids: %successes. :newline Failed copies: %failures.', [
+    '%successes' => $successfully_copied_sid_list_msg,
+    '%failures'  => $unsuccessfully_copied_sid_list_msg,
+    ':newline'   => PHP_EOL,
+  ]);
+
+  return $feedback_msg;
+}
diff --git a/modules/localgov_forms_lts/localgov_forms_lts.routing.yml b/modules/localgov_forms_lts/localgov_forms_lts.routing.yml
new file mode 100644
index 0000000..29d41de
--- /dev/null
+++ b/modules/localgov_forms_lts/localgov_forms_lts.routing.yml
@@ -0,0 +1,38 @@
+# List of Webform submissions from Long term storage.
+entity.webform_submission.lts_collection:
+  path: '/admin/structure/webform/submissions/lts/{submission_view}'
+  defaults:
+    _controller: '\Drupal\localgov_forms_lts\WebformSubmissionLtsListBuilder::render'
+    _title: 'Webforms: Submissions'
+    submission_view: ''
+  requirements:
+    _custom_access: '\Drupal\webform\Access\WebformAccountAccess:checkSubmissionAccess'
+
+# Individual Webform submission view from Long term storage.
+entity.webform_submission.lts_view:
+  path: '/admin/structure/webform/manage/{webform}/submission/{webform_sid}/lts'
+  defaults:
+    _controller: '\Drupal\localgov_forms_lts\Controller\WebformSubmissionLtsViewController::viewFromLts'
+    _title_callback: '\Drupal\localgov_forms_lts\Controller\WebformSubmissionLtsViewController::titleFromLts'
+    view_mode: 'html'
+  requirements:
+    _custom_access: '\Drupal\webform\Access\WebformAccountAccess:checkSubmissionAccess'
+
+# Individual Webform submission notes from Long term storage.
+entity.webform_submission.lts_notes:
+  path: '/admin/structure/webform/manage/{webform}/submission/{webform_sid}/notes/lts'
+  defaults:
+    _controller: '\Drupal\localgov_forms_lts\Controller\WebformSubmissionLtsViewController::noteViewFromLts'
+    _title_callback: '\Drupal\localgov_forms_lts\Controller\WebformSubmissionLtsViewController::titleFromLts'
+    view_mode: 'html'
+  requirements:
+    _custom_access: '\Drupal\webform\Access\WebformAccountAccess:checkSubmissionAccess'
+
+# Config form.
+localgov_forms_lts.lts_config:
+  path: '/admin/structure/webform/config/submissions-lts'
+  defaults:
+    _form: '\Drupal\localgov_forms_lts\Form\LTSSettingsForm'
+    _title: 'Webform submissions LTS'
+  requirements:
+    _permission: 'administer site configuration'
diff --git a/modules/localgov_forms_lts/localgov_forms_lts.services.yml b/modules/localgov_forms_lts/localgov_forms_lts.services.yml
new file mode 100644
index 0000000..6440676
--- /dev/null
+++ b/modules/localgov_forms_lts/localgov_forms_lts.services.yml
@@ -0,0 +1,12 @@
+services:
+  localgov_forms_lts_db:
+    class: Drupal\Core\Database\Connection
+    factory: Drupal\Core\Database\Database::getConnection
+    arguments:
+      $key: localgov_forms_lts
+
+  localgov_forms_lts.query.sql:
+    class: Drupal\Core\Entity\Query\Sql\QueryFactory
+    arguments: ['@localgov_forms_lts_db']
+    tags:
+      - { name: backend_overridable }
diff --git a/modules/localgov_forms_lts/src/Constants.php b/modules/localgov_forms_lts/src/Constants.php
new file mode 100644
index 0000000..dc41f3c
--- /dev/null
+++ b/modules/localgov_forms_lts/src/Constants.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms_lts;
+
+/**
+ * Constants for this module.
+ */
+class Constants {
+
+  /**
+   * Used in settings.php for database declaration.
+   */
+  const LTS_DB_KEY = 'localgov_forms_lts';
+
+  /**
+   * Relevant key value store name.
+   */
+  const LTS_KEYVALUE_STORE_ID = 'localgov_forms_lts';
+
+  /**
+   * Relevant Logger channel.
+   */
+  const LTS_LOGGER_CHANNEL_ID = 'localgov_forms_lts';
+
+  /**
+   * When did the last copied Webform submission change?
+   */
+  const LAST_CHANGE_TIMESTAMP = 'last_copied_webform_sub_changed_ts';
+
+  /**
+   * LTS database-based Webform submission entity query service.
+   */
+  const LTS_ENTITY_QUERY_SERVICE = 'localgov_forms_lts.query.sql';
+
+  /**
+   * How many Webform submissions to copy at a time.
+   *
+   * Useful in batch jobs.
+   */
+  const COPY_LIMIT = 50;
+
+  /**
+   * Cache Id prefix.
+   *
+   * For default storage, the prefix is "values".  We need to differentiate this
+   * for LTS.
+   *
+   * @see EntityStorageBase::buildCacheId()
+   */
+  const LTS_CACHE_ID_PREFIX = 'lts_values';
+
+  /**
+   * Drupal config id for this module.
+   */
+  const LTS_CONFIG_ID = 'localgov_forms_lts.settings';
+
+  const LTS_CONFIG_COPY_STATE = 'is_copying_enabled';
+
+  const LTS_CONFIG_PII_REDACTOR_PLUGIN_ID = 'pii_redactor_plugin_id';
+
+  /**
+   * Service name for the PII redactor plugin manager.
+   *
+   * @see localgov_forms.services.yml
+   */
+  const PII_REDACTOR_PLUGIN_MANAGER = 'plugin.manager.pii_redactor';
+
+}
diff --git a/modules/localgov_forms_lts/src/Controller/WebformSubmissionLtsViewController.php b/modules/localgov_forms_lts/src/Controller/WebformSubmissionLtsViewController.php
new file mode 100644
index 0000000..8f2bca0
--- /dev/null
+++ b/modules/localgov_forms_lts/src/Controller/WebformSubmissionLtsViewController.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms_lts\Controller;
+
+use Drupal\localgov_forms_lts\LtsStorageForWebformSubmission;
+use Drupal\webform\Controller\WebformSubmissionViewController;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Webform submission view as seen in Long term storage.
+ */
+class WebformSubmissionLtsViewController extends WebformSubmissionViewController {
+
+  /**
+   * Webform submission view callback.
+   *
+   * Loads the Webform submission from Long term storage.
+   */
+  public function viewFromLts(int $webform_sid, $view_mode = 'default', $langcode = NULL) {
+
+    $webform_sub = $this->ltsStorage->load($webform_sid);
+    return parent::view($webform_sub, $view_mode, $langcode);
+  }
+
+  /**
+   * Webform submission notes callback.
+   *
+   * Loads the Webform submission from Long term storage.
+   */
+  public function noteViewFromLts(int $webform_sid, $view_mode = 'default', $langcode = NULL) {
+
+    $webform_sub = $this->ltsStorage->load($webform_sid);
+    return [
+      '#markup' => '<pre>' . $webform_sub->getNotes() . '</pre>',
+    ];
+  }
+
+  /**
+   * Entity title callback.
+   *
+   * Loads the Webform submission from Long term storage.
+   */
+  public function titleFromLts(int $webform_sid, $duplicate = FALSE) {
+
+    $webform_sub = $this->ltsStorage->load($webform_sid);
+    return parent::title($webform_sub, $duplicate);
+  }
+
+  /**
+   * Factory.
+   */
+  public static function create(ContainerInterface $container) {
+
+    $instance = parent::create($container);
+
+    $webform_sub_entity_type = $container->get('entity_type.manager')->getDefinition('webform_submission');
+    $instance->ltsStorage = LtsStorageForWebformSubmission::createInstance($container, $webform_sub_entity_type);
+
+    return $instance;
+  }
+
+  /**
+   * Database service for the Long term storage database.
+   *
+   * @var Drupal\webform\WebformSubmissionStorageInterface
+   */
+  protected $ltsStorage;
+
+}
diff --git a/modules/localgov_forms_lts/src/Drush/Commands/LocalgovFormsLtsCommands.php b/modules/localgov_forms_lts/src/Drush/Commands/LocalgovFormsLtsCommands.php
new file mode 100644
index 0000000..667609f
--- /dev/null
+++ b/modules/localgov_forms_lts/src/Drush/Commands/LocalgovFormsLtsCommands.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\localgov_forms_lts\Drush\Commands;
+
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Core\Batch\BatchBuilder;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\localgov_forms_lts\Constants;
+use Drupal\localgov_forms_lts\LtsCopy;
+use Drush\Attributes as CLI;
+use Drush\Commands\AutowireTrait;
+use Drush\Commands\DrushCommands;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * A Drush commandfile for LTS management.
+ *
+ * Commands:
+ * - copy: Copies all existing Webform submissions to the LTS.
+ */
+final class LocalgovFormsLtsCommands extends DrushCommands {
+
+  use AutowireTrait;
+
+  /**
+   * Drush command to copy all Webform submissions to LTS.
+   */
+  #[CLI\Command(name: 'localgov-forms-lts:copy', aliases: ['forms-lts-copy'])]
+  #[CLI\Option(name: 'force', description: 'Ignore copy disablement config and copy anyway.  Useful immediately after module installation.')]
+  #[CLI\Usage(name: 'localgov-forms-lts:copy', description: 'Copies all existing Webform submissions.')]
+  public function copy($options = ['force' => FALSE]) {
+
+    if (!localgov_forms_lts_has_db()) {
+      $this->logger->error(dt('The LocalGov Forms LTS database must exist for this Drush command to function.'));
+      return;
+    }
+
+    $is_proceed = $options['force'] ?: $this->configFactory->get(Constants::LTS_CONFIG_ID)?->get(Constants::LTS_CONFIG_COPY_STATE);
+    if (!$is_proceed) {
+      $this->logger->warning(dt('Copying is disabled in localgov_forms_lts module configuration.  Use --force to override.'));
+      return;
+    }
+
+    $pii_redactor_plugin_id = $this->configFactory->get(Constants::LTS_CONFIG_ID)?->get(Constants::LTS_CONFIG_PII_REDACTOR_PLUGIN_ID);
+    $pii_redactor_plugin    = ($pii_redactor_plugin_id && $this->serviceContainer->has(Constants::PII_REDACTOR_PLUGIN_MANAGER)) ? $this->serviceContainer->get(Constants::PII_REDACTOR_PLUGIN_MANAGER)->createInstance($pii_redactor_plugin_id) : NULL;
+
+    $lts_copy_obj = LtsCopy::create(\Drupal::getContainer(), $pii_redactor_plugin);
+    $webform_sub_ids_to_copy = $lts_copy_obj->findCopyTargets();
+    $batch_count = ceil(count($webform_sub_ids_to_copy) / Constants::COPY_LIMIT);
+
+    $batch_builder = new BatchBuilder();
+    $drupal_logger = $this->drupalLoggerFactory->get(Constants::LTS_LOGGER_CHANNEL_ID);
+    for ($i = 0; $i < $batch_count; $i++) {
+      $batch_builder->addOperation([self::class, 'copyInBatch'], [
+        $pii_redactor_plugin,
+        $drupal_logger,
+      ]);
+    }
+
+    batch_set($batch_builder->toArray());
+    drush_backend_batch_process();
+
+    // Info messages are not appearing in the console, so settling for Notices.
+    $this->logger->notice('Batch operation for copying Webform submissions to Long term storage ends.');
+  }
+
+  /**
+   * Batch operation callback.
+   *
+   * Copies a fixed number of Webform submissions to LTS.
+   */
+  public static function copyInBatch(?PluginInspectionInterface $pii_redactor_plugin, LoggerInterface $drupal_logger, &$context) {
+
+    $lts_copy_obj = LtsCopy::create(\Drupal::getContainer(), $pii_redactor_plugin);
+    $copy_results = $lts_copy_obj->copy();
+
+    $feedback = _localgov_forms_lts_prepare_feedback_msg($copy_results);
+    $drupal_logger->info($feedback);
+
+    $context['results'][] = $copy_results;
+    $context['message'] = $feedback;
+  }
+
+  /**
+   * Constructs a LocalgovFormsLtsCommands object.
+   */
+  public function __construct(
+    private readonly ConfigFactoryInterface $configFactory,
+    private readonly LoggerChannelFactoryInterface $drupalLoggerFactory,
+    private readonly ContainerInterface $serviceContainer,
+  ) {
+    parent::__construct();
+  }
+
+}
diff --git a/modules/localgov_forms_lts/src/Form/LTSSettingsForm.php b/modules/localgov_forms_lts/src/Form/LTSSettingsForm.php
new file mode 100644
index 0000000..09bbfd4
--- /dev/null
+++ b/modules/localgov_forms_lts/src/Form/LTSSettingsForm.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\localgov_forms_lts\Form;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Form\RedundantEditableConfigNamesTrait;
+use Drupal\localgov_forms_lts\Constants;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Config form for storing Webform submissions in the LTS database.
+ */
+class LTSSettingsForm extends ConfigFormBase {
+
+  use RedundantEditableConfigNamesTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+
+    $form[Constants::LTS_CONFIG_COPY_STATE] = [
+      '#type'          => 'radios',
+      '#title'         => $this->t('Activate?'),
+      '#description'   => $this->t('Activates copying Webform submissions to the Long Term Storage (LTS) database.'),
+      '#config_target' => Constants::LTS_CONFIG_ID . ':' . Constants::LTS_CONFIG_COPY_STATE,
+      '#options'       => [
+        TRUE  => $this->t('Yes'),
+        FALSE => $this->t('No'),
+      ],
+    ];
+
+    $pii_redactor_plugin_id_list = $this->optionalPIIRedactorPluginManager ? array_map(fn(array $def): string => $def['label'], $this->optionalPIIRedactorPluginManager->getDefinitions()) : [];
+    $form[Constants::LTS_CONFIG_PII_REDACTOR_PLUGIN_ID] = [
+      '#type'          => 'select',
+      '#title'         => $this->t('PII redactor plugin'),
+      '#description'   => $this->t('Select a plugin to redact Personally Identifiable Information (PII) while copying to LTS database.'),
+      '#config_target' => Constants::LTS_CONFIG_ID . ':' . Constants::LTS_CONFIG_PII_REDACTOR_PLUGIN_ID,
+      '#options'       => $pii_redactor_plugin_id_list,
+      '#empty_value'   => '',
+    ];
+
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+
+    return 'localgov_forms_lts_settings';
+  }
+
+  /**
+   * Keeps track of the optional PII redactor plugin manager.
+   */
+  public function __construct(protected ?PluginManagerInterface $optionalPIIRedactorPluginManager) {}
+
+  /**
+   * Factory.
+   *
+   * If the PII redactor plugin manager is available, passes it to the
+   * constructor.
+   */
+  public static function create(ContainerInterface $container) {
+
+    $pii_redactor_plugin_manager = $container->has(Constants::PII_REDACTOR_PLUGIN_MANAGER) ? $container->get(Constants::PII_REDACTOR_PLUGIN_MANAGER) : NULL;
+
+    return new static($pii_redactor_plugin_manager);
+  }
+
+}
diff --git a/modules/localgov_forms_lts/src/LtsCopy.php b/modules/localgov_forms_lts/src/LtsCopy.php
new file mode 100644
index 0000000..afdfa2f
--- /dev/null
+++ b/modules/localgov_forms_lts/src/LtsCopy.php
@@ -0,0 +1,209 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms_lts;
+
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\webform\WebformSubmissionStorageInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Copies Webform submissions to Long term storage.
+ */
+class LtsCopy implements ContainerInjectionInterface {
+
+  /**
+   * Copies Webform submissions to Long term storage.
+   *
+   * Copies Webform submissions added or edited since the last copy
+   * operation.  Redacts Personally Identifiable Information (PII) from Webform
+   * submissions before copying.
+   *
+   * By default, 50 Webform submissions are copied.
+   */
+  public function copy(int $count = Constants::COPY_LIMIT) :array {
+
+    $last_copied_webform_sub_id = $this->findLastCopiedSubId();
+    $webform_subs_to_copy       = $this->findCopyTargets($count);
+
+    $copy_results = [];
+    $has_copied   = FALSE;
+    foreach ($webform_subs_to_copy as $webform_sub_id) {
+      $is_new_webform_sub = $webform_sub_id > $last_copied_webform_sub_id;
+      $copy_results[$webform_sub_id] = $this->copySub((int) $webform_sub_id, $is_new_webform_sub);
+      $has_copied = TRUE;
+    }
+
+    if ($has_copied) {
+      $this->setLatestUpdateTimestamp($copy_results);
+    }
+
+    return $copy_results;
+  }
+
+  /**
+   * Saves a single webform submission in LTS database.
+   */
+  public function copySub(int $webform_sub_id, bool $is_new_webform_sub) :bool {
+
+    $webform_sub = $this->webformSubStorage->load($webform_sub_id);
+
+    if ($this->optionalPIIRedactionPlugin) {
+      $this->optionalPIIRedactionPlugin->redact($webform_sub);
+    }
+
+    $db_connection = $this->ltsStorage->getDatabaseConnection();
+    $tx = $db_connection->startTransaction();
+
+    try {
+      if ($is_new_webform_sub) {
+        $this->ltsStorage->resave($webform_sub->enforceIsNew());
+      }
+      else {
+        $this->ltsStorage->resave($webform_sub);
+      }
+    }
+    catch (\Exception $e) {
+      $tx->rollBack();
+
+      $this->ltsLogger->error('Failed to add/edit Webform submission: %sub-id', [
+        '%sub-id' => $webform_sub_id,
+      ]);
+
+      return FALSE;
+    }
+
+    return TRUE;
+  }
+
+  /**
+   * Finds last copied Webform submission's id.
+   */
+  public function findLastCopiedSubId() :int {
+
+    $last_copied_webform_sub_id_raw = $this->ltsStorage->getAggregateQuery()
+      ->accessCheck(FALSE)
+      ->aggregate('sid', 'MAX')
+      ->execute();
+    $last_copied_webform_sub_id = $last_copied_webform_sub_id_raw[0]['sid_max'] ?? 0;
+    return (int) $last_copied_webform_sub_id;
+  }
+
+  /**
+   * Finds Webform submissions to copy.
+   *
+   * These are the Webform submissions that have been added or edited since the
+   * last copy operation.
+   *
+   * For offset to work, *both* parameters must be provided with nonnegative
+   * values.
+   */
+  public function findCopyTargets(int $count = -1) :array {
+
+    $last_copied_webform_sub_changed_ts = $this->findLatestUpdateTimestamp();
+
+    $webform_subs_to_copy_query = $this->webformSubStorage
+      ->getQuery()
+      ->accessCheck(FALSE)
+      ->condition('changed', $last_copied_webform_sub_changed_ts, '>')
+      ->condition('in_draft', 0)
+      ->sort('changed');
+
+    if ($count > -1) {
+      $webform_subs_to_copy_query->range(start: 0, length: $count);
+    }
+
+    $copy_targets = $webform_subs_to_copy_query->execute();
+    return $copy_targets;
+  }
+
+  /**
+   * When did the last copied Webform submission change?
+   */
+  public function findLatestUpdateTimestamp() :int {
+
+    $ts = (int) $this->ltsKeyValueStore->get(Constants::LAST_CHANGE_TIMESTAMP, default: 0);
+    return $ts;
+  }
+
+  /**
+   * Records time of latest copy operation.
+   */
+  public function setLatestUpdateTimestamp(array $copy_results) :void {
+
+    $last_copied_webform_sub_id = array_key_last($copy_results);
+    $last_copied_webform_sub = $this->webformSubStorage->load($last_copied_webform_sub_id);
+    $this->ltsKeyValueStore->set(Constants::LAST_CHANGE_TIMESTAMP, $last_copied_webform_sub->getChangedTime());
+  }
+
+  /**
+   * Constructor.
+   *
+   * Keeps track of dependencies.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, KeyValueFactoryInterface $key_value_factory, LoggerChannelFactoryInterface $logger_factory, WebformSubmissionStorageInterface $lts_storage, ?PluginInspectionInterface $pii_redaction_plugin = NULL) {
+
+    $this->webformSubStorage          = $entity_type_manager->getStorage('webform_submission');
+    $this->ltsStorage                 = $lts_storage;
+    $this->ltsKeyValueStore           = $key_value_factory->get(Constants::LTS_KEYVALUE_STORE_ID);
+    $this->ltsLogger                  = $logger_factory->get(Constants::LTS_LOGGER_CHANNEL_ID);
+    $this->optionalPIIRedactionPlugin = $pii_redaction_plugin;
+  }
+
+  /**
+   * Factory.
+   */
+  public static function create(ContainerInterface $container, ?PluginInspectionInterface $pii_redaction_plugin = NULL) :LtsCopy {
+
+    $webform_sub_def = $container->get('entity_type.manager')->getDefinition('webform_submission');
+
+    return new LtsCopy(
+      $container->get('entity_type.manager'),
+      $container->get('keyvalue'),
+      $container->get('logger.factory'),
+      LtsStorageForWebformSubmission::createInstance($container, $webform_sub_def),
+      $pii_redaction_plugin,
+    );
+  }
+
+  /**
+   * Key value store for LTS related state.
+   *
+   * @var Drupal\Core\KeyValueStore\KeyValueStoreInterface
+   */
+  protected $ltsKeyValueStore;
+
+  /**
+   * Entity type manager service.
+   *
+   * @var Drupal\webform\WebformSubmissionStorageInterface
+   */
+  protected $webformSubStorage;
+
+  /**
+   * Database service for the Long term storage database.
+   *
+   * @var Drupal\webform\WebformSubmissionStorageInterface
+   */
+  protected $ltsStorage;
+
+  /**
+   * Logger channel.
+   *
+   * @var Drupal\Core\Logger\LoggerChannelInterface
+   */
+  protected $ltsLogger;
+
+  /**
+   * Optional PII redactor plugin manager.
+   *
+   * @var Drupal\Component\Plugin\PluginInspectionInterface
+   */
+  protected $optionalPIIRedactionPlugin = NULL;
+
+}
diff --git a/modules/localgov_forms_lts/src/LtsStorageForWebformSubmission.php b/modules/localgov_forms_lts/src/LtsStorageForWebformSubmission.php
new file mode 100644
index 0000000..241f009
--- /dev/null
+++ b/modules/localgov_forms_lts/src/LtsStorageForWebformSubmission.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Drupal\localgov_forms_lts;
+
+use Drupal\Core\Database\Connection as DbConnection;
+use Drupal\Core\Database\Database;
+use Drupal\webform\WebformSubmissionStorage;
+
+/**
+ * Alternate storage class for Webform submission.
+ *
+ * - Saves copies of Webform submission entities in the given database instead
+ *   of the default one.
+ * - Disables persistent entity cache as LTS does not provide any.
+ *
+ * Usage:
+ * @code
+ * $lts_storage = LtsStorageForWebformSubmission::createInstance($container, $entity_type_definition);
+ * $lts_storage->setLtsDatabaseConnection($lts_db_connection); // Optional.
+ * $a_webform_submission = $lts_storage->load($a_webform_submission_id);
+ * @endcode
+ */
+class LtsStorageForWebformSubmission extends WebformSubmissionStorage {
+
+  /**
+   * Constructor wrapper.
+   *
+   * - Switches to the LTS database.
+   */
+  public function __construct(...$args) {
+
+    parent::__construct(...$args);
+
+    $this->database = Database::getConnection(key: Constants::LTS_DB_KEY);
+  }
+
+  /**
+   * Setter for database connection.
+   */
+  public function setDatabaseConnection(DbConnection $db_connection): void {
+
+    $this->database = $db_connection;
+  }
+
+  /**
+   * Getter for database connection.
+   */
+  public function getDatabaseConnection(): DbConnection {
+
+    return $this->database;
+  }
+
+  /**
+   * Disables persistent cache.
+   *
+   * Because we do not have any in LTS.
+   */
+  protected function getFromPersistentCache(?array &$ids = NULL) {
+
+    return [];
+  }
+
+  /**
+   * See above.
+   */
+  protected function setPersistentCache($entities) {}
+
+  /**
+   * Customizes cache Ids for LTS.
+   *
+   * Although we have disabled persistent cache above, cache ids are still used
+   * in static cache.
+   */
+  protected function buildCacheId($id) {
+
+    return Constants::LTS_CACHE_ID_PREFIX . ":{$this->entityTypeId}:$id";
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * Names our custom entity query service that speaks to the LTS database.
+   */
+  protected function getQueryServiceName() {
+
+    return Constants::LTS_ENTITY_QUERY_SERVICE;
+  }
+
+}
diff --git a/modules/localgov_forms_lts/src/WebformSubmissionLtsListBuilder.php b/modules/localgov_forms_lts/src/WebformSubmissionLtsListBuilder.php
new file mode 100644
index 0000000..4192694
--- /dev/null
+++ b/modules/localgov_forms_lts/src/WebformSubmissionLtsListBuilder.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms_lts;
+
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Url;
+use Drupal\webform\WebformSubmissionInterface;
+use Drupal\webform\WebformSubmissionListBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * List builder for Webform submissions.
+ *
+ * Provides a list controller for Webform submission entity data stored in
+ * Long term storage.
+ */
+class WebformSubmissionLtsListBuilder extends WebformSubmissionListBuilder implements ContainerInjectionInterface {
+
+  /**
+   * {@inheritdoc}
+   *
+   * We retain the "view" and "notes" operations only.
+   */
+  public function getDefaultOperations(EntityInterface $entity) {
+
+    if (!$entity instanceof WebformSubmissionInterface) {
+      return [];
+    }
+
+    $webform_submission    = $entity;
+    $webform_submission_id = $webform_submission->id();
+    $webform_id            = $webform_submission->getWebform()->id();
+
+    $ops = parent::getDefaultOperations($entity);
+
+    $lts_ops = [
+      'view'  => $ops['view'] ?? [],
+      'notes' => $ops['notes'] ?? [],
+    ];
+    $lts_ops['view']['url'] = Url::fromRoute('entity.webform_submission.lts_view', [
+      'webform'     => $webform_id,
+      'webform_sid' => $webform_submission_id,
+    ]);
+    $lts_ops['notes']['url'] = Url::fromRoute('entity.webform_submission.lts_notes', [
+      'webform'     => $webform_id,
+      'webform_sid' => $webform_submission_id,
+    ]);
+
+    return $lts_ops;
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * Tells the list builder to use our Webform submissions LTS storage.
+   */
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    /** @var \Drupal\webform\WebformSubmissionLtsListBuilder $instance */
+    $instance = parent::createInstance($container, $entity_type);
+
+    $lts_storage = LtsStorageForWebformSubmission::createInstance($container, $entity_type);
+    $instance->storage = $lts_storage;
+    $instance->initialize();
+    $instance->columns = $instance->storage->getSubmissionsColumns();
+
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+
+    $webform_sub_def = $container->get('entity_type.manager')->getDefinition('webform_submission');
+    return self::createInstance($container, $webform_sub_def);
+  }
+
+}
diff --git a/modules/localgov_forms_lts/tests/src/Kernel/LtsStorageForWebformSubmissionTest.php b/modules/localgov_forms_lts/tests/src/Kernel/LtsStorageForWebformSubmissionTest.php
new file mode 100644
index 0000000..ee106a3
--- /dev/null
+++ b/modules/localgov_forms_lts/tests/src/Kernel/LtsStorageForWebformSubmissionTest.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Drupal\Tests\localgov_forms_lts\Kernel;
+
+use Drupal\Core\Database\Connection as DbConnection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\Insert;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\localgov_forms_lts\Constants;
+use Drupal\localgov_forms_lts\LtsStorageForWebformSubmission;
+use Drupal\webform\Entity\WebformSubmission;
+
+/**
+ * Tests LtsStorageForWebformSubmission's ability to store in LTS.
+ *
+ * When we are trying to store a Webform submission into the Long term storage,
+ * we need to ensure that it is actually saved into the Long term storage
+ * database and *not* into the default database.
+ */
+class LtsStorageForWebformSubmissionTest extends KernelTestBase {
+
+  /**
+   * Tests LTS database usage.
+   *
+   * - Creates a fresh Webform submission entity.
+   * - Tries to save it into the LTS database.
+   */
+  public function testLtsDbUsage() {
+
+    $contact2_webform = $this->container->get('entity_type.manager')->getStorage('webform')->load(self::TEST_WEBFORM_ID);
+    $this->assertNotNull($contact2_webform);
+
+    $a_webform_submission = WebformSubmission::create([
+      'webform_id' => self::TEST_WEBFORM_ID,
+      'data' => [
+        'name'  => 'Foo Bar',
+        'email' => 'foo@example.net',
+      ],
+    ]);
+
+    // Temporary measure to satisfy
+    // LtsStorageForWebformSubmission::__construct().
+    // Gets overwritten by the call to $test_obj->setDatabaseConnection() below.
+    Database::addConnectionInfo(Constants::LTS_DB_KEY, 'default', [
+      'driver'    => 'fake_lts',
+      'namespace' => 'Drupal\\localgov_forms_test\\Driver\\Database\\FakeLts',
+    ]);
+    $webform_sub_def = $this->container->get('entity_type.manager')->getDefinition('webform_submission');
+    $test_obj = LtsStorageForWebformSubmission::createInstance($this->container, $webform_sub_def);
+    $test_obj->setDatabaseConnection($this->mockLtsDbConnection);
+
+    $test_obj->resave($a_webform_submission);
+  }
+
+  /**
+   * Prepares the mock LTS database connection.
+   */
+  protected function setUp(): void {
+
+    parent::setUp();
+
+    $this->installSchema('webform', ['webform']);
+    $this->installConfig(['webform']);
+    $this->installEntitySchema('user');
+
+    $mock_insert_query = $this->createConfiguredMock(Insert::class, [
+      'execute' => random_int(1, 10),
+    ]);
+    $mock_insert_query->method('fields')->willReturnSelf();
+
+    $this->mockLtsDbConnection = $this->createMock(DbConnection::class);
+    $this->mockLtsDbConnection->expects($this->exactly(self::WEBFORM_SUB_LTS_INSERT_COUNT))
+      ->method('insert')
+      ->willReturnMap([
+        ['webform_submission', $mock_insert_query],
+        ['webform_submission', [
+          'return' => self::DEPRECATED_D10_RETURN_INSERT_ID,
+        ], $mock_insert_query,
+        ],
+        ['webform_submission_data', $mock_insert_query],
+        ['webform_submission_data', [], $mock_insert_query],
+      ]);
+  }
+
+  /**
+   * A new Webform submission is inserted into the LTS database twice.
+   *
+   * Once in the webform_submission table and then in the
+   * webform_submission_data table.
+   */
+  const WEBFORM_SUB_LTS_INSERT_COUNT = 2;
+
+  /**
+   * A Webform from the localgov_forms_test module.
+   */
+  const TEST_WEBFORM_ID = 'contact';
+
+  /**
+   * Mirrors the deprecated Database::RETURN_INSERT_ID.
+   */
+  const DEPRECATED_D10_RETURN_INSERT_ID = 3;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  protected static $modules = [
+    'localgov_forms_test',
+    'system',
+    'user',
+    'webform',
+  ];
+
+  /**
+   * Mock LTS database connection.
+   *
+   * Is it being used at all?  That's what this test is about.
+   *
+   * @var Drupal\Core\Database\Connection
+   */
+  protected $mockLtsDbConnection;
+
+}
diff --git a/modules/localgov_forms_lts/tests/src/Unit/LtsCopyTest.php b/modules/localgov_forms_lts/tests/src/Unit/LtsCopyTest.php
new file mode 100644
index 0000000..9ea869d
--- /dev/null
+++ b/modules/localgov_forms_lts/tests/src/Unit/LtsCopyTest.php
@@ -0,0 +1,161 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\localgov_forms_lts\Unit;
+
+use Drupal\Core\Database\Connection as DbConnection;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\Query\QueryAggregateInterface;
+use Drupal\Core\Entity\Query\QueryInterface;
+use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
+use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Tests\UnitTestCase;
+use Drupal\localgov_forms_lts\LtsCopy;
+use Drupal\localgov_forms_lts\LtsStorageForWebformSubmission;
+use Drupal\webform\WebformInterface;
+use Drupal\webform\WebformSubmissionInterface;
+use Drupal\webform\WebformSubmissionStorageInterface;
+
+/**
+ * Unit tests for LtsCopy.
+ *
+ * Tests a scenario where an existing Webform submission has been updated and
+ * two new Webform submissions have been added since Webform submissions were
+ * last copied to long term storage.
+ */
+class LtsCopyTest extends UnitTestCase {
+
+  /**
+   * Tests LtsCopy::copy().
+   */
+  public function testCopySub() {
+
+    $test_obj = new LtsCopy($this->mockEntityTypeManager, $this->mockLtsKeyValueFactory, $this->mockLtsLoggerFactory, $this->mockLtsStorage);
+
+    $copy_results = $test_obj->copy();
+
+    $this->assertCount(self::WEBFORM_SUB_EXPECTED_COPY_COUNT, $copy_results);
+  }
+
+  /**
+   * Creates mock dependencies.
+   *
+   * Initializes all objects needed to create an LtsCopy object.
+   */
+  public function setUp(): void {
+
+    parent::setUp();
+
+    $mock_webform_sub_storage = static::setupMockWebformSubmissionStorage();
+    $this->mockEntityTypeManager = $this->createConfiguredMock(EntityTypeManagerInterface::class, [
+      'getStorage' => $mock_webform_sub_storage,
+    ]);
+
+    $mock_lts_storage_query = $this->createMock(QueryAggregateInterface::class);
+    $mock_lts_storage_query->method('execute')
+      ->willReturn([['sid_max' => self::LAST_COPIED_WEBFORM_SUB_ID]]);
+    $mock_lts_storage_query->method('accessCheck')->willReturnSelf();
+    $mock_lts_storage_query->method('aggregate')->willReturnSelf();
+    $this->mockLtsStorage = $this->createConfiguredMock(LtsStorageForWebformSubmission::class, [
+      'getAggregateQuery'     => $mock_lts_storage_query,
+      'getDatabaseConnection' => $this->createMock(DbConnection::class),
+    ]);
+    $this->mockLtsStorage->expects($this->exactly(self::WEBFORM_SUB_EXPECTED_COPY_COUNT))->method('resave');
+
+    $this->mockLtsKeyValueFactory = $this->createConfiguredMock(KeyValueFactoryInterface::class, [
+      'get' => $this->createMock(KeyValueStoreInterface::class),
+    ]);
+
+    $this->mockLtsLoggerFactory = $this->createMock(LoggerChannelFactoryInterface::class);
+  }
+
+  /**
+   * Prepares a mock Webform submission storage object.
+   *
+   * When queried, returns three mock Webform submission entities.
+   */
+  public function setupMockWebformSubmissionStorage(): WebformSubmissionStorageInterface {
+    $mock_webform_sub_query = $this->createMock(QueryInterface::class);
+    $mock_webform_sub_query->expects($this->any())
+      ->method('execute')
+      ->willReturn([
+        self::LAST_COPIED_WEBFORM_SUB_ID => (string) self::LAST_COPIED_WEBFORM_SUB_ID,
+        self::NEW_WEBFORM_SUB_ID0 => (string) self::NEW_WEBFORM_SUB_ID0 ,
+        self::NEW_WEBFORM_SUB_ID1 => (string) self::NEW_WEBFORM_SUB_ID1 ,
+      ]);
+    $mock_webform_sub_query->method('accessCheck')->willReturnSelf();
+    $mock_webform_sub_query->method('condition')->willReturnSelf();
+    $mock_webform_sub_query->method('sort')->willReturnSelf();
+    $mock_webform_sub_storage = $this->createConfiguredMock(WebformSubmissionStorageInterface::class, [
+      'getQuery' => $mock_webform_sub_query,
+    ]);
+
+    $mock_webform = $this->createConfiguredMock(WebformInterface::class, [
+      'getElementsDecodedAndFlattened' => [],
+    ]);
+    $mock_existing_webform_sub = $this->createConfiguredMock(WebformSubmissionInterface::class, [
+      'id'         => self::LAST_COPIED_WEBFORM_SUB_ID,
+      'getWebform' => $mock_webform,
+    ]);
+    $mock_new_webform_sub0 = $this->createConfiguredMock(WebformSubmissionInterface::class, [
+      'id'         => self::NEW_WEBFORM_SUB_ID0,
+      'getWebform' => $mock_webform,
+    ]);
+    $mock_new_webform_sub0->expects($this->once())->method('enforceIsNew')->willReturnSelf();
+    $mock_new_webform_sub1 = $this->createConfiguredMock(WebformSubmissionInterface::class, [
+      'id'         => self::NEW_WEBFORM_SUB_ID1,
+      'getWebform' => $mock_webform,
+    ]);
+    $mock_new_webform_sub1->expects($this->once())->method('enforceIsNew')->willReturnSelf();
+    $mock_webform_sub_storage->expects($this->exactly(self::WEBFORM_SUB_EXPECTED_LOAD_COUNT))
+      ->method('load')
+      ->willReturnMap([
+        [self::LAST_COPIED_WEBFORM_SUB_ID, $mock_existing_webform_sub],
+        [self::NEW_WEBFORM_SUB_ID0, $mock_new_webform_sub0],
+        [self::NEW_WEBFORM_SUB_ID1, $mock_new_webform_sub1],
+      ]);
+
+    return $mock_webform_sub_storage;
+  }
+
+  const LAST_COPIED_WEBFORM_SUB_ID = 99;
+
+  const NEW_WEBFORM_SUB_ID0 = 100;
+
+  const NEW_WEBFORM_SUB_ID1 = 101;
+
+  const WEBFORM_SUB_EXPECTED_COPY_COUNT = 3;
+
+  const WEBFORM_SUB_EXPECTED_LOAD_COUNT = 4;
+
+  /**
+   * Mock KeyValue factory.
+   *
+   * @var \Drupal\Core\KeyValueStore\KeyValueFactoryInterface
+   */
+  protected $mockLtsKeyValueFactory;
+
+  /**
+   * Mock EntityTypeManager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $mockEntityTypeManager;
+
+  /**
+   * Mock Long term webform submission storage.
+   *
+   * @var \Drupal\webform\WebformSubmissionStorageInterface
+   */
+  protected $mockLtsStorage;
+
+  /**
+   * Mock logger.
+   *
+   * @var \Drupal\Core\Logger\LoggerChannelFactoryInterface
+   */
+  protected $mockLtsLoggerFactory;
+
+}
diff --git a/src/Annotations/PIIRedactor.php b/src/Annotations/PIIRedactor.php
new file mode 100644
index 0000000..8216c29
--- /dev/null
+++ b/src/Annotations/PIIRedactor.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Annotation for PIIRedactor plugins.
+ *
+ * These plugins redact Personally Identifiable Information (PII) from Webform
+ * submissions.
+ */
+class PIIRedactor extends Plugin {
+
+  /**
+   * As it says on the tin.
+   *
+   * @var string
+   */
+  public $id;
+
+  /**
+   * See above.
+   *
+   * @var string
+   */
+  public $label;
+
+  /**
+   * See above again.
+   *
+   * @var string
+   */
+  public $description = '';
+
+}
diff --git a/src/Attribute/PIIRedactor.php b/src/Attribute/PIIRedactor.php
new file mode 100644
index 0000000..70025be
--- /dev/null
+++ b/src/Attribute/PIIRedactor.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms\Attribute;
+
+use Drupal\Component\Plugin\Attribute\Plugin;
+
+/**
+ * Defines a PIIRedactor attribute for plugin discovery.
+ *
+ * PIIRedactor plugins redact Personally Identifiable Information (PII) from
+ * Webform Submissions.
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class PIIRedactor extends Plugin {
+
+  /**
+   * Wires dependencies.
+   */
+  public function __construct(
+    public readonly string $id,
+    public readonly string $label,
+    public readonly ?string $description = NULL,
+  ) {}
+
+}
diff --git a/src/BestEffortPIIRedactor.php b/src/BestEffortPIIRedactor.php
new file mode 100644
index 0000000..833580b
--- /dev/null
+++ b/src/BestEffortPIIRedactor.php
@@ -0,0 +1,156 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms;
+
+use Drupal\webform\WebformSubmissionInterface;
+
+/**
+ * Personally Identifiable Information redactor.
+ *
+ * Redacts Personally Identifiable Information (PII) from Webform submissions.
+ *
+ * Redaction rules:
+ * - All Webform elements of type email, telephone, number.
+ * - Any element with the following happening in its machine id: name, mail,
+ *   phone, date_of_birth, personal, title, gender, sex, ethnicity.
+ * - All textareas are cleaned of email, postcode, and any number.
+ */
+class BestEffortPIIRedactor {
+
+  /**
+   * Redacts all PII from given Webform submission.
+   *
+   * After the redaction, a note is added to the Webform submission to highlight
+   * the redacted elements.
+   *
+   * A list of redacted elements is returned.
+   */
+  public static function redact(WebformSubmissionInterface $webform_sub) :array {
+
+    $elems_to_redact = static::findElemsToRedact($webform_sub);
+
+    $redaction_result = array_map(function ($elem) use ($webform_sub) {
+      if ($webform_sub->getElementData($elem)) {
+        $webform_sub->setElementData($elem, NULL);
+
+        return $elem;
+      }
+    }, $elems_to_redact['full']);
+
+    $partial_redaction_result = array_map(function ($elem) use ($webform_sub) {
+      if ($text = $webform_sub->getElementData($elem)) {
+        [$redacted_text, $redaction_count] = BestEffortPIIRedactorForText::redact($text);
+
+        if ($redaction_count) {
+          $webform_sub->setElementData($elem, $redacted_text);
+          return $elem;
+        }
+      }
+    }, $elems_to_redact['part']);
+
+    $redacted_elems = array_filter($redaction_result);
+    $partly_redacted_elems = array_filter($partial_redaction_result);
+    static::addRedactionNote($webform_sub, $redacted_elems);
+    static::addRedactionNote($webform_sub, $partly_redacted_elems, note_prefix: 'Partly redacted elements: ');
+
+    $all_redacted_elems = [...$redacted_elems, ...$partly_redacted_elems];
+    return $all_redacted_elems;
+  }
+
+  /**
+   * Finds the Webform element names to redact.
+   *
+   * The result array contains two keys:
+   * - full: These elements are to be fully redacted.
+   * - part: The values of these elements contain PII among other text and are
+   *   to be partly redacted.
+   */
+  public static function findElemsToRedact(WebformSubmissionInterface $webform_sub) :array {
+
+    $elem_type_mapping = static::listElemsAndTypes($webform_sub);
+    $pii_mapping = array_intersect($elem_type_mapping, static::PII_ELEMENT_TYPES);
+    $pii_elems = array_keys($pii_mapping);
+
+    $potential_mapping = array_intersect($elem_type_mapping, static::POTENTIAL_PII_ELEMENT_TYPES);
+    $guessed_pii_elems = preg_grep(static::GUESSED_PII_ELEM_PATTERN, array_keys($potential_mapping));
+
+    $elems_w_some_pii = array_keys(array_intersect($elem_type_mapping, static::PII_ELEMENT_TYPES_TO_REDUCT_IN_PART));
+
+    $elems_to_redact = [
+      'full' => array_unique([...$pii_elems, ...$guessed_pii_elems]),
+      'part' => $elems_w_some_pii,
+    ];
+    return $elems_to_redact;
+  }
+
+  /**
+   * Prepares mapping of element ids and types.
+   */
+  public static function listElemsAndTypes(WebformSubmissionInterface $webform_sub) :array {
+
+    $elems = $webform_sub->getWebform()->getElementsDecodedAndFlattened();
+    return array_map(fn($elem_def) => $elem_def['#type'], $elems);
+  }
+
+  /**
+   * Adds redaction note.
+   *
+   * Adds a note to the Webform submission to highlight the redacted elements.
+   */
+  public static function addRedactionNote(WebformSubmissionInterface $webform_sub, array $redacted_elems, string $note_prefix = 'Redacted elements: '): void {
+
+    if (empty($redacted_elems)) {
+      return;
+    }
+
+    $redaction_note = $note_prefix . implode(', ', $redacted_elems) . '.';
+    $existing_note  = $webform_sub->getNotes();
+
+    $note_list = array_filter([$existing_note, $redaction_note]);
+    $webform_sub->setNotes(implode(PHP_EOL, $note_list));
+  }
+
+  /**
+   * Element types carrying PII for certain.
+   */
+  const PII_ELEMENT_TYPES = [
+    'address',
+    'email',
+    'localgov_forms_dob',
+    'localgov_webform_uk_address',
+    'number',
+    'tel',
+    'webform_name',
+    'webform_address',
+    'webform_contact',
+    'webform_telephone',
+  ];
+
+  /**
+   * Element types that *may* carry PII.
+   */
+  const POTENTIAL_PII_ELEMENT_TYPES = [
+    'localgov_forms_date',
+    'checkboxes',
+    'processed_text',
+    'radios',
+    'textfield',
+  ];
+
+  /**
+   * Element types with PII mixed with other text.
+   */
+  const PII_ELEMENT_TYPES_TO_REDUCT_IN_PART = [
+    'textarea',
+  ];
+
+  /**
+   * Preg pattern.
+   *
+   * Element type naming pattern indicating possible link with PII.
+   */
+  const GUESSED_PII_ELEM_PATTERN = '#name|mail|phone|contact_number|date_of_birth|dob_|nino|address|postcode|post_code|personal_|title|gender|sex|ethnicity|passport|serial_number|reg_number|pcn_|driver_#i';
+
+}
diff --git a/src/BestEffortPIIRedactorForText.php b/src/BestEffortPIIRedactorForText.php
new file mode 100644
index 0000000..882def7
--- /dev/null
+++ b/src/BestEffortPIIRedactorForText.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms;
+
+/**
+ * Redacts from given text.
+ *
+ * Redacts Personally Identifiable Information (PII) from a given chunk of text.
+ * Redacted items:
+ * - UK postcode.
+ * - Email address.
+ * - Numbers.
+ *
+ * Email address redaction works for commonly seen formats only.  So
+ * foo@example.net will be fully redacted, but foo\@bar@example will only be
+ * partially redacted.
+ */
+class BestEffortPIIRedactorForText {
+
+  /**
+   * Redacts email, postcode, number.
+   */
+  public static function redact(string $text): array {
+
+    [$w_redacted_postcodes, $count_postcode] = self::redactPostcodes($text);
+    [$w_redacted_postcode_n_emails, $count_email] = self::redactEmails($w_redacted_postcodes);
+    [$redacted_final, $count_num] = self::redactNumbers($w_redacted_postcode_n_emails);
+
+    $redaction_final_count = $count_postcode + $count_email + $count_num;
+
+    return [$redacted_final, $redaction_final_count];
+  }
+
+  /**
+   * Redacts postcodes.
+   */
+  public static function redactPostcodes(string $text): array {
+
+    $postcode_regex = sprintf("#%s#i", self::UK_SIMPLE_POSTCODE_REGEX);
+    $replacement_count = 0;
+    $redacted = preg_replace($postcode_regex, self::REDACTED_POSTCODE_LABEL, $text, count: $replacement_count);
+
+    return [$redacted, $replacement_count];
+  }
+
+  /**
+   * Redacts email addresses.
+   */
+  public static function redactEmails(string $text): array {
+
+    $email_regex = sprintf("#%s#i", self::SIMPLE_EMAIL_REGEX);
+    $replacement_count = 0;
+    $redacted = preg_replace($email_regex, self::REDACTED_EMAIL_LABEL, $text, count: $replacement_count);
+
+    return [$redacted, $replacement_count];
+  }
+
+  /**
+   * Redacts numbers.
+   */
+  public static function redactNumbers(string $text): array {
+
+    $replacement_count = 0;
+    $redacted = preg_replace('#\d+#', self::REDACTED_NUMBER_LABEL, $text, count: $replacement_count);
+
+    return [$redacted, $replacement_count];
+  }
+
+  /**
+   * Regex for spotting *most* UK postcodes.
+   *
+   * @see https://en.wikipedia.org/wiki/Postcodes_in_the_United_Kingdom#Validation
+   */
+  const UK_SIMPLE_POSTCODE_REGEX = '[A-Z]{1,2}\d[A-Z\d]? ?\d[A-Z]{2}';
+
+  /**
+   * Regex for spotting *most* email addresses.
+   *
+   * The email address format is too complex to match with any regex.  This
+   * regex catches most simple ones.
+   *
+   * @see https://www.linuxjournal.com/article/9585
+   */
+  const SIMPLE_EMAIL_REGEX = '[a-zA-Z0-9_+.-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+';
+
+  const REDACTED_POSTCODE_LABEL = 'REDACTED_POSTCODE';
+  const REDACTED_EMAIL_LABEL    = 'REDACTED_EMAIL';
+  const REDACTED_NUMBER_LABEL   = 'REDACTED_NUMBER';
+
+}
diff --git a/src/Element/AddressLookupElement.php b/src/Element/AddressLookupElement.php
index 57a6d5c..33c968d 100644
--- a/src/Element/AddressLookupElement.php
+++ b/src/Element/AddressLookupElement.php
@@ -27,6 +27,22 @@ class AddressLookupElement extends FormElement {
    */
   public static $addressType;
 
+  /**
+   * Static local custodian code.
+   *
+   * @var int
+   */
+  public static $localCustodianCode;
+
+  /**
+   * Available Geocoder plugin ids.
+   *
+   * Maintained as a static variable for caching purposes.
+   *
+   * @var array
+   */
+  public static $selectedGeocoderPluginIds = [];
+
   /**
    * Static address results.
    *
@@ -83,8 +99,9 @@ public static function processAddressLookupElement(&$element, FormStateInterface
 
     $element['address_search']['address_searchstring'] = [
       '#type' => 'textfield',
-      '#title' => t('Postcode or Street'),
+      '#title' => t('Postcode or street'),
       '#description' => $element['#address_search_description'] ?? t('Enter the postcode&hellip;'),
+      '#required_error' => t('You must enter a postcode or street.'),
       '#maxlength' => 64,
       '#size' => 64,
       '#weight' => '0',
@@ -148,6 +165,7 @@ public static function processAddressLookupElement(&$element, FormStateInterface
     $element['address_select']['address_select_list'] = [
       '#type' => 'select',
       '#title' => $element['#address_select_title'] ?? t('Select the address'),
+      '#required_error' => t('You must select an address.'),
       '#options' => [],
       '#empty_option' => '-' . t('Please choose an address') . '-',
       '#empty_value' => 0,
@@ -173,7 +191,7 @@ public static function processAddressLookupElement(&$element, FormStateInterface
         $parent_container = $parent_container[$keyval];
       }
 
-      // Extract the parent values form container.
+      // Extract the parent values from container.
       $parent_container_values = $form_values;
       foreach ($parents as $keyval) {
         $parent_container_values = $parent_container_values[$keyval];
@@ -301,14 +319,14 @@ public static function addressSelectLookup(string $address_search, array $addres
 
     // Get the address type to lookup.
     $address_type = $address_element['address_select']['address_select_list']['#address_type'];
+    $local_custodian_code = $address_element['#local_custodian_code'];
+    $selected_plugin_ids  = $address_element['#geocoder_plugins'];
 
     // Do address lookup.
     // If its searching for the same address, return the static version.
     // Else make a new request.
     // This is to avoid multiple api lookup calls.
-    if ($address_search !== self::$searchString || $address_type !== self::$addressType) {
-      $selected_plugin_ids  = $address_element['#geocoder_plugins'];
-      $local_custodian_code = $address_element['#local_custodian_code'];
+    if ($address_search !== self::$searchString || $address_type !== self::$addressType || $local_custodian_code !== self::$localCustodianCode || $selected_plugin_ids !== self::$selectedGeocoderPluginIds) {
       self::$addressResults = \Drupal::service('localgov_forms.address_lookup')->search([$address_search], $selected_plugin_ids, $local_custodian_code);
     }
     $address_list = self::$addressResults;
@@ -348,8 +366,10 @@ public static function addressSelectLookup(string $address_search, array $addres
     unset($address_element['address_select']['address_select_list']['#suffix']);
     unset($address_element['address_select']['error']);
 
-    self::$searchString = $address_search;
-    self::$addressType  = $address_type;
+    self::$searchString              = $address_search;
+    self::$addressType               = $address_type;
+    self::$localCustodianCode        = $local_custodian_code;
+    self::$selectedGeocoderPluginIds = $selected_plugin_ids;
 
     return $address_element['address_select']['address_select_list'];
   }
diff --git a/src/Element/UKAddressLookup.php b/src/Element/UKAddressLookup.php
index 0549785..346d156 100644
--- a/src/Element/UKAddressLookup.php
+++ b/src/Element/UKAddressLookup.php
@@ -59,6 +59,9 @@ public static function getCompositeElements(array $element) {
     $element_list['address_1']['#prefix'] = '<div class="js-address-entry-container">';
     $element_list['postcode']['#suffix'] = '</div>';
 
+    // Custom error message for address line 1.
+    $element_list['address_1']['#required_error'] = t('You must enter an address.');
+
     // Extras to store information for webform builders to access in
     // computed twig.
     // @See DRUP-1287.
@@ -98,6 +101,14 @@ public static function validateWebformComposite(&$element, FormStateInterface $f
       return;
     }
 
+    // Temporarily reset the #limit_validation_errors property.  Otherwise we
+    // can't safely set and manipulate errors below.
+    //
+    // @see Drupal\Core\Form\FormState::setErrorByName()
+    // @see AddressLookupElement::processAddressLookupElement()
+    $orig_limit_validation_errors = $form_state->getLimitValidationErrors();
+    $form_state->setLimitValidationErrors(NULL);
+
     // If the element or any of its parent containers are hidden by conditions,
     // Bypass validation and clear any required element errors generated
     // for this element.
@@ -105,7 +116,7 @@ public static function validateWebformComposite(&$element, FormStateInterface $f
       $form_errors = $form_state->getErrors();
       $form_state->clearErrors();
       foreach ($form_errors as $error_key => $error_value) {
-        if (strpos($error_key, $element_key . ']') !== 0) {
+        if (strpos($error_key, $element_key . ']') === FALSE) {
           $form_state->setErrorByName($error_key, $error_value);
         }
       }
@@ -115,6 +126,7 @@ public static function validateWebformComposite(&$element, FormStateInterface $f
     // Get the search string and selected value.
     $search_string = $value['address_lookup']['address_search']['address_searchstring'];
     $selected = $value['address_lookup']['address_select']['address_select_list'] ?? [];
+    $is_address_lookup_op = $form_state->getTriggeringElement()['#name'] === $element_key . '[address_lookup][address_search][address_actions][address_searchbutton]';
 
     // Check to see if there are values in the address element form.
     $has_address_values = FALSE;
@@ -126,9 +138,8 @@ public static function validateWebformComposite(&$element, FormStateInterface $f
       }
     }
 
-    // If the select is empty, and the manual address elements are filled in,
-    // validate the parent element.
-    if (empty($selected) && $has_address_values) {
+    // If the manual address elements are filled in, validate the parent.
+    if (!$is_address_lookup_op && $has_address_values) {
       // Clear the address search string.
       // This is to avoid the select box maintaing a value
       // (it's cleared if search string is empty).
@@ -151,16 +162,36 @@ public static function validateWebformComposite(&$element, FormStateInterface $f
       // Then show an error to search for a local address or select can't find
       // the address.
       if (!empty($search_string) && $element['address_lookup']['address_select']['address_select_list']['#type'] == 'markup') {
-        $form_state->setError($element, t('Search for a local address, or select "Can\'t find the address" to enter an address.'));
+        $form_state->setError($element['address_lookup']['address_search']['address_searchstring'], t('Enter a local address, or select "Can\'t find the address".'));
+
+        // Inline form errors don't work well for this element in Ajax calls.
+        // This is because the Ajax callback attached to the `Find address`
+        // button updates only *part* of the address lookup element.  As a
+        // result, any error set on any other part of the address lookup element
+        // is lost.  To avoid this, we disable inline errors here.  There is an
+        // assumption here that the `Find address` button is using Ajax.  This
+        // assumption is good enough for most cases but degrades without Ajax.
+        if ($is_address_lookup_op) {
+          $complete_form['#disable_inline_form_errors'] = TRUE;
+        }
       }
       // Else if there is a search but no address selected,
       // set the select box as required.
-      elseif (!empty($search_string) && empty($selected)) {
+      elseif (!empty($search_string) && empty($selected) && !$is_address_lookup_op) {
         WebformElementHelper::setRequiredError($element['address_lookup']['address_select']['address_select_list'], $form_state);
+
+        // UI needs a hint that we are in the middle of a search.
+        $element['address_lookup']['address_search']['address_actions']['address_searchbutton']['#attributes']['class'][] = 'js-searching';
       }
       // Else mark the entire element as required.
       elseif (empty($search_string) && empty($selected)) {
-        WebformElementHelper::setRequiredError($element, $form_state);
+        WebformElementHelper::setRequiredError($element['address_lookup']['address_search']['address_searchstring'], $form_state);
+
+        // As explained above, inline form errors don't work well for this
+        // element in Ajax calls.
+        if ($is_address_lookup_op) {
+          $complete_form['#disable_inline_form_errors'] = TRUE;
+        }
       }
 
       // Fetch errors, to allow any generated errors for the child elements
@@ -168,9 +199,9 @@ public static function validateWebformComposite(&$element, FormStateInterface $f
       $form_errors = $form_state->getErrors();
 
       // Loop through errors and remove child elements, except the select
-      // element.
+      // and search query elements.
       foreach ($form_errors as $error_key => $error_value) {
-        if (strpos($error_key, $element_key . ']') === 0 && $error_key != $element_key . '][address_lookup][address_select][address_select_list') {
+        if (strpos($error_key, $element_key . ']') === 0 && ($error_key !== $element_key . '][address_lookup][address_select][address_select_list' && $error_key !== $element_key . '][address_lookup][address_search][address_searchstring')) {
           unset($form_errors[$error_key]);
         }
       }
@@ -181,13 +212,17 @@ public static function validateWebformComposite(&$element, FormStateInterface $f
         unset($form_errors[$element_key . '][address_lookup][address_select][address_select_list']);
       }
 
-      // Reset form errors and reset them with the cleaned ones.
+      // Reset form errors and replace them with cleaned ones.
       $form_state->clearErrors();
       foreach ($form_errors as $error_key => $error_value) {
         $form_state->setErrorByName($error_key, $error_value);
       }
     }
 
+    // Restore original value of the `limit_validation_errors` property now that
+    // we are done with manipulating errors.
+    $form_state->setLimitValidationErrors($orig_limit_validation_errors);
+
     // Clear empty composites value.
     if (empty(array_filter($value))) {
       $element['#value'] = NULL;
diff --git a/src/Element/WebformUKAddress.php b/src/Element/WebformUKAddress.php
index b4e3542..ad73fb8 100644
--- a/src/Element/WebformUKAddress.php
+++ b/src/Element/WebformUKAddress.php
@@ -65,6 +65,7 @@ public static function getCompositeElements(array $element) {
     $elements['town_city'] = [
       '#type' => 'textfield',
       '#title' => t('Town/City'),
+      '#required_error' => t('You must enter the town/city.'),
       '#attributes' => [
         'data-webform-composite-id' => $html_id . '--town_city',
         // Add a namespaced class for setting the address fields
@@ -78,6 +79,7 @@ public static function getCompositeElements(array $element) {
     $elements['postcode'] = [
       '#type' => 'textfield',
       '#title' => t('Postcode'),
+      '#required_error' => t('You must enter the postcode.'),
       '#attributes' => [
         'data-webform-composite-id' => $html_id . '--postcode',
         // Add a namespaced class for setting the address fields
diff --git a/src/Plugin/PIIRedactor/BestEffortPIIRedactor.php b/src/Plugin/PIIRedactor/BestEffortPIIRedactor.php
new file mode 100644
index 0000000..201f9db
--- /dev/null
+++ b/src/Plugin/PIIRedactor/BestEffortPIIRedactor.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms\Plugin\PIIRedactor;
+
+use Drupal\localgov_forms\Attribute\PIIRedactor;
+use Drupal\localgov_forms\BestEffortPIIRedactor as BestEffortRedactor;
+use Drupal\localgov_forms\Plugin\PIIRedactorPluginBase;
+use Drupal\webform\WebformSubmissionInterface;
+
+/**
+ * PII redaction plugin that acts on a best effort basis.
+ *
+ * @see Drupal\localgov_forms\PIIRedactor
+ */
+#[PIIRedactor(
+  id          : 'best_effort_pii_redactor',
+  label       : 'Best effort PII redactor',
+  description : 'Redacts Personally Identifiable Information (PII) from a Webform submission on a best effort basis.',
+ )]
+class BestEffortPIIRedactor extends PIIRedactorPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function redact(WebformSubmissionInterface $webform_submission): array {
+
+    $redacted_elements = BestEffortRedactor::redact($webform_submission);
+    return $redacted_elements;
+  }
+
+}
diff --git a/src/Plugin/PIIRedactorPluginBase.php b/src/Plugin/PIIRedactorPluginBase.php
new file mode 100644
index 0000000..f3ca27d
--- /dev/null
+++ b/src/Plugin/PIIRedactorPluginBase.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms\Plugin;
+
+use Drupal\Component\Plugin\PluginBase;
+
+/**
+ * Plugin base for PIIRedactor plugins.
+ *
+ * Doesn't do any thing at the moment.  Reserving for possible future use.
+ */
+abstract class PIIRedactorPluginBase extends PluginBase implements PIIRedactorPluginInterface {
+}
diff --git a/src/Plugin/PIIRedactorPluginInterface.php b/src/Plugin/PIIRedactorPluginInterface.php
new file mode 100644
index 0000000..e32a3b8
--- /dev/null
+++ b/src/Plugin/PIIRedactorPluginInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms\Plugin;
+
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\webform\WebformSubmissionInterface;
+
+/**
+ * Defines the required interface for all PII redactor plugins.
+ */
+interface PIIRedactorPluginInterface extends PluginInspectionInterface {
+
+  /**
+   * Redacts PII from the given Webform submission.
+   *
+   * @return array
+   *   List of redacted fieldnames.
+   */
+  public function redact(WebformSubmissionInterface $webform_submission): array;
+
+}
diff --git a/src/Plugin/PIIRedactorPluginManager.php b/src/Plugin/PIIRedactorPluginManager.php
new file mode 100644
index 0000000..e81e5c5
--- /dev/null
+++ b/src/Plugin/PIIRedactorPluginManager.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms\Plugin;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+
+/**
+ * Manages discovery and instantiation of PII redactor plugins.
+ *
+ * @see Drupal\localgov_forms\Attribute\PIIRedactor
+ * @see Drupal\localgov_forms\Plugin\PIIRedactorPluginInterface
+ */
+class PIIRedactorPluginManager extends DefaultPluginManager implements PIIRedactorPluginManagerInterface {
+
+  /**
+   * Constructs a new PIIRedactorManager object.
+   */
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
+
+    parent::__construct('Plugin/PIIRedactor', $namespaces, $module_handler, 'Drupal\localgov_forms\Plugin\PIIRedactorPluginInterface', 'Drupal\localgov_forms\Attribute\PIIRedactor');
+
+    $this->alterInfo('pii_redactor_info');
+
+    $this->setCacheBackend($cache_backend, 'pii_redactor_plugins');
+  }
+
+}
diff --git a/src/Plugin/PIIRedactorPluginManagerInterface.php b/src/Plugin/PIIRedactorPluginManagerInterface.php
new file mode 100644
index 0000000..a92e660
--- /dev/null
+++ b/src/Plugin/PIIRedactorPluginManagerInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms\Plugin;
+
+/**
+ * Useful for type declaration.
+ */
+interface PIIRedactorPluginManagerInterface {}
diff --git a/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form1.yml b/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form1.yml
new file mode 100644
index 0000000..1c96940
--- /dev/null
+++ b/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form1.yml
@@ -0,0 +1,215 @@
+langcode: en
+status: open
+dependencies: {  }
+weight: 0
+open: null
+close: null
+uid: 1
+template: false
+archive: false
+id: address_error_message_test_form1
+title: 'Address error message test form 1'
+description: 'A form with no required elements.'
+categories: {  }
+elements: |-
+  does_it_have_an_address:
+    '#type': radios
+    '#title': 'Does it have an address?'
+    '#options': yes_no
+  it_s_address:
+    '#type': localgov_webform_uk_address
+    '#title': "It's address"
+    '#geocoder_plugins':
+      localgov_mock_geocoder: localgov_mock_geocoder
+      nominatim: 0
+      random: 0
+    '#title_display': ''
+    '#states':
+      visible:
+        ':input[name="does_it_have_an_address"]':
+          value: 'Yes'
+css: ''
+javascript: ''
+settings:
+  ajax: false
+  ajax_scroll_top: form
+  ajax_progress_type: ''
+  ajax_effect: ''
+  ajax_speed: null
+  page: true
+  page_submit_path: ''
+  page_confirm_path: ''
+  page_theme_name: ''
+  form_title: both
+  form_submit_once: false
+  form_open_message: ''
+  form_close_message: ''
+  form_exception_message: ''
+  form_previous_submissions: true
+  form_confidential: false
+  form_confidential_message: ''
+  form_disable_remote_addr: false
+  form_convert_anonymous: false
+  form_prepopulate: false
+  form_prepopulate_source_entity: false
+  form_prepopulate_source_entity_required: false
+  form_prepopulate_source_entity_type: ''
+  form_unsaved: false
+  form_disable_back: false
+  form_submit_back: false
+  form_disable_autocomplete: false
+  form_novalidate: false
+  form_disable_inline_errors: false
+  form_required: false
+  form_autofocus: false
+  form_details_toggle: false
+  form_reset: false
+  form_access_denied: default
+  form_access_denied_title: ''
+  form_access_denied_message: ''
+  form_access_denied_attributes: {  }
+  form_file_limit: ''
+  form_attributes: {  }
+  form_method: ''
+  form_action: ''
+  share: false
+  share_node: false
+  share_theme_name: ''
+  share_title: true
+  share_page_body_attributes: {  }
+  submission_label: ''
+  submission_exception_message: ''
+  submission_locked_message: ''
+  submission_log: false
+  submission_excluded_elements: {  }
+  submission_exclude_empty: false
+  submission_exclude_empty_checkbox: false
+  submission_views: {  }
+  submission_views_replace: {  }
+  submission_user_columns: {  }
+  submission_user_duplicate: false
+  submission_access_denied: default
+  submission_access_denied_title: ''
+  submission_access_denied_message: ''
+  submission_access_denied_attributes: {  }
+  previous_submission_message: ''
+  previous_submissions_message: ''
+  autofill: false
+  autofill_message: ''
+  autofill_excluded_elements: {  }
+  wizard_progress_bar: true
+  wizard_progress_pages: false
+  wizard_progress_percentage: false
+  wizard_progress_link: false
+  wizard_progress_states: false
+  wizard_start_label: ''
+  wizard_preview_link: false
+  wizard_confirmation: true
+  wizard_confirmation_label: ''
+  wizard_auto_forward: true
+  wizard_auto_forward_hide_next_button: false
+  wizard_keyboard: true
+  wizard_track: ''
+  wizard_prev_button_label: ''
+  wizard_next_button_label: ''
+  wizard_toggle: false
+  wizard_toggle_show_label: ''
+  wizard_toggle_hide_label: ''
+  wizard_page_type: container
+  wizard_page_title_tag: h2
+  preview: 0
+  preview_label: ''
+  preview_title: ''
+  preview_message: ''
+  preview_attributes: {  }
+  preview_excluded_elements: {  }
+  preview_exclude_empty: true
+  preview_exclude_empty_checkbox: false
+  draft: none
+  draft_multiple: false
+  draft_auto_save: false
+  draft_saved_message: ''
+  draft_loaded_message: ''
+  draft_pending_single_message: ''
+  draft_pending_multiple_message: ''
+  confirmation_type: page
+  confirmation_url: ''
+  confirmation_title: ''
+  confirmation_message: ''
+  confirmation_attributes: {  }
+  confirmation_back: true
+  confirmation_back_label: ''
+  confirmation_back_attributes: {  }
+  confirmation_exclude_query: false
+  confirmation_exclude_token: false
+  confirmation_update: false
+  limit_total: null
+  limit_total_interval: null
+  limit_total_message: ''
+  limit_total_unique: false
+  limit_user: null
+  limit_user_interval: null
+  limit_user_message: ''
+  limit_user_unique: false
+  entity_limit_total: null
+  entity_limit_total_interval: null
+  entity_limit_user: null
+  entity_limit_user_interval: null
+  purge: none
+  purge_days: null
+  results_disabled: false
+  results_disabled_ignore: false
+  results_customize: false
+  token_view: false
+  token_update: false
+  token_delete: false
+  serial_disabled: false
+access:
+  create:
+    roles:
+      - anonymous
+      - authenticated
+    users: {  }
+    permissions: {  }
+  view_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  purge_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  view_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  administer:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  test:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  configuration:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+handlers: {  }
+variants: {  }
diff --git a/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form2.yml b/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form2.yml
new file mode 100644
index 0000000..5a9a71e
--- /dev/null
+++ b/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form2.yml
@@ -0,0 +1,216 @@
+langcode: en
+status: open
+dependencies: {  }
+weight: 0
+open: null
+close: null
+uid: 1
+template: false
+archive: false
+id: address_error_message_test_form2
+title: 'Address error message test form 2'
+description: 'A form with a required radios element.'
+categories: {  }
+elements: |-
+  does_it_have_an_address:
+    '#type': radios
+    '#title': 'Does it have an address?'
+    '#options': yes_no
+    '#required': true
+  it_s_address:
+    '#type': localgov_webform_uk_address
+    '#title': "It's address"
+    '#geocoder_plugins':
+      localgov_mock_geocoder: localgov_mock_geocoder
+      nominatim: 0
+      random: 0
+    '#title_display': ''
+    '#states':
+      visible:
+        ':input[name="does_it_have_an_address"]':
+          value: 'Yes'
+css: ''
+javascript: ''
+settings:
+  ajax: false
+  ajax_scroll_top: form
+  ajax_progress_type: ''
+  ajax_effect: ''
+  ajax_speed: null
+  page: true
+  page_submit_path: ''
+  page_confirm_path: ''
+  page_theme_name: ''
+  form_title: both
+  form_submit_once: false
+  form_open_message: ''
+  form_close_message: ''
+  form_exception_message: ''
+  form_previous_submissions: true
+  form_confidential: false
+  form_confidential_message: ''
+  form_disable_remote_addr: false
+  form_convert_anonymous: false
+  form_prepopulate: false
+  form_prepopulate_source_entity: false
+  form_prepopulate_source_entity_required: false
+  form_prepopulate_source_entity_type: ''
+  form_unsaved: false
+  form_disable_back: false
+  form_submit_back: false
+  form_disable_autocomplete: false
+  form_novalidate: false
+  form_disable_inline_errors: false
+  form_required: false
+  form_autofocus: false
+  form_details_toggle: false
+  form_reset: false
+  form_access_denied: default
+  form_access_denied_title: ''
+  form_access_denied_message: ''
+  form_access_denied_attributes: {  }
+  form_file_limit: ''
+  form_attributes: {  }
+  form_method: ''
+  form_action: ''
+  share: false
+  share_node: false
+  share_theme_name: ''
+  share_title: true
+  share_page_body_attributes: {  }
+  submission_label: ''
+  submission_exception_message: ''
+  submission_locked_message: ''
+  submission_log: false
+  submission_excluded_elements: {  }
+  submission_exclude_empty: false
+  submission_exclude_empty_checkbox: false
+  submission_views: {  }
+  submission_views_replace: {  }
+  submission_user_columns: {  }
+  submission_user_duplicate: false
+  submission_access_denied: default
+  submission_access_denied_title: ''
+  submission_access_denied_message: ''
+  submission_access_denied_attributes: {  }
+  previous_submission_message: ''
+  previous_submissions_message: ''
+  autofill: false
+  autofill_message: ''
+  autofill_excluded_elements: {  }
+  wizard_progress_bar: true
+  wizard_progress_pages: false
+  wizard_progress_percentage: false
+  wizard_progress_link: false
+  wizard_progress_states: false
+  wizard_start_label: ''
+  wizard_preview_link: false
+  wizard_confirmation: true
+  wizard_confirmation_label: ''
+  wizard_auto_forward: true
+  wizard_auto_forward_hide_next_button: false
+  wizard_keyboard: true
+  wizard_track: ''
+  wizard_prev_button_label: ''
+  wizard_next_button_label: ''
+  wizard_toggle: false
+  wizard_toggle_show_label: ''
+  wizard_toggle_hide_label: ''
+  wizard_page_type: container
+  wizard_page_title_tag: h2
+  preview: 0
+  preview_label: ''
+  preview_title: ''
+  preview_message: ''
+  preview_attributes: {  }
+  preview_excluded_elements: {  }
+  preview_exclude_empty: true
+  preview_exclude_empty_checkbox: false
+  draft: none
+  draft_multiple: false
+  draft_auto_save: false
+  draft_saved_message: ''
+  draft_loaded_message: ''
+  draft_pending_single_message: ''
+  draft_pending_multiple_message: ''
+  confirmation_type: page
+  confirmation_url: ''
+  confirmation_title: ''
+  confirmation_message: ''
+  confirmation_attributes: {  }
+  confirmation_back: true
+  confirmation_back_label: ''
+  confirmation_back_attributes: {  }
+  confirmation_exclude_query: false
+  confirmation_exclude_token: false
+  confirmation_update: false
+  limit_total: null
+  limit_total_interval: null
+  limit_total_message: ''
+  limit_total_unique: false
+  limit_user: null
+  limit_user_interval: null
+  limit_user_message: ''
+  limit_user_unique: false
+  entity_limit_total: null
+  entity_limit_total_interval: null
+  entity_limit_user: null
+  entity_limit_user_interval: null
+  purge: none
+  purge_days: null
+  results_disabled: false
+  results_disabled_ignore: false
+  results_customize: false
+  token_view: false
+  token_update: false
+  token_delete: false
+  serial_disabled: false
+access:
+  create:
+    roles:
+      - anonymous
+      - authenticated
+    users: {  }
+    permissions: {  }
+  view_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  purge_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  view_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  administer:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  test:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  configuration:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+handlers: {  }
+variants: {  }
diff --git a/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form3.yml b/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form3.yml
new file mode 100644
index 0000000..2326fc8
--- /dev/null
+++ b/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form3.yml
@@ -0,0 +1,217 @@
+langcode: en
+status: open
+dependencies: {  }
+weight: 0
+open: null
+close: null
+uid: 1
+template: false
+archive: false
+id: address_error_message_test_form3
+title: 'Address error message test form 3'
+description: 'A form with a required radios element.  Also has an address lookup element whose postcode subelement is required.'
+categories: {  }
+elements: |-
+  does_it_have_an_address:
+    '#type': radios
+    '#title': 'Does it have an address?'
+    '#options': yes_no
+    '#required': true
+  it_s_address:
+    '#type': localgov_webform_uk_address
+    '#title': "It's address"
+    '#geocoder_plugins':
+      localgov_mock_geocoder: localgov_mock_geocoder
+      nominatim: 0
+      random: 0
+    '#title_display': ''
+    '#states':
+      visible:
+        ':input[name="does_it_have_an_address"]':
+          value: 'Yes'
+    '#postcode__required': true
+css: ''
+javascript: ''
+settings:
+  ajax: false
+  ajax_scroll_top: form
+  ajax_progress_type: ''
+  ajax_effect: ''
+  ajax_speed: null
+  page: true
+  page_submit_path: ''
+  page_confirm_path: ''
+  page_theme_name: ''
+  form_title: both
+  form_submit_once: false
+  form_open_message: ''
+  form_close_message: ''
+  form_exception_message: ''
+  form_previous_submissions: true
+  form_confidential: false
+  form_confidential_message: ''
+  form_disable_remote_addr: false
+  form_convert_anonymous: false
+  form_prepopulate: false
+  form_prepopulate_source_entity: false
+  form_prepopulate_source_entity_required: false
+  form_prepopulate_source_entity_type: ''
+  form_unsaved: false
+  form_disable_back: false
+  form_submit_back: false
+  form_disable_autocomplete: false
+  form_novalidate: false
+  form_disable_inline_errors: false
+  form_required: false
+  form_autofocus: false
+  form_details_toggle: false
+  form_reset: false
+  form_access_denied: default
+  form_access_denied_title: ''
+  form_access_denied_message: ''
+  form_access_denied_attributes: {  }
+  form_file_limit: ''
+  form_attributes: {  }
+  form_method: ''
+  form_action: ''
+  share: false
+  share_node: false
+  share_theme_name: ''
+  share_title: true
+  share_page_body_attributes: {  }
+  submission_label: ''
+  submission_exception_message: ''
+  submission_locked_message: ''
+  submission_log: false
+  submission_excluded_elements: {  }
+  submission_exclude_empty: false
+  submission_exclude_empty_checkbox: false
+  submission_views: {  }
+  submission_views_replace: {  }
+  submission_user_columns: {  }
+  submission_user_duplicate: false
+  submission_access_denied: default
+  submission_access_denied_title: ''
+  submission_access_denied_message: ''
+  submission_access_denied_attributes: {  }
+  previous_submission_message: ''
+  previous_submissions_message: ''
+  autofill: false
+  autofill_message: ''
+  autofill_excluded_elements: {  }
+  wizard_progress_bar: true
+  wizard_progress_pages: false
+  wizard_progress_percentage: false
+  wizard_progress_link: false
+  wizard_progress_states: false
+  wizard_start_label: ''
+  wizard_preview_link: false
+  wizard_confirmation: true
+  wizard_confirmation_label: ''
+  wizard_auto_forward: true
+  wizard_auto_forward_hide_next_button: false
+  wizard_keyboard: true
+  wizard_track: ''
+  wizard_prev_button_label: ''
+  wizard_next_button_label: ''
+  wizard_toggle: false
+  wizard_toggle_show_label: ''
+  wizard_toggle_hide_label: ''
+  wizard_page_type: container
+  wizard_page_title_tag: h2
+  preview: 0
+  preview_label: ''
+  preview_title: ''
+  preview_message: ''
+  preview_attributes: {  }
+  preview_excluded_elements: {  }
+  preview_exclude_empty: true
+  preview_exclude_empty_checkbox: false
+  draft: none
+  draft_multiple: false
+  draft_auto_save: false
+  draft_saved_message: ''
+  draft_loaded_message: ''
+  draft_pending_single_message: ''
+  draft_pending_multiple_message: ''
+  confirmation_type: page
+  confirmation_url: ''
+  confirmation_title: ''
+  confirmation_message: ''
+  confirmation_attributes: {  }
+  confirmation_back: true
+  confirmation_back_label: ''
+  confirmation_back_attributes: {  }
+  confirmation_exclude_query: false
+  confirmation_exclude_token: false
+  confirmation_update: false
+  limit_total: null
+  limit_total_interval: null
+  limit_total_message: ''
+  limit_total_unique: false
+  limit_user: null
+  limit_user_interval: null
+  limit_user_message: ''
+  limit_user_unique: false
+  entity_limit_total: null
+  entity_limit_total_interval: null
+  entity_limit_user: null
+  entity_limit_user_interval: null
+  purge: none
+  purge_days: null
+  results_disabled: false
+  results_disabled_ignore: false
+  results_customize: false
+  token_view: false
+  token_update: false
+  token_delete: false
+  serial_disabled: false
+access:
+  create:
+    roles:
+      - anonymous
+      - authenticated
+    users: {  }
+    permissions: {  }
+  view_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  purge_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  view_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  administer:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  test:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  configuration:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+handlers: {  }
+variants: {  }
diff --git a/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form4.yml b/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form4.yml
new file mode 100644
index 0000000..6bf200f
--- /dev/null
+++ b/tests/modules/localgov_forms_test/config/install/webform.webform.address_error_message_test_form4.yml
@@ -0,0 +1,208 @@
+langcode: en
+status: open
+dependencies: {  }
+weight: 0
+open: null
+close: null
+uid: 1
+template: false
+archive: false
+id: address_error_message_test_form4
+title: 'Address error message test form 4'
+description: 'A form with only an address lookup element whose postcode subelement is required.'
+categories: {  }
+elements: |-
+  address:
+    '#type': localgov_webform_uk_address
+    '#title': "It's an address"
+    '#geocoder_plugins':
+      localgov_mock_geocoder: localgov_mock_geocoder
+      nominatim: 0
+      random: 0
+    '#title_display': ''
+    '#postcode__required': true
+css: ''
+javascript: ''
+settings:
+  ajax: false
+  ajax_scroll_top: form
+  ajax_progress_type: ''
+  ajax_effect: ''
+  ajax_speed: null
+  page: true
+  page_submit_path: ''
+  page_confirm_path: ''
+  page_theme_name: ''
+  form_title: both
+  form_submit_once: false
+  form_open_message: ''
+  form_close_message: ''
+  form_exception_message: ''
+  form_previous_submissions: true
+  form_confidential: false
+  form_confidential_message: ''
+  form_disable_remote_addr: false
+  form_convert_anonymous: false
+  form_prepopulate: false
+  form_prepopulate_source_entity: false
+  form_prepopulate_source_entity_required: false
+  form_prepopulate_source_entity_type: ''
+  form_unsaved: false
+  form_disable_back: false
+  form_submit_back: false
+  form_disable_autocomplete: false
+  form_novalidate: false
+  form_disable_inline_errors: false
+  form_required: false
+  form_autofocus: false
+  form_details_toggle: false
+  form_reset: false
+  form_access_denied: default
+  form_access_denied_title: ''
+  form_access_denied_message: ''
+  form_access_denied_attributes: {  }
+  form_file_limit: ''
+  form_attributes: {  }
+  form_method: ''
+  form_action: ''
+  share: false
+  share_node: false
+  share_theme_name: ''
+  share_title: true
+  share_page_body_attributes: {  }
+  submission_label: ''
+  submission_exception_message: ''
+  submission_locked_message: ''
+  submission_log: false
+  submission_excluded_elements: {  }
+  submission_exclude_empty: false
+  submission_exclude_empty_checkbox: false
+  submission_views: {  }
+  submission_views_replace: {  }
+  submission_user_columns: {  }
+  submission_user_duplicate: false
+  submission_access_denied: default
+  submission_access_denied_title: ''
+  submission_access_denied_message: ''
+  submission_access_denied_attributes: {  }
+  previous_submission_message: ''
+  previous_submissions_message: ''
+  autofill: false
+  autofill_message: ''
+  autofill_excluded_elements: {  }
+  wizard_progress_bar: true
+  wizard_progress_pages: false
+  wizard_progress_percentage: false
+  wizard_progress_link: false
+  wizard_progress_states: false
+  wizard_start_label: ''
+  wizard_preview_link: false
+  wizard_confirmation: true
+  wizard_confirmation_label: ''
+  wizard_auto_forward: true
+  wizard_auto_forward_hide_next_button: false
+  wizard_keyboard: true
+  wizard_track: ''
+  wizard_prev_button_label: ''
+  wizard_next_button_label: ''
+  wizard_toggle: false
+  wizard_toggle_show_label: ''
+  wizard_toggle_hide_label: ''
+  wizard_page_type: container
+  wizard_page_title_tag: h2
+  preview: 0
+  preview_label: ''
+  preview_title: ''
+  preview_message: ''
+  preview_attributes: {  }
+  preview_excluded_elements: {  }
+  preview_exclude_empty: true
+  preview_exclude_empty_checkbox: false
+  draft: none
+  draft_multiple: false
+  draft_auto_save: false
+  draft_saved_message: ''
+  draft_loaded_message: ''
+  draft_pending_single_message: ''
+  draft_pending_multiple_message: ''
+  confirmation_type: page
+  confirmation_url: ''
+  confirmation_title: ''
+  confirmation_message: ''
+  confirmation_attributes: {  }
+  confirmation_back: true
+  confirmation_back_label: ''
+  confirmation_back_attributes: {  }
+  confirmation_exclude_query: false
+  confirmation_exclude_token: false
+  confirmation_update: false
+  limit_total: null
+  limit_total_interval: null
+  limit_total_message: ''
+  limit_total_unique: false
+  limit_user: null
+  limit_user_interval: null
+  limit_user_message: ''
+  limit_user_unique: false
+  entity_limit_total: null
+  entity_limit_total_interval: null
+  entity_limit_user: null
+  entity_limit_user_interval: null
+  purge: none
+  purge_days: null
+  results_disabled: false
+  results_disabled_ignore: false
+  results_customize: false
+  token_view: false
+  token_update: false
+  token_delete: false
+  serial_disabled: false
+access:
+  create:
+    roles:
+      - anonymous
+      - authenticated
+    users: {  }
+    permissions: {  }
+  view_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  purge_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  view_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  administer:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  test:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  configuration:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+handlers: {  }
+variants: {  }
diff --git a/tests/modules/localgov_forms_test/config/install/webform.webform.contact3.yml b/tests/modules/localgov_forms_test/config/install/webform.webform.contact3.yml
new file mode 100644
index 0000000..1611c64
--- /dev/null
+++ b/tests/modules/localgov_forms_test/config/install/webform.webform.contact3.yml
@@ -0,0 +1,313 @@
+langcode: en
+status: open
+dependencies:
+  enforced:
+    module:
+      - webform
+open: null
+close: null
+weight: 0
+uid: 1
+template: false
+archive: false
+id: contact3
+title: Contact3
+description: 'Basic email contact webform with two Address lookup fields for two local authorities.'
+category: ''
+elements: |-
+  name:
+    '#title': 'Your Name'
+    '#type': textfield
+    '#required': true
+    '#default_value': '[current-user:display-name]'
+  email:
+    '#title': 'Your Email'
+    '#type': email
+    '#required': true
+    '#default_value': '[current-user:mail]'
+  subject:
+    '#title': Subject
+    '#type': textfield
+    '#required': true
+    '#test': 'Testing contact webform from [site:name]'
+  message:
+    '#title': Message
+    '#type': textarea
+    '#required': true
+    '#test': 'Please ignore this email.'
+  address_brighton:
+    '#type': localgov_webform_uk_address
+    '#title': 'Brighton address'
+    '#geocoder_plugins':
+      localgov_mock_geocoder: localgov_mock_geocoder
+      nominatim: 0
+      random: 0
+    '#always_display_manual_address_entry_btn': 'yes'
+    '#local_custodian_code': 1445
+  address_croydon:
+    '#type': localgov_webform_uk_address
+    '#title': 'Croydon address'
+    '#geocoder_plugins':
+      localgov_mock_geocoder: localgov_mock_geocoder
+      nominatim: 0
+      random: 0
+    '#always_display_manual_address_entry_btn': 'yes'
+    '#local_custodian_code': 5240
+  actions:
+    '#type': webform_actions
+    '#title': 'Submit button(s)'
+    '#submit__label': 'Send message'
+css: ''
+javascript: ''
+settings:
+  ajax: false
+  ajax_scroll_top: form
+  ajax_progress_type: ''
+  ajax_effect: ''
+  ajax_speed: null
+  page: true
+  page_submit_path: ''
+  page_confirm_path: ''
+  page_theme_name: ''
+  form_title: source_entity_webform
+  form_submit_once: false
+  form_exception_message: ''
+  form_open_message: ''
+  form_close_message: ''
+  form_previous_submissions: true
+  form_confidential: false
+  form_confidential_message: ''
+  form_disable_remote_addr: false
+  form_convert_anonymous: false
+  form_prepopulate: false
+  form_prepopulate_source_entity: false
+  form_prepopulate_source_entity_required: false
+  form_prepopulate_source_entity_type: ''
+  form_reset: false
+  form_disable_autocomplete: false
+  form_novalidate: false
+  form_disable_inline_errors: false
+  form_required: false
+  form_unsaved: false
+  form_disable_back: false
+  form_submit_back: false
+  form_autofocus: false
+  form_details_toggle: false
+  form_access_denied: default
+  form_access_denied_title: ''
+  form_access_denied_message: ''
+  form_access_denied_attributes: {  }
+  form_file_limit: ''
+  share: false
+  share_node: false
+  share_theme_name: ''
+  share_title: true
+  share_page_body_attributes: {  }
+  submission_label: ''
+  submission_log: false
+  submission_views: {  }
+  submission_views_replace: {  }
+  submission_user_columns: {  }
+  submission_user_duplicate: false
+  submission_access_denied: default
+  submission_access_denied_title: ''
+  submission_access_denied_message: ''
+  submission_access_denied_attributes: {  }
+  submission_exception_message: ''
+  submission_locked_message: ''
+  submission_excluded_elements: {  }
+  submission_exclude_empty: false
+  submission_exclude_empty_checkbox: false
+  previous_submission_message: ''
+  previous_submissions_message: ''
+  autofill: false
+  autofill_message: ''
+  autofill_excluded_elements: {  }
+  wizard_progress_bar: true
+  wizard_progress_pages: false
+  wizard_progress_percentage: false
+  wizard_progress_link: false
+  wizard_progress_states: false
+  wizard_auto_forward: true
+  wizard_auto_forward_hide_next_button: false
+  wizard_keyboard: true
+  wizard_start_label: ''
+  wizard_preview_link: false
+  wizard_confirmation: true
+  wizard_confirmation_label: ''
+  wizard_track: ''
+  wizard_prev_button_label: ''
+  wizard_next_button_label: ''
+  wizard_toggle: false
+  wizard_toggle_show_label: ''
+  wizard_toggle_hide_label: ''
+  preview: 0
+  preview_label: ''
+  preview_title: ''
+  preview_message: ''
+  preview_attributes: {  }
+  preview_excluded_elements: {  }
+  preview_exclude_empty: true
+  preview_exclude_empty_checkbox: false
+  draft: none
+  draft_multiple: false
+  draft_auto_save: false
+  draft_saved_message: ''
+  draft_loaded_message: ''
+  draft_pending_single_message: ''
+  draft_pending_multiple_message: ''
+  confirmation_type: url_message
+  confirmation_title: ''
+  confirmation_message: 'Your message has been sent.'
+  confirmation_url: '<front>'
+  confirmation_attributes: {  }
+  confirmation_back: true
+  confirmation_back_label: ''
+  confirmation_back_attributes: {  }
+  confirmation_exclude_query: false
+  confirmation_exclude_token: false
+  confirmation_update: false
+  limit_total: null
+  limit_total_interval: null
+  limit_total_message: ''
+  limit_total_unique: false
+  limit_user: null
+  limit_user_interval: null
+  limit_user_message: ''
+  limit_user_unique: false
+  entity_limit_total: null
+  entity_limit_total_interval: null
+  entity_limit_user: null
+  entity_limit_user_interval: null
+  purge: none
+  purge_days: null
+  results_disabled: false
+  results_disabled_ignore: false
+  results_customize: false
+  token_view: false
+  token_update: false
+  token_delete: false
+  serial_disabled: false
+access:
+  create:
+    roles:
+      - anonymous
+      - authenticated
+    users: {  }
+    permissions: {  }
+  view_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  purge_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  view_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  administer:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  test:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  configuration:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+handlers:
+  email_confirmation:
+    id: email
+    label: 'Email confirmation'
+    notes: ''
+    handler_id: email_confirmation
+    status: true
+    conditions: {  }
+    weight: 1
+    settings:
+      states:
+        - completed
+      to_mail: '[current-user:mail]'
+      to_options: {  }
+      cc_mail: ''
+      cc_options: {  }
+      bcc_mail: ''
+      bcc_options: {  }
+      from_mail: _default
+      from_options: {  }
+      from_name: _default
+      subject: '[webform_submission:values:subject:raw]'
+      body: '[webform_submission:values:message:value]'
+      excluded_elements: {  }
+      ignore_access: false
+      exclude_empty: true
+      exclude_empty_checkbox: false
+      exclude_attachments: false
+      html: true
+      attachments: false
+      twig: false
+      theme_name: ''
+      parameters: {  }
+      debug: false
+      reply_to: ''
+      return_path: ''
+      sender_mail: ''
+      sender_name: ''
+  email_notification:
+    id: email
+    label: 'Email notification'
+    notes: ''
+    handler_id: email_notification
+    status: true
+    conditions: {  }
+    weight: 2
+    settings:
+      states:
+        - completed
+      to_mail: _default
+      to_options: {  }
+      cc_mail: ''
+      cc_options: {  }
+      bcc_mail: ''
+      bcc_options: {  }
+      from_mail: '[webform_submission:values:email:raw]'
+      from_options: {  }
+      from_name: '[webform_submission:values:name:raw]'
+      subject: '[webform_submission:values:subject:raw]'
+      body: '[webform_submission:values:message:value]'
+      excluded_elements: {  }
+      ignore_access: false
+      exclude_empty: true
+      exclude_empty_checkbox: false
+      exclude_attachments: false
+      html: true
+      attachments: false
+      twig: false
+      theme_name: ''
+      parameters: {  }
+      debug: false
+      reply_to: ''
+      return_path: ''
+      sender_mail: ''
+      sender_name: ''
+variants: {  }
diff --git a/tests/modules/localgov_forms_test/src/Driver/Database/FakeLts/Connection.php b/tests/modules/localgov_forms_test/src/Driver/Database/FakeLts/Connection.php
new file mode 100644
index 0000000..724d325
--- /dev/null
+++ b/tests/modules/localgov_forms_test/src/Driver/Database/FakeLts/Connection.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\localgov_forms_test\Driver\Database\FakeLts;
+
+use Drupal\Tests\Core\Database\Stub\StubConnection;
+use Drupal\Tests\Core\Database\Stub\StubPDO;
+
+/**
+ * A mock Drupal database driver class.
+ *
+ * Useful during testing.
+ *
+ * Good enough to serve as a database connection object but cannot actually
+ * perform any query operation yet.
+ */
+class Connection extends StubConnection {
+
+  /**
+   * {@inheritdoc}
+   */
+  public $driver = 'fake_lts';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function open(array &$connection_options = []) {
+    return new StubPDO();
+  }
+
+}
diff --git a/tests/modules/localgov_forms_test/src/Geocoder/Provider/LocalgovMockGeocoder.php b/tests/modules/localgov_forms_test/src/Geocoder/Provider/LocalgovMockGeocoder.php
index 1ec46aa..0eebf45 100644
--- a/tests/modules/localgov_forms_test/src/Geocoder/Provider/LocalgovMockGeocoder.php
+++ b/tests/modules/localgov_forms_test/src/Geocoder/Provider/LocalgovMockGeocoder.php
@@ -38,6 +38,11 @@ public function geocodeQuery(GeocodeQuery $query) :LocationCollectionInterface {
     $results       = [];
     $search_string = $query->getText();
     $is_bhcc_hq    = !strcasecmp($search_string, 'BN1 1JE');
+    $is_sandown_rd = !strcasecmp($search_string, 'sandown');
+
+    $local_custodian_code     = $query->getData('local_custodian_code');
+    $is_restricted_to_bhcc    = ($local_custodian_code === self::BHCC_LOCAL_CUSTODIAN_CODE);
+    $is_restricted_to_croydon = ($local_custodian_code === self::CROYDON_LOCAL_CUSTODIAN_CODE);
 
     if ($is_bhcc_hq) {
       $results[] = OsPlacesAddress::createFromArray([
@@ -52,13 +57,53 @@ public function geocodeQuery(GeocodeQuery $query) :LocationCollectionInterface {
         'country'          => 'United Kingdom',
         'countryCode'      => 'GB',
         'display'          => 'Brighton & Hove City Council, Bartholomew House, Bartholomew Square, Brighton, BN1 1JE',
-        'latitude'         => '-0.1409790',
-        'longitude'        => '50.8208609',
+        'latitude'         => '50.8208609',
+        'longitude'        => '-0.1409790',
         'easting'          => '531044',
         'northing'         => '104015',
         'uprn'             => '000022062038',
       ]);
     }
+    elseif ($is_sandown_rd && $is_restricted_to_bhcc) {
+      $results[] = OsPlacesAddress::createFromArray([
+        'providedBy'       => $this->getName(),
+        'org'              => '',
+        'houseName'        => '',
+        'streetNumber'     => '2',
+        'streetName'       => 'SANDOWN ROAD',
+        'flat'             => '',
+        'locality'         => 'BRIGHTON',
+        'postalCode'       => 'BN2 3EJ',
+        'country'          => 'United Kingdom',
+        'countryCode'      => 'GB',
+        'display'          => '2, SANDOWN ROAD, BRIGHTON, BN2 3EJ',
+        'latitude'         => '50.8317948',
+        'longitude'        => '-0.1177381',
+        'easting'          => '532648',
+        'northing'         => '105273',
+        'uprn'             => '22087484',
+      ]);
+    }
+    elseif ($is_sandown_rd && $is_restricted_to_croydon) {
+      $results[] = OsPlacesAddress::createFromArray([
+        'providedBy'       => $this->getName(),
+        'org'              => '',
+        'houseName'        => '',
+        'streetNumber'     => '4',
+        'streetName'       => 'SANDOWN ROAD',
+        'flat'             => '',
+        'locality'         => 'LONDON',
+        'postalCode'       => 'SE25 4XE',
+        'country'          => 'United Kingdom',
+        'countryCode'      => 'GB',
+        'display'          => '4, SANDOWN ROAD, LONDON, SE25 4XE',
+        'latitude'         => '51.3935247',
+        'longitude'        => '-0.0662865',
+        'easting'          => '534630',
+        'northing'         => '167828',
+        'uprn'             => '100020656118',
+      ]);
+    }
 
     return new AddressCollection($results);
   }
@@ -71,4 +116,7 @@ public function reverseQuery(ReverseQuery $query) :LocationCollectionInterface {
     throw new UnsupportedOperation('Reverse geocoding is unavailable in the LocalGov mock geocoder provider.');
   }
 
+  const BHCC_LOCAL_CUSTODIAN_CODE = 1445;
+  const CROYDON_LOCAL_CUSTODIAN_CODE = 5240;
+
 }
diff --git a/tests/src/FunctionalJavascript/AddressLookupErrorMsgTest.php b/tests/src/FunctionalJavascript/AddressLookupErrorMsgTest.php
new file mode 100644
index 0000000..ca66ff9
--- /dev/null
+++ b/tests/src/FunctionalJavascript/AddressLookupErrorMsgTest.php
@@ -0,0 +1,164 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\localgov_forms\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+
+/**
+ * Tests error handling of the address lookup element.
+ *
+ * The address lookup element should only raise errors when one of its
+ * subelements are required.
+ */
+class AddressLookupErrorMsgTest extends WebDriverTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  protected static $modules = ['localgov_forms', 'localgov_forms_test'];
+
+  /**
+   * As it says on the tin.
+   *
+   * @var array
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * Tests address lookup element's ability to remain inactive.
+   *
+   * - Submits an empty form with no required elements.
+   */
+  public function testEmptyFormSubmission(): void {
+
+    $session_assert = $this->assertSession();
+
+    $this->drupalGet('/webform/address_error_message_test_form1');
+    $this->submitForm(edit: [], submit: 'Submit');
+    $session_assert->waitForElementVisible('css', '.webform-confirmation__message');
+
+    $session_assert->pageTextContains('Thank you, your form has been successfully submitted.');
+  }
+
+  /**
+   * Address lookup element should not tamper with errors raised by others.
+   *
+   * - Submits a form with a required radio button.  The address lookup element
+   *   should not raise any errors.
+   */
+  public function testRequiredRadio(): void {
+
+    $session_assert = $this->assertSession();
+
+    // First, try submitting an empty form.
+    $this->drupalGet('/webform/address_error_message_test_form2');
+    $this->submitForm(edit: [], submit: 'Submit');
+
+    $session_assert->statusMessageContains('Does it have an address?', type: 'error');
+
+    // Next, select the required radio and submit again.
+    $this->submitForm(edit: ['does_it_have_an_address' => 'Yes'], submit: 'Submit');
+    $session_assert->waitForElementVisible('css', '.webform-confirmation__message');
+
+    $session_assert->pageTextContains('Thank you, your form has been successfully submitted.');
+  }
+
+  /**
+   * Address lookup element should raise error if a required subfield is empty.
+   *
+   * - Submits an empty form.  Should bring up an error messege from the radio
+   *   element.
+   * - Selects a radio that does not bring up the address lookup element.  Then
+   *   submits form.  Should not bring up any error messages because address
+   *   lookup element is hidden.
+   * - Selects a radio that brings up the address lookup form.  Then submits
+   *   form without selecting or entering any address.  Should result in error
+   *   messages as the postcode subelement is required but empty.
+   * - Selects radio and fills in postcode.  Form submission should succeed.
+   */
+  public function testRequiredRadioAndPostcode(): void {
+
+    $session_assert = $this->assertSession();
+
+    // Submit an empty form.
+    $this->drupalGet('/webform/address_error_message_test_form3');
+    $this->submitForm(edit: [], submit: 'Submit');
+
+    $session_assert->statusMessageContains('Does it have an address?', type: 'error');
+
+    // Submit after selecting a radio button that does not bring up the address
+    // lookup element.
+    $this->submitForm(edit: ['does_it_have_an_address' => 'No'], submit: 'Submit');
+    $session_assert->waitForElementVisible('css', '.webform-confirmation__message');
+
+    $session_assert->pageTextContains('Thank you, your form has been successfully submitted.');
+
+    // Submit after selecting a radio button that brings up the address lookup
+    // element.  But don't fill in the required postcode.
+    $this->drupalGet('/webform/address_error_message_test_form3');
+    $this->submitForm(edit: ['does_it_have_an_address' => 'Yes'], submit: 'Submit');
+    $session_assert->waitForElementVisible('css', '.messages--error');
+
+    $session_assert->statusMessageContains('2 errors have been found:', type: 'error');
+    $session_assert->statusMessageContains('Postcode or street', type: 'error');
+    $session_assert->statusMessageContains('Postcode', type: 'error');
+
+    // Now fill in the required postcode and submit again.
+    $session_assert->buttonExists('Can\'t find the address?')->click();
+    $this->submitForm(edit: [
+      'does_it_have_an_address' => 'Yes',
+      'it_s_address[postcode]'  => 'XM4 5HQ',
+    ], submit: 'Submit');
+    $session_assert->waitForElementVisible('css', '.webform-confirmation__message');
+
+    $session_assert->pageTextContains('Thank you, your form has been successfully submitted.');
+  }
+
+  /**
+   * A form with only an address element with a required postcode.
+   *
+   * Submitting the form with an empty postcode should produce error
+   * irrespective of whether the address has been selected following a lookup or
+   * manually added or altered.
+   */
+  public function testStandaloneAddress(): void {
+
+    $page           = $this->getSession()->getPage();
+    $session_assert = $this->assertSession();
+
+    $this->drupalGet('/webform/address_error_message_test_form4');
+
+    // Fill in the postcode and search for address.
+    $postcode_or_street_textfield = $page->find('css', '#edit-address-address-lookup-address-search-address-searchstring');
+    $this->assertNotEmpty($postcode_or_street_textfield);
+    $postcode_or_street_textfield->setValue('BN1 1JE');
+
+    $search_btn = $page->find('css', '#edit-address-address-lookup-address-search-address-actions-address-searchbutton');
+    $this->assertNotEmpty($search_btn);
+    $search_btn->click();
+    $session_assert->waitForElementVisible('css', '[data-drupal-selector=edit-address-address-lookup-address-select-address-select-list]');
+
+    // Select an address from the dropdown.
+    $address_dropdown = $page->find('css', '[data-drupal-selector=edit-address-address-lookup-address-select-address-select-list]');
+    $this->assertNotEmpty($address_dropdown);
+    $address_dropdown->selectOption('000022062038');
+    $session_assert->waitForElementVisible('css', '#edit-address-address-1');
+
+    // Empty postcode field.
+    $postcode_textfield = $page->find('css', '#edit-address-postcode');
+    $postcode_textfield->setValue('');
+
+    // Submitting the form with an empty postcode should produce error.
+    $submit_btn = $page->find('css', '#edit-submit');
+    $this->assertNotEmpty($submit_btn);
+    $submit_btn->click();
+    $session_assert->waitForElementVisible('css', '.messages--error');
+
+    $session_assert->statusMessageContains('Postcode', type: 'error');
+  }
+
+}
diff --git a/tests/src/FunctionalJavascript/GeocoderAddressLookupTest.php b/tests/src/FunctionalJavascript/GeocoderAddressLookupTest.php
index c6e3648..95284be 100644
--- a/tests/src/FunctionalJavascript/GeocoderAddressLookupTest.php
+++ b/tests/src/FunctionalJavascript/GeocoderAddressLookupTest.php
@@ -75,7 +75,83 @@ public function testAddressLookup() {
     $this->assertEquals('Brighton', $town_textfield->getValue());
     $this->assertEquals('BN1 1JE', $postcode_textfield->getValue());
     $this->assertEquals('000022062038', $uprn_hidden_field->getValue());
-    $this->assertEquals('-0.140979', $latitude_hidden_field->getValue());
+    $this->assertEquals('50.8208609', $latitude_hidden_field->getValue());
+  }
+
+  /**
+   * Tests address caching in multiple address lookup fields.
+   *
+   * Tests a scenario where there are multiple address lookup elements in a form
+   * but they are using different local custodian codes.  The first address
+   * lookup element is restricted to Brighton and Hove; the second one is
+   * restricted to Croydon.  Searching for the same search string in these two
+   * elements should bring up different results.
+   */
+  public function testLocalCustodianCodeCaching() {
+
+    $page           = $this->getSession()->getPage();
+    $session_assert = $this->assertSession();
+
+    $this->drupalGet('/webform/contact3');
+    $session_assert->waitForElementVisible('css', '#edit-address-brighton-address-lookup-address-search-address-searchstring');
+
+    // Lookup "sandown" in Brighton.
+    $postcode_or_street_textfield_bn = $page->find('css', '#edit-address-brighton-address-lookup-address-search-address-searchstring');
+    $this->assertNotEmpty($postcode_or_street_textfield_bn);
+    $postcode_or_street_textfield_bn->setValue('sandown');
+
+    $search_btn_bn = $page->find('css', '#edit-address-brighton-address-lookup-address-search-address-actions-address-searchbutton');
+    $this->assertNotEmpty($search_btn_bn);
+
+    // Click the address "Search" button.
+    $search_btn_bn->click();
+    $session_assert->waitForElementVisible('css', '[data-drupal-selector=edit-address-brighton-address-lookup-address-select-address-select-list]');
+
+    $address_dropdown_bn = $page->find('css', '[data-drupal-selector=edit-address-brighton-address-lookup-address-select-address-select-list]');
+    $this->assertNotEmpty($address_dropdown_bn);
+
+    // Select the one and only address option from the address dropdown.
+    $address_dropdown_bn->selectOption('22087484');
+    $session_assert->waitForElementVisible('css', '#edit-address-brighton-address-1');
+
+    // Verify if the town and postcode fields have been filled in correctly.
+    $town_textfield_bn = $page->find('css', '#edit-address-brighton-town-city');
+    $this->assertNotEmpty($town_textfield_bn);
+    $postcode_textfield_bn = $page->find('css', '#edit-address-brighton-postcode');
+    $this->assertNotEmpty($postcode_textfield_bn);
+
+    $this->assertEquals('BRIGHTON', $town_textfield_bn->getValue());
+    $this->assertEquals('BN2 3EJ', $postcode_textfield_bn->getValue());
+
+    // Now lookup "sandown" again, but in Croydon.
+    $postcode_or_street_textfield_cr = $page->find('css', '#edit-address-croydon-address-lookup-address-search-address-searchstring');
+    $this->assertNotEmpty($postcode_or_street_textfield_cr);
+    $postcode_or_street_textfield_cr->setValue('sandown');
+
+    $search_btn_cr = $page->find('css', '#edit-address-croydon-address-lookup-address-search-address-actions-address-searchbutton');
+    $this->assertNotEmpty($search_btn_cr);
+
+    // Click the address "Search" button.
+    $search_btn_cr->click();
+    $session_assert->waitForElementVisible('css', '[data-drupal-selector=edit-address-croydon-address-lookup-address-select-address-select-list]');
+
+    $address_dropdown_cr = $page->find('css', '[data-drupal-selector=edit-address-croydon-address-lookup-address-select-address-select-list]');
+    $this->assertNotEmpty($address_dropdown_cr);
+
+    // Select the one and only address option from the address dropdown.
+    $address_dropdown_cr->selectOption('100020656118');
+    $session_assert->waitForElementVisible('css', '#edit-address-croydon-address-1');
+
+    // Verify if the town and postcode fields have been filled in correctly.
+    $town_textfield_cr = $page->find('css', '#edit-address-croydon-town-city');
+    $this->assertNotEmpty($town_textfield_cr);
+    $postcode_textfield_cr = $page->find('css', '#edit-address-croydon-postcode');
+    $this->assertNotEmpty($postcode_textfield_cr);
+
+    // The filled in values should be different from Brighton's because this
+    // address lookup field is restricted to Croydon.
+    $this->assertEquals('LONDON', $town_textfield_cr->getValue());
+    $this->assertEquals('SE25 4XE', $postcode_textfield_cr->getValue());
   }
 
 }
diff --git a/tests/src/Unit/BestEffortPIIRedactorForTextTest.php b/tests/src/Unit/BestEffortPIIRedactorForTextTest.php
new file mode 100644
index 0000000..a1105b5
--- /dev/null
+++ b/tests/src/Unit/BestEffortPIIRedactorForTextTest.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\localgov_forms\Unit;
+
+use Drupal\Tests\UnitTestCase;
+use Drupal\localgov_forms\BestEffortPIIRedactorForText;
+
+/**
+ * Unit tests for BestEffortPIIRedactorForText.
+ */
+class BestEffortPIIRedactorForTextTest extends UnitTestCase {
+
+  /**
+   * Tests redaction.
+   *
+   * Tests redaction of emails, postcodes, and numbers from a given text.
+   */
+  public function testRedaction() {
+
+    $redactable_text = "My email address is foo+bar@example.net.\n  Also reachable at qux@example.net.  My address is 7 Example road, CR8 2XX.\n  I was born on 2001-01-01.\n  I have 5 cats.";
+    [, $redaction_count] = BestEffortPIIRedactorForText::redact($redactable_text);
+
+    $this->assertEquals($redaction_count, 8);
+
+    $nonredactable_text = 'preg_replace() performs a regex search and replace.';
+    [, $redaction_count] = BestEffortPIIRedactorForText::redact($nonredactable_text);
+
+    $this->assertEquals($redaction_count, 0);
+  }
+
+}
diff --git a/tests/src/Unit/BestEffortPIIRedactorTest.php b/tests/src/Unit/BestEffortPIIRedactorTest.php
new file mode 100644
index 0000000..4b04734
--- /dev/null
+++ b/tests/src/Unit/BestEffortPIIRedactorTest.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\localgov_forms\Unit;
+
+use Drupal\Tests\UnitTestCase;
+use Drupal\localgov_forms\BestEffortPIIRedactor;
+use Drupal\webform\WebformInterface;
+use Drupal\webform\WebformSubmissionInterface;
+
+/**
+ * Unit tests for PIIRedactor.
+ */
+class BestEffortPIIRedactorTest extends UnitTestCase {
+
+  /**
+   * Tests PIIRedactorTest::findElemsToRedact().
+   */
+  public function testFindElemsToRedact() {
+
+    $mock_webform = $this->createConfiguredMock(WebformInterface::class, [
+      'getElementsDecodedAndFlattened' => [
+        'name'          => ['#type' => 'textfield'],
+        'email'         => ['#type' => 'email'],
+        'subject'       => ['#type' => 'textfield'],
+        'message'       => ['#type' => 'textarea'],
+        'work_number'   => ['#type' => 'tel'],
+        'nino'          => ['#type' => 'textfield'],
+        'location'      => ['#type' => 'address'],
+        'cars'          => ['#type' => 'number'],
+        'gender'        => ['#type' => 'radios'],
+        'ethnicity'     => ['#type' => 'checkboxes'],
+        'date_of_birth' => ['#type' => 'localgov_forms_date'],
+      ],
+    ]);
+    $mock_webform_sub = $this->createConfiguredMock(WebformSubmissionInterface::class, [
+      'getWebform' => $mock_webform,
+    ]);
+
+    $elems_to_redact = BestEffortPIIRedactor::findElemsToRedact($mock_webform_sub);
+
+    $this->assertSame([
+      'email',
+      'work_number',
+      'location',
+      'cars',
+      'name',
+      'nino',
+      'gender',
+      'ethnicity',
+      'date_of_birth',
+    ], $elems_to_redact['full']);
+    $this->assertSame(['message'], $elems_to_redact['part']);
+  }
+
+}