diff --git a/.claude/settings.json b/.claude/settings.json
deleted file mode 100644
index f9ab31566..000000000
--- a/.claude/settings.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(python -c ' *)",
-      "Bash(python -m pytest tests/ -v --no-cov)",
-      "Bash(git -C /workspaces/model diff --stat)",
-      "Bash(python -c \"import moto; print\\('moto installed:', moto.__version__\\)\")",
-      "Bash(grep -E \"\\\\.\\(py|sql\\)$\")",
-      "Bash(xargs basename -a)",
-      "Bash(ls -la /workspaces/home 2>/dev/null | head -20)",
-      "Read(//workspaces/home/**)",
-      "Bash(command -v uv)",
-      "Bash(uv --version)",
-      "Bash(echo \"uv: $\\(uv --version\\)\")",
-      "Bash(python -m pyright --version)",
-      "Bash(npx --no-install pyright --version)",
-      "Bash(node /home/vscode/.npm/_npx/110e52990071af13/node_modules/pyright/dist/pyright.js --outputjson etl/hubspot/hubspotClient.py etl/hubspot/hubspotDataTodB.py etl/hubspot/project_data.py etl/hubspot/scripts/scraper/main.py backend/app/db/models/hubspot_project_data.py backend/app/db/models/hubspot_deal_data.py etl/hubspot/tests/test_scraper_handler.py etl/hubspot/tests/test_hubspot_data_to_db.py etl/hubspot/tests/test_hubspot_client_integration.py)",
-      "Bash(python -c \"import sys,json; d=json.load\\(sys.stdin\\); s=d['summary']; print\\('errors',s['errorCount'],'warnings',s['warningCount']\\); [print\\(f\\\\\"{x['severity']}: {x['file'].split\\('/'\\)[-1]}:{x['range']['start']['line']+1} {x['rule'] if 'rule' in x else ''} -- {x['message'].splitlines\\(\\)[0]}\\\\\"\\) for x in d['generalDiagnostics'] if x['severity']=='error']\")",
-      "Bash(node /home/vscode/.npm/_npx/110e52990071af13/node_modules/pyright/dist/pyright.js etl/hubspot/project_data.py backend/app/db/models/hubspot_project_data.py)",
-      "Bash(python -c \"import sqlmodel, sqlalchemy, hubspot; print\\('deps importable'\\)\")",
-      "Bash(python -m pytest --version)",
-      "Bash(python -m pytest etl/hubspot/tests/ -m \"not integration\" -p no:cacheprovider -o addopts=\"\" -q)",
-      "Bash(node /home/vscode/.npm/_npx/110e52990071af13/node_modules/pyright/dist/pyright.js --pythonpath /usr/local/bin/python etl/hubspot/project_data.py backend/app/db/models/hubspot_project_data.py)",
-      "Bash(node /home/vscode/.npm/_npx/110e52990071af13/node_modules/pyright/dist/pyright.js --pythonpath /usr/local/bin/python etl/hubspot/company_data.py)",
-      "Bash(python /tmp/inspect_project.py)",
-      "Read(//home/vscode/github/**)",
-      "Bash(find / -maxdepth 6 -type d -name assessment-model)",
-      "Bash(terraform fmt *)",
-      "Bash(terraform init *)",
-      "Bash(terraform validate *)",
-      "Bash(python -m pytest tests/orchestration/test_landlord_description_overrides_orchestrator.py -q)",
-      "Bash(python -m pytest tests/orchestration/test_landlord_description_overrides_orchestrator.py tests/repositories/landlord_overrides -q --no-cov)",
-      "Bash(python -m py_compile tests/infrastructure/chatgpt/test_chatgpt_column_classifier.py)",
-      "Bash(git add *)",
-      "Bash(git status *)",
-      "Bash(cp pyrightconfig.json /tmp/pyrightconfig.bak.json)",
-      "Bash(python3 -)",
-      "Bash(npx --yes pyright infrastructure/postgres/landlord_overrides_postgres_repository.py applications/landlord_description_overrides/handler.py tests/repositories/landlord_overrides/postgres/test_landlord_overrides_postgres_repository.py orchestration/classifiable_column.py)",
-      "Bash(git stash *)",
-      "Bash(npx --yes pyright applications/landlord_description_overrides/handler.py)",
-      "Bash(python3 -m pytest tests/repositories/landlord_overrides/postgres/test_landlord_overrides_postgres_repository.py -q)",
-      "Bash(python3 -m pytest tests/orchestration/test_landlord_description_overrides_orchestrator.py tests/repositories/landlord_overrides/ -q -p no:cov)",
-      "Bash(python3 -m pytest tests/orchestration/test_landlord_description_overrides_orchestrator.py tests/repositories/landlord_overrides/ -q)",
-      "Bash(cp pyrightconfig.json /tmp/pyrightconfig.bak2.json)",
-      "Bash(npx --yes pyright infrastructure/landlord_overrides/landlord_overrides_postgres_repository.py tests/repositories/landlord_overrides/postgres/test_landlord_overrides_postgres_repository.py)",
-      "Bash(GIT_EDITOR=true git rebase --continue)",
-      "Bash(git worktree *)",
-      "Bash(git branch *)",
-      "Bash(echo \"exit: $?\")",
-      "Bash(git reset *)",
-      "Bash(echo \"fetch-exit: $?\")",
-      "Bash(sed -n *)",
-      "Bash(set -e)",
-      "Bash(git rm *)",
-      "Bash(git ls-tree *)",
-      "Bash(command -v pyright)",
-      "Bash(git merge *)",
-      "Bash(git rev-list *)",
-      "Bash(git remote *)",
-      "Bash(git ls-remote *)",
-      "Bash(grep -v '\\\\.sample$')",
-      "Bash([ -f \".git/hooks/$h\" ])",
-      "Bash(python3 -m pytest tests/test_lambda_packaging.py -p no:cacheprovider --no-header -q)",
-      "Bash(python3 -m pytest tests/test_lambda_packaging.py -p no:cov --no-header -q)",
-      "Bash(python3 -m pytest tests/test_lambda_packaging.py --no-cov -p no:cacheprovider -q)",
-      "Bash(python3 -m pytest tests/test_lambda_packaging.py --no-cov -q)",
-      "Bash(python3 -m pyright tests/test_lambda_packaging.py)",
-      "Bash(python3 -m pytest tests/ --collect-only --no-cov -q)",
-      "Bash(python3 -c \"import yaml; [print\\(f, 'OK'\\) for f in ['.github/workflows/ddd_tests.yml','.github/workflows/unit_tests.yml'] if yaml.safe_load\\(open\\(f\\)\\)]\")",
-      "Bash(python3 -m pytest tests/ -q --no-cov)",
-      "Bash(python3 -c ' *)",
-      "Bash(python3 -m pyright --outputjson scripts/hyde/main.py)",
-      "Bash(python3 -c \"import json,sys; d=json.load\\(sys.stdin\\); s=d['summary']; print\\('errors:',s['errorCount'],'warnings:',s['warningCount']\\); [print\\(f\\\\\"  L{e['range']['start']['line']+1}: {e['message'].splitlines\\(\\)[0]}\\\\\"\\) for e in d['generalDiagnostics'] if e['severity']=='error']\")",
-      "Bash(python3 -c \"import json,sys; d=json.load\\(sys.stdin\\); s=d['summary']; print\\('pyright errors:',s['errorCount'],'warnings:',s['warningCount']\\); [print\\(f\\\\\"  L{e['range']['start']['line']+1}: {e['message'].splitlines\\(\\)[0]}\\\\\"\\) for e in d['generalDiagnostics'] if e['severity']=='error']\")",
-      "Bash(python3 main.py)",
-      "Bash(netstat -ltnp)",
-      "Bash(fuser 8000/tcp)",
-      "Bash(kill 351610 685390 351625)",
-      "Read(//proc/531213/net/**)",
-      "Bash(ps -p 351610 -o pid=)",
-      "Bash(python -)",
-      "Bash(python -m pytest \"datatypes/epc/domain/tests/test_from_rdsap_schema.py::TestRdSap20_0_0ReducedFieldSynthesis::test_cert_omitting_sap_windows_maps_without_missing_required_field\")",
-      "Bash(python -m pytest datatypes/epc/domain/tests/test_from_rdsap_schema.py infrastructure/epc_client/tests/test_mapper_corpus.py)",
-      "Bash(git -C /workspaces/model stash push -u -- datatypes/epc/schema/rdsap_schema_20_0_0.py datatypes/epc/domain/mapper.py datatypes/epc/domain/tests/test_from_rdsap_schema.py)",
-      "Bash(python -m pytest \"datatypes/epc/domain/tests/test_from_rdsap_schema.py::TestFromRdSapSchema21_0_1::test_total_floor_area\")",
-      "Bash(git -C /workspaces/model stash pop)",
-      "Bash(python -m pytest \"datatypes/epc/domain/tests/test_from_rdsap_schema.py::TestRdSap20_0_0ReducedFieldSynthesis::test_band_more_than_typical_scales_glazing_by_1_25\")",
-      "Bash(python -m pytest \"datatypes/epc/domain/tests/test_from_rdsap_schema.py::TestRdSap20_0_0ReducedFieldSynthesis\")",
-      "Bash(python -m pytest \"datatypes/epc/domain/tests/test_from_rdsap_schema.py::TestRdSap20_0_0ReducedFieldSynthesis::test_synthesised_glazing_type_routed_through_cascade\")",
-      "Bash(python -m pytest infrastructure/epc_client/tests/test_mapper_corpus.py -k \"wip_schema_20\" -q -p no:cov --no-header -rN)",
-      "Bash(python -m pytest infrastructure/epc_client/tests/test_mapper_corpus.py -k \"wip_schema_20\" -q --no-header)",
-      "Bash(timeout 150 python scripts/eon/find_epc_data.py)",
-      "Bash(python -m scripts.run_modelling_e2e --scenario-id 1266 --portfolio-id 785 --measures high_heat_retention_storage_heaters,solar_pv 709634 709635 709636 709638 709639 709640 709641 709642 709644)",
-      "Read(//home/vscode/.claude/skills/grill-me/**)",
-      "Bash(awk '{print $9, $5}')",
-      "Bash(grep -E \"\\\\.py$\")",
-      "Bash(python3 scripts/eon/harvest_certs.py)",
-      "Bash(python scripts/eon/harvest_certs.py)",
-      "Bash(git commit -q -m ' *)",
-      "Bash(timeout 250 npx -y pyright@1.1.410 datatypes/epc/domain/mapper.py)",
-      "Bash(git check-ignore *)",
-      "Bash(timeout 250 npx -y pyright@1.1.410 datatypes/epc/schema/rdsap_schema_18_0.py datatypes/epc/domain/mapper.py)",
-      "Bash(timeout 250 npx -y pyright@1.1.410 datatypes/epc/schema/rdsap_schema_17_1.py datatypes/epc/domain/mapper.py)",
-      "Bash(python -m scripts.run_modelling_e2e --scenario-id 1266 --portfolio-id 785 --measures high_heat_retention_storage_heaters,solar_pv 709634 709635 709636 709638 709639 709640 709641 709642 709643 709644 709645 709637)",
-      "Read(//workspaces/**)",
-      "Bash(python -m scripts.run_modelling_e2e --scenario-id 1266 --portfolio-id 785 --measures high_heat_retention_storage_heaters,solar_pv 709634)",
-      "Bash(python 2_export_data.py)",
-      "Bash(git commit -q -m 'Map RdSAP-Schema-17.0 certs to EpcPropertyData 🟥 *)",
-      "Bash(python -m py_compile tests/utilities/floats.py backend/app/db/functions/tests/test_portfolio_functions.py backend/documents_parser/tests/test_summary_pdf_mapper_chain.py backend/documents_parser/tests/test_heating_systems_corpus.py)",
-      "Bash(PYTHONPATH=/workspaces/model python -)",
-      "Bash(npx --no-install pyright datatypes/epc/schema/sap_schema_17_1.py datatypes/epc/domain/mapper.py datatypes/epc/domain/tests/test_from_sap_schema.py)",
-      "Bash(git commit -q -m 'Map full-SAP cert identity and scalar fields to EpcPropertyData 🟩 *)",
-      "Bash(npx --no-install pyright --outputjson datatypes/epc/domain/mapper.py)",
-      "Bash(git commit -q -m 'Carry full-SAP measured fabric U-value descriptions into the domain model 🟩 *)",
-      "Bash(python scripts/hyde/elmhurst_session.py --help)",
-      "Bash(python scripts/hyde/elmhurst_session.py status)",
-      "Bash(DISPLAY=:99 import -window root /tmp/hyde-viewer/elm_now2.png)",
-      "Bash(DISPLAY=:99 timeout 90 python scripts/hyde/elmhurst_explore.py \"https://rdsap10online.elmhurstenergy.co.uk/Processing/WebFormAddress.aspx?Guid=B44A0DB4-4C08-4241-B818-86F060172105&Referrer=https%3a%2f%2fmembers.elmhurstenergy.co.uk%2fRdsapZone%2fHome.aspx\")",
-      "Bash(DISPLAY=:99 timeout 90 python scripts/hyde/elmhurst_explore.py \"https://rdsap10online.elmhurstenergy.co.uk/Processing/WebFormPropertyDescription.aspx?Guid=B44A0DB4-4C08-4241-B818-86F060172105\")",
-      "Bash(DISPLAY=:99 timeout 90 python scripts/hyde/elmhurst_explore.py \"https://rdsap10online.elmhurstenergy.co.uk/Processing/WebFormAddress.aspx?Guid=B44A0DB4-4C08-4241-B818-86F060172105\")",
-      "Bash(DISPLAY=:99 timeout 150 python scripts/hyde/elmhurst_fill.py)",
-      "Bash(pkill -f \"rdsap10\\\\|for-testing\")",
-      "Bash(rm -f scripts/hyde/.elmhurst-session/Singleton*)",
-      "Bash(DISPLAY=:99 timeout 280 python -u scripts/hyde/elmhurst_fill.py --page property_description --commit)",
-      "Bash(npx --no-install pyright scripts/hyde/elmhurst_download.py)",
-      "Edit(/.claude/skills/expand-sap-accuracy-corpus/**)",
-      "Bash(PYTHONPATH=/workspaces/model python scripts/fetch_real_life_epc_sample.py 10093116528)",
-      "Bash(PYTHONPATH=/workspaces/model python -c ' *)",
-      "Bash(bash scripts/hyde/start_viewer.sh)",
-      "Bash(DISPLAY=:99 ELMHURST_URL=\"https://rdsap10online.elmhurstenergy.co.uk/Processing/WebFormAddress.aspx?Guid=B44A0DB4-4C08-4241-B818-86F060172105\" python scripts/hyde/elmhurst_session.py login)",
-      "Bash(break)",
-      "Bash(DISPLAY=:99 timeout 90 python /tmp/check_session.py)",
-      "Bash(pkill -9 -f \"elm_login_hold.py\")",
-      "Bash(pkill -9 -f \"elmhurst-session\")",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 150 python /tmp/elm_build_dims.py)",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 120 python /tmp/elm_dump_full.py Walls WebFormWalls.aspx)",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 120 python /tmp/elm_walls_disc.py)",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 120 python /tmp/elm_roof_disc.py)",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 120 python /tmp/elm_dump_full.py Openings WebFormOpenings.aspx)",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 120 python /tmp/elm_win_probe.py)",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 220 python /tmp/elm_build_openings.py)",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 120 python /tmp/elm_tab_probe.py)",
-      "Bash(ELM_ACCESS=\"P960-0001\" ELM_PWD=\"y22bseGUzr\" DISPLAY=:99 timeout 120 python /tmp/elm_del_probe.py)",
-      "Bash(npx --no-install pyright datatypes/epc/domain/epc_property_data.py datatypes/epc/domain/mapper.py domain/sap10_calculator/rdsap/cert_to_inputs.py)",
-      "Bash(PYTHONPATH=/workspaces/model python -m pytest domain/sap10_calculator/tests/test_sap_accuracy_corpus.py -q --no-cov)",
-      "Bash(PYTHONPATH=/workspaces/model python -m pytest tests/domain/sap10_calculator/test_real_cert_sap_accuracy.py -q --no-cov)",
-      "Edit(/.claude/skills/epc-to-elmhurst-rdsap-inputs/**)",
-      "Bash(python3 -c \"import sys; sys.path.insert\\(0,'scripts/hyde'\\); import elmhurst_lib; print\\('elmhurst_lib imports OK:', [f for f in dir\\(elmhurst_lib\\) if not f.startswith\\('_'\\)][:12]\\)\")",
-      "Bash(PYTHONPATH=/workspaces/model python -m pytest tests/domain/sap10_calculator/test_real_cert_sap_accuracy.py tests/infrastructure/epc_client/test_sap_accuracy_corpus.py -q --no-cov)",
-      "Bash(PYTHONPATH=/workspaces/model python scripts/fetch_real_life_epc_sample.py 10093116543)",
-      "Bash(echo \"---EXIT $?---\")",
-      "Bash(sudo apt-get update -o Dir::Etc::sourceparts=-)",
-      "Bash(apt-cache policy *)",
-      "Bash(sudo apt-get update)",
-      "Bash(bash scripts/hyde/start_viewer.sh restart)",
-      "Bash(echo \"=== listen sockets \\(port 6080 / 5900\\) ===\"; ss -ltnp 2>/dev/null | grep -E ':6080|:5900' || netstat -ltnp 2>/dev/null | grep -E ':6080|:5900' || echo \"ss/netstat unavailable\" *)",
-      "Read(//proc/5476/**)",
-      "Bash(sudo python -m playwright install-deps chromium)",
-      "Bash(python -m playwright install chromium)",
-      "Bash(python -m playwright --version)",
-      "Bash(pip show *)"
-    ],
-    "additionalDirectories": [
-      "/tmp",
-      "/workspaces/model/scripts/hyde/.elmhurst-session"
-    ]
-  }
-}
diff --git a/.claude/skills/audit-ara-portfolio/SKILL.md b/.claude/skills/audit-ara-portfolio/SKILL.md
new file mode 100644
index 000000000..6621a9f33
--- /dev/null
+++ b/.claude/skills/audit-ara-portfolio/SKILL.md
@@ -0,0 +1,122 @@
+---
+name: audit-ara-portfolio
+description: Audit a modelled Ara portfolio for odd results — run the deterministic anomaly checks over the DB, review the groups, deep-dive a sample of each, characterise sub-classes, and cross-reference open PRs/ADRs. Use when the user wants to audit or review a portfolio's modelling output, hunt for dodgy plans / baselines / SAP scores / recommendations, or triage modelling anomalies. Asks for portfolio id and scenario id.
+---
+
+# Audit Ara portfolio
+
+Turn the deterministic anomaly scan into a triaged, root-caused review. The
+deterministic checks (`scripts/audit/anomalies.py`) find KNOWN anti-patterns
+exhaustively and cheaply; this skill adds the judgement — confirm, characterise,
+cross-reference existing work, and feed novel patterns back as new checks.
+
+## Input
+
+Ask for **portfolio_id** and **scenario_id** if the user didn't give them.
+`scenario_id` is optional — without it, each Property's *default* plan (the one
+shown in the FE) is audited.
+
+## Phase 1 — Build the dataset
+
+```
+python -m scripts.audit.anomalies --portfolio <portfolio_id> --scenario <scenario_id>
+```
+
+Writes `modelling_audit.md` (grouped, ranked by severity) and
+`modelling_audit.csv` (every flagged row: property_id, uprn, severity, check,
+detail). Read the printed summary and `modelling_audit.md`.
+
+## Phase 2 — Review the high-level results
+
+For each check group, HIGH severity first: note the count, read a few example
+rows. State, in one line each, a **root-cause hypothesis** and whether it is a
+real bug, a known/expected effect, or a threshold that needs tuning.
+
+## Phase 3 — Deep-dive a sample per group
+
+For 2–3 representative properties in each meaningful group, reproduce
+end-to-end (NO DB writes — never pass `--persist`):
+
+```
+python -m scripts.run_modelling_e2e <property_id> --scenario-id <scenario_id>
+```
+
+Read the printed overrides + effective SAP + measure-by-measure plan table.
+Confirm the anomaly and isolate **where** it goes wrong: the baseline, a specific
+measure, the SAP calc, or the bill. For SAP-value bugs, the `SapResult`
+worksheet / `intermediate` trail and the `/diagnose` loop are the tools.
+
+## Phase 4 — Characterise sub-classes
+
+A group of thousands is usually several distinct causes. Within each meaningful
+group, cluster the flagged properties by a distinguishing trait — EPC source
+(lodged / predicted), `rebaseline_reason`, property type, the dominant measure,
+fuel — using SQL against the DB. Report the sub-classes and their sizes.
+
+## Phase 5 — Cross-reference open work
+
+Before proposing fixes, check whether one is already in flight:
+
+```
+gh pr list --repo Hestia-Homes/Model --state open
+gh pr list --repo Hestia-Homes/Model --state all --search "<keyword>"
+```
+
+Map each sub-class to an existing PR / ADR where one applies (e.g.
+baseline-vs-plan divergence → the override-aware-rebaseline + persistence-fidelity
+work; oversized solar → ADR-0038 dwelling-roof cap). Flag sub-classes with no
+coverage as new work.
+
+## Output
+
+A triage report. Per check group:
+- count + root-cause hypothesis,
+- sub-classes, each sized,
+- example property ids (to reproduce),
+- existing-PR/ADR coverage,
+- recommended action: **fix** / **tune threshold** / **accept (expected)** / **new ticket**.
+
+Then run Phase 6 to make the audit permanently better.
+
+## Phase 6 — Self-improve (the compounding loop)
+
+When the review confirms a **novel, systematic** problem, codify it so every
+future run catches it automatically. This is what makes the audit get better each
+time it runs. Apply the gates below — they keep the registry sharp, not noisy.
+
+**Gates (all must hold before adding a check):**
+1. **Systematic** — reproduced on **≥ 5** properties and root-caused, not a
+   one-off. (A single weird property is a ticket, not a check.)
+2. **Not already covered** — no existing check fires on it, and no open/merged PR
+   or ADR already addresses the cause (you checked in Phase 5).
+3. **Pressure-tested** — for any non-trivial check (a threshold, a heuristic),
+   run `/grill-me` on the proposed check first: what's the false-positive rate on
+   this portfolio? is the threshold defensible against the real distribution? does
+   it overlap an existing check? Tune from the answers before committing.
+
+**What to change, smallest first:**
+- **A check** — add one decorated `(PropertyAudit) -> Optional[str]` function to
+  `scripts/audit/anomalies.py`. Its docstring MUST record **provenance**: the
+  motivating property ids and the one-line root cause, so the check is traceable
+  and re-verifiable later. If it needs a field not on `PropertyAudit`, extend the
+  bundle + query.
+- **The skill** — if the review revealed a new *expectation* (a pattern that is
+  expected-not-a-bug, or a new deep-dive technique), add it to this file's Notes
+  / phases so the next reviewer starts ahead.
+- **Docs** — if the cause is a load-bearing modelling decision, an ADR may be
+  warranted (rare; only when hard-to-reverse + surprising + a real trade-off).
+
+Commit each codified check on its own with the motivating run referenced, then
+**re-run Phase 1** to confirm the new check fires on the cases that motivated it
+and nothing else surprising. The check registry — with provenance — is the
+durable, compounding output of every audit.
+
+## Notes
+
+- Read-only on the DB. `run_modelling_e2e` is a dry run.
+- **Expected, not bugs** (until the override-aware-rebaseline + persistence-fidelity
+  PR deploys and the portfolio is re-modelled): much of `zero-works-post-differs`
+  and `plan-score-below-baseline` is the pre-fix baseline-vs-plan divergence and
+  should shrink after re-model — note it, don't re-debug it.
+- Adding a check is one decorated `(PropertyAudit) -> Optional[str]` function in
+  `scripts/audit/anomalies.py`; see its module docstring.
diff --git a/.claude/skills/epc-to-elmhurst-rdsap-inputs/reference/mapping.md b/.claude/skills/epc-to-elmhurst-rdsap-inputs/reference/mapping.md
index 1aab02980..245b357a2 100644
--- a/.claude/skills/epc-to-elmhurst-rdsap-inputs/reference/mapping.md
+++ b/.claude/skills/epc-to-elmhurst-rdsap-inputs/reference/mapping.md
@@ -180,12 +180,23 @@ Table 32 unit costs, p/kWh (`domain/sap10_calculator/tables/table_32.py`):
 **`main_fuel_type` / `water_heating_fuel` 29 = off-peak (7-hour) electricity** →
 Elmhurst Electricity meter type = **Dual-rate / Economy 7 (7-hour)**, NOT Single.
 
-⚠️ **Known over-rating bug:** the engine prices **100% of off-peak space heating
-AND hot water at the 5.50p low rate** (`inputs.space_heating_fuel_cost_gbp_per_kwh`
-= 0.055), instead of the SAP **Table 12a high/low split** (a portion at the 15.29p
-high rate). This under-costs all-electric Economy-7 dwellings and inflates the SAP
-score. Always surface this in the output's "Known divergences". Canonical case:
-UPRN 10002468137 — lodged 55, engine 62.
+✅ **Economy-7 high/low split — FIXED (PR #1217).** The engine now applies the SAP
+**Table 12a Grid 1** (space) + **Table 13** (immersion DHW) high/low split rather
+than pricing 100% at the 5.50p low rate. Electric STORAGE heaters legitimately get
+a 0.00 SH high-rate fraction (100% low — spec value, not a bug); immersion HW takes
+the cylinder-volume/occupancy/single-dual Table 13 blend (applied in
+`cert_to_inputs._hot_water_fuel_cost_gbp_per_kwh` when volume + occupancy +
+single/dual are all resolved; absent any of them it still falls back to 100% low —
+a rarer edge). Verified: canonical UPRN 10002468137 engine 60.92 = Elmhurst 61 to
+the penny (its lodged 55 is the OLD SAP-2012 schema, not comparable); UPRN
+10022893721 engine 79 = lodged 79, Elmhurst (Dual meter) 81.
+
+⚠️ **When building in Elmhurst you MUST set the Economy-7 meter** (`main_fuel_type`
+/ `water_heating_fuel` 29 = off-peak 7-hour → Electricity meter type **Dual**, NOT
+Single). Elmhurst silently defaults to Single/Standard and prices at the 13.19p
+standard rate, collapsing the worksheet SAP ~13 points — which can masquerade as an
+engine "over-rating". The control is a hidden Meters sub-tab on the SpaceHeating
+page (`TabPanelMeters_RadioButtonListElectricityType`).
 
 ## Water Heating
 
diff --git a/.claude/skills/expand-sap-accuracy-corpus/SKILL.md b/.claude/skills/expand-sap-accuracy-corpus/SKILL.md
index 9c2d40626..954264e70 100644
--- a/.claude/skills/expand-sap-accuracy-corpus/SKILL.md
+++ b/.claude/skills/expand-sap-accuracy-corpus/SKILL.md
@@ -19,6 +19,74 @@ score the property would get unchanged. Elmhurst is the accredited ground truth;
 its Input Summary (parsed back to `EpcPropertyData`) exposes mapper holes, and its
 worksheet exposes calculator holes.
 
+## ⏩ Resume in a fresh context (autonomous run)
+
+If the user says "continue" / "next" / "keep going through the worklist", run this
+loop **continuously without asking between certs** — report only `eng X / elm Y`
+per cert and tick the worklist line as each is pinned. The build automation is
+fully working (see `scripts/hyde/elmhurst_lib.py` helpers + the `build_<uprn>.py`
+templates); most certs build unattended end-to-end.
+
+**State (2026-06-19):** pinned this campaign — SAP-17.1 cohort + RdSAP-17.1/18.0
+(older) plus: **16.1** `100021943298` (76/75), **19.1.0** `10096028301` (82/82),
+**16.3** `44012843` (79/78), **17.0** `10023444324` (80/80) + `10023444320`
+(81/82), **RdSAP-20.0.0** `10090844932` (78/77), **16.2** `100090182288` (69/71,
+semi house). Latest run (2026-06-19): **16.2** `100021985993` (74/72, end-terrace
+bungalow), **17.1** `10091568921` (82/80, full-SAP end-terrace house combi 17615)
++ `10093718424` (81/80, semi sibling), **RdSAP-18.0** `10022893721` (79/81, first
+NON-BOILER cert — electric storage heaters + immersion; storage-heater automation
+now SOLVED incl. the Economy-7 Dual-meter step, see banked findings; engine 79 =
+lodged, NO bug), **RdSAP-21.0.1** `10023443426` (76/79, native schema, combi house;
+engine 76 = lodged EXACTLY; Elmhurst +3 = omitted-secondary build gap). Next `[ ]`:
+`10093412452` (SAP-17.1), then `10090343335` (17.0) / `10093115480` (17.1) /
+`68151071` (RdSAP-17.0). Skip `100020933699` (user said skip), `[⛔]` (NOT
+MAPPABLE), `[⚠]` (flagged engine bugs: MVHR / heat-pump fuel-39).
+
+**Per-UPRN recipe** (all commands `DISPLAY=:99`, cwd `scripts/hyde`; run
+`bash scripts/hyde/start_viewer.sh` once; creds in `.elmhurst-creds.json`; shared
+assessment GUID `B44A0DB4-4C08-4241-B818-86F060172105`):
+1. `PYTHONPATH=/workspaces/model python scripts/fetch_real_life_epc_sample.py <uprn>`
+   then scope: dwelling_type/built_form, age band, walls/roof/floor descriptions,
+   heating `main_heating_index_number`/category/`has_hot_water_cylinder`, window
+   total area (`sum(sap_windows w*h)`), party_wall_length, lighting %, MEV/AP50.
+2. **Copy the closest `build_<uprn>.py` template** and adjust values:
+   - combi flat → `build_100021943298.py`; regular-boiler+cylinder flat →
+     `build_44012843.py`; full-SAP combi flat (MEV+AP50) → `build_10096028301.py`
+     / `build_10023444324.py` (+party wall) / `build_10023444320.py` (mid-floor);
+   - combi house → `build_10090844932.py` (end-terrace, party wall) /
+     `build_100090182288.py` (semi, no party wall).
+   Adjust: property type/built-form, band (`_pick` by year, e.g. "1950"/"2012"/
+   "2023"), two-floor dims + party wall, wall insulation, roof, floor, window m²,
+   doors, lighting, boiler PCDB ref + search query, MEV/AP50 if present.
+3. Run pages: `for p in property_description [flats] dimensions walls roofs floors
+   openings ventilation; do … build_<uprn>.py $p; done` (one Save&Close each,
+   ~1 min/page; flats only for Flat property type). Then a window-verify/fix
+   snippet (re-add the combined window if the grid shows 0.00), then
+   `build_<uprn>.py space_heating` and `water_heating`.
+4. Heating uses the `elmhurst_lib` helpers: `E.select_boiler(page, "<model>",
+   "<pcdb_id>")` (look up id/type in `domain/elmhurst/pcdb_gas_oil_boiler_codes.csv`;
+   the lodged `main_heating_index_number` IS the id); control
+   `E.set_heating_dialog(page, "…ButtonMainHeatingControls", "^Boilers",
+   "^Standard", "CBE Programmer, room thermostat and TRVs")` (=2106); water
+   `E.set_heating_dialog(page, "…ButtonWaterHeatingCode", "From Space Heating",
+   "From the primary heating system")`; combi → `E.clear_hot_water_cylinder(page)`.
+5. Download: edit `elmhurst_download.py` `SAMPLE_DIR` to the cert's
+   `<schema>/uprn_<uprn>` dir; first confirm Recommendations is clean (parse
+   `[id*=ContentPlaceHolder1] a` link text — Summary silently redirects to Address
+   until zero errors); `python scripts/hyde/elmhurst_download.py` (retry once; the
+   nav goes Address→Recommendations→Summary).
+6. `PYTHONPATH=/workspaces/model python scripts/compare_epc_paths.py <uprn>` →
+   read **"gov-API inputs → SAP"** (engine) and **"Elmhurst's OWN engine
+   (worksheet …)"** (Elmhurst ground truth). Target ≤0.5–1.
+7. **Pin** the engine value: add a `RealCertExpectation(schema, sample=uprn_<uprn>,
+   cert_num, sap_score=<engine>)` in `tests/.../test_real_cert_sap_accuracy.py`;
+   run `…::test_real_cert_sap_score`.
+8. Tick the worklist line `[x] … · eng X / elm Y (lodged Z) · PINNED …`. Next cert.
+
+See **Banked findings** below for the modal-dialog mechanics (all already encoded
+in the helpers). New schema not mappable → add a dedicated `from_*_schema_*`
+mapper first (per-schema convention) + guard with the RdSAP-21.0.1 corpus gauge.
+
 ## The loop (one UPRN)
 
 1. **Pick** the first `[ ]` UPRN in [worklist.md](worklist.md).
@@ -83,6 +151,14 @@ Pattern: `with E.session() as (ctx,page): E.goto(...); E.set_text/set_select(...
   2022" ≈ U1.4/g0.72) — the "...known data" option demands per-row Frame-Factor/
   Data-Source/Location/Building-Part and fails validation. Trust the grid only
   after Save & Close + reload (the live grid mis-shows older rows as 0.00).
+- **Window-width `.fill()` can DOUBLE the value** → "Openings: Width has to be less
+  or equal to 50" validation error. `_add_window`'s `page.locator(TextBoxExtWidth)
+  .fill(str(area))` went through Elmhurst's keystroke/numeric formatter and rendered
+  `11.1` as `111.10` (uprn_10010215568) — the Recommendations gate then blocks the
+  download. After building Openings, VERIFY the grid width (reload + read the row);
+  if wrong, JS-set it: `el.value='11.1'; dispatch input+change+blur`, then Save&Close
+  (the entry boxes mirror the single row = edit-in-place). JS-set bypasses the
+  formatter and sticks. Belt-and-braces: set the width by JS in `_add_window` too.
 - **U-value-known overrides** (walls/roof/floor) don't toggle via automation →
   accept the natural RdSAP age-band U-value; note the divergence for reconciliation.
 - **Recommendations page = validation gate.** It must show ZERO errors before the
@@ -93,6 +169,112 @@ Pattern: `with E.session() as (ctx,page): E.goto(...); E.set_text/set_select(...
   lines 17/18). This drove the first campaign mapper fix — see Banked findings.
 
 ## Banked findings (fold new ones in here as the corpus grows)
+- **MAPPER GAP — cylinder insulation thickness dropped (RdSAP-17.0+):** the mapper
+  carries `cylinder_size` + `cylinder_insulation_type` but NOT
+  `cylinder_insulation_thickness` → `EpcPropertyData.sap_heating.cylinder_
+  insulation_thickness_mm` stays None even when the cert lodges it (e.g. 50 mm).
+  The engine then assumes a poorly-insulated cylinder → over-counts HW cylinder
+  loss → under-rates. Confirmed uprn_68151071 (raw 50 mm → mapped None; engine HW
+  3446 vs Elmhurst 2911 kWh; engine 68 vs lodged 70 / Elmhurst 71). FIX: map the
+  thickness in the RdSAP per-schema mapper; check blast radius (any pinned cylinder
+  cert may shift) + regress the RdSAP-21.0.1 corpus gauge. Leverage point — likely
+  improves every cylinder-with-lodged-thickness cert. Flagged, not yet fixed.
+- **Party-wall type `_pick` gotcha:** matching `"filled"` ALSO matches "Cavity
+  masonry **UN**filled" (CU, U≈0.5) — the wrong type for a cert whose party wall is
+  U≈0. Match `"masonry filled"` to hit CF (Cavity masonry filled, U≈0). Affects
+  cavity builds (10090844932 / 10091568921 / 10093718424 / 10093412452 used the
+  loose `"filled"` and may have got CU in Elmhurst — only the Elmhurst cross-check,
+  not the pinned engine value which is validated against lodged). Fixed for
+  uprn_10093115480.
+- **Shared-assessment reset: storage/electric → boiler cert.** The shared
+  assessment carries the PRIOR cert's heating system. Going storage→combi, the
+  boiler search dialog won't open while a SAP-table `MainHeatingCode` (e.g. SEB) is
+  set. Fix: JS-clear `MH1.TextBoxMainHeatingCode` to `''` + dispatch change, Save &
+  Close, then `select_boiler` works. Also RESET the electricity meter on the Meters
+  sub-tab (a prior off-peak cert leaves it Dual; gas certs want Single) and the
+  SECONDARY heating (a prior cert's secondary persists even when the calc shows
+  presence=No — set it explicitly or it pollutes the worksheet).
+- **Secondary heating must be built in Elmhurst when lodged.** Certs lodge a
+  secondary (`sap_heating.secondary_heating_type`, e.g. 612 = mains-gas room heater
+  @ Table 4a seasonal efficiency 0.20 — a low-eff decorative/old gas fire). The
+  engine models it (fraction 0.1 from Table 11 ÷ the secondary efficiency → e.g.
+  3065 kWh for code 612); omitting it in Elmhurst inflates the worksheet (uprn_
+  10023443426: omitted → 79 vs engine/lodged 76). Build via Secondary present=Yes →
+  `ButtonSecondaryHeatingCode` cascade (title "Select secondary heating"): fuel →
+  sub-fuel → appliance → type, e.g. Gas → Mains gas → Room Heaters → RGx (pick the
+  RGx whose efficiency matches the lodged code, ~0.20 = decorative/old gas fire).
+  ⚠ For a NATIVE RdSAP-21.0.1 cert, engine = lodged (exact, all components) is the
+  authoritative validation — if the Elmhurst rebuild diverges, suspect an omitted
+  lodged feature (secondary / meter), confirm via engine-on-Elmhurst-inputs ≈
+  worksheet, and pin the engine = lodged value.
+  ⚠ **`present=No` does NOT clear the shared assessment's leftover secondary** — the
+  prior cert's secondary SYSTEM (fuel + SAP code) persists server-side even when the
+  UI dropdown reads "No", and it silently re-enters the worksheet. On a storage-heater
+  cert (uprn_100020665611, RdSAP-20.0.0 end-terrace house) a leftover House-Coal
+  closed-room-heater (SAP 633, cheap solid fuel) inflated the Elmhurst worksheet to
+  44 vs engine 36 / lodged 37 until OVERWRITTEN. Always set the secondary EXPLICITLY
+  to the lodged appliance: storage-heater certs lodge "Portable electric heaters
+  (assumed)" → present=Yes → `ButtonSecondaryHeatingCode` cascade Electric → Electric
+  → Room Heaters → "REA Panel, convector or radiant heaters" (= SAP 691, eff 100%).
+  That dropped the worksheet 44 → 35 ≡ engine-on-Elmhurst-inputs 35 (faithful).
+- **Openings: standard double/triple-glazing bands REQUIRE Frame Type + Glazing Gap.**
+  The window grid's `DropDownListExtFrameType` (PVC/Wood/Metal) and
+  `DropDownListExtGlazingGap` (6 mm / 12 mm / 16 mm or more) are required for any
+  band other than the new-build "Double post or during 2022" default — leaving them
+  empty fails the Recommendations gate ("Openings: Frame Type / Glazing Gap must be
+  entered"). Set both in `_add_window` BEFORE clicking Add (cert `pvc_window_frames`
+  → PVC; `glazing_gap` mm → the band). Glazing bands available: Single / Double|Triple
+  {pre 2002, between 2002 and 2021, post or during 2022, with unknown install date} /
+  Secondary / *…known data*. For RdSAP double-glazing with no lodged install year
+  (engine U 2.8) pick "Double pre 2002" (~U3.1, sub-1-SAP diff) — the "…known data"
+  options demand per-row U/g values.
+- **Non-boiler (storage-heater) main heating — SOLVED** (uprn_10022893721, RdSAP-
+  18.0 GF flat, electric storage heaters + immersion). The SpaceHeating page has NO
+  inline system-type selector and a `ButtonMainHeatingCode` button only APPEARS
+  once the bound PCDF boiler is cleared. Two-pass recipe (one Save & Close each):
+  1. **Clear the leftover PCDB boiler**: set `MH1.TextBoxPCDFBoilerReference` to
+     `"0"` via JS + dispatch `change`, then `save_close`. (It doesn't AutoPostBack;
+     the Save commits it. After reload, boilerRef="0", the boiler fuel/flue fields
+     vanish, and `MH1.ButtonMainHeatingCode` is now present.)
+  2. **Select the SAP-table system** via `set_heating_dialog(..ButtonMainHeating
+     Code, "^Electric","^Electric","Storage","SEB Modern slimline")` (title "Select
+     heating code"; L1 Gas/Oil/Solid Fuel/Electric/Community/No heating; storage L4
+     = SEA old large-volume / SEB modern slimline / SED fan / SEJ integrated / SEK
+     high-heat-retention). **Match the cert's `sap_main_heating_code`**: 402 = SEB.
+     Then the CONTROL via `set_heating_dialog(..ButtonMainHeatingControls,
+     "Storage Radiator","CSA Manual charge control")` (= SAP 2401). Secondary No.
+  Water: `set_heating_dialog(..ButtonWaterHeatingCode, "Water Heater","^Electric",
+  "Immersion")` (→ code HEI) — then the immersion code REQUIRES a cylinder: CHECK
+  `WH.CheckBoxHotWaterCylinder` (JS click+change, AutoPostBacks) or Recommendations
+  errors "must have a Hot Water Cylinder"; set `WH.DropDownListCylinderSize`
+  (size 2→Normal/110L, 3→Medium/160L, 4→Large/210L), `WH.DropDownListInsulated`
+  (Foam/Jacket), `WH.DropDownListInsulationThickness`, and `WH.RadioButton
+  ListImmersionHeater` (off-peak meter → Dual). See `build_10022893721.py` as the
+  template. ⚠ **CRITICAL — set the electricity meter type.** All-electric off-peak
+  certs MUST set the Economy-7 meter or Elmhurst silently defaults to Single /
+  Standard and prices everything at the 13.19p standard rate (worksheet collapses
+  ~13 SAP). The control is a HIDDEN sub-tab on the SpaceHeating page:
+  `E.click_tab(page,"TabContainer_TabPanelMeters")` then `E.set_select(page,
+  "TabContainer_TabPanelMeters_RadioButtonListElectricityType","Dual")` (options
+  Single/Dual/18 Hour/24 Hour/Unknown; cert `meter_type` 1→Dual=7-hour off-peak).
+  Verify in Elmhurst summary §14.2 "Electricity meter type" / worksheet
+  "Electricity Tariff" before trusting the worksheet SAP.
+- **Economy-7 off-peak pricing is CORRECT — do NOT "fix" it** (was a real bug, FIXED
+  in PR #1217 via the Table 13 off-peak water-heating split + window-U fix). The
+  engine applies SAP Table 12a Grid 1 (space) + Table 13 (immersion DHW) high/low
+  splits properly: storage heaters' SH high-rate fraction is legitimately 0.00
+  (100% low rate), immersion HW takes the volume/occupancy/single-dual blend. Proof:
+  uprn_10002468137 (canonical) engine 60.92 = Elmhurst 61 to the penny;
+  uprn_10022893721 engine 79 = lodged 79, Elmhurst (Dual meter) 81. ⚠ If you see a
+  big engine-over-Elmhurst gap on an all-electric off-peak cert, SUSPECT THE BUILD
+  (Elmhurst meter left on Single — see meter step above), not the calculator. The
+  `reference/mapping.md` "known over-rating bug (engine 62)" note is STALE (pre-PR
+  #1217). `cert_to_inputs.py` `_hot_water_fuel_cost_gbp_per_kwh` applies the immersion
+  Table 13 blend when cylinder volume + occupancy resolve; when `immersion_heating_
+  type` is UNLODGED on an off-peak meter it now defaults to DUAL per RdSAP §10.5
+  (was a 100%-low-rate fallback that under-costs — fixed, +regression test
+  `test_off_peak_immersion_unlodged_type_defaults_to_dual_table13_blend`). Only an
+  unresolvable cylinder volume / occupancy still falls back to 100% low.
 - **Air-permeability AP50 fix** (uprn_10093116528, the first campaign cert): the
   full-SAP mapper was routing the lodged q50 to the engine's AP4/Pulse formula
   (`0.263×AP4^0.924`) instead of the AP50 `/20` path — a big infiltration
@@ -105,13 +287,78 @@ Pattern: `with E.session() as (ctx,page): E.goto(...); E.set_text/set_select(...
   default. Pin the engine's observed value; document the Elmhurst delta (don't tune).
 - **FGHRS** (full-SAP `has_fghrs`/`fghrs_index_number`) is dropped by the mapper
   and not yet modelled — omit it on BOTH sides so the comparison stays clean.
+- **Validation errors live on the Recommendations page as LINKS** (red ✗ anchors),
+  not coloured spans — parse `[id*=ContentPlaceHolder1] a` text, not CSS colour.
+  Until Recommendations shows ZERO errors the **Energy Report Summary nav silently
+  redirects to the Address page** and the worksheet/Results PDFs won't generate
+  (Results renders empty). Two errors that bit the 16.1/19.1.0 builds: *"Walls
+  (Main): Insulation Thickness must be entered"* (set the insulation-thickness
+  dropdown — "Unknown" is fine for a reduced cert) and *"Incorrect Controls (NNNN
+  ctrl-group-X) for Heating System (idx ctrl-group-Y)"* (the heating control's
+  system-type must match the boiler's — see the controls dialog below).
+- **All Elmhurst modal dialogs sit above a `modalBackground` that defeats element
+  clicks** (Playwright sees it "intercepting pointer events", even with force).
+  The cracked pattern is now in `elmhurst_lib.py`: open via JS click, set cascade
+  `<select>`s by JS (`.value` + dispatch `change` → drives the AutoPostBack), and
+  COMMIT by `page.mouse.click(x,y)` at the OK/Select control's centre (coordinate
+  clicks hit the topmost element = the dialog). Helpers: `E.select_boiler(page,
+  query, ref)`, `E.set_heating_dialog(page, button_suffix, *level_regexes)` (water
+  method + main-heating controls), `E.dialog_commit(page, label)`,
+  `E.clear_hot_water_cylinder(page)`.
+- **Boiler by exact PCDB code** (eliminates the boiler-efficiency divergence):
+  `E.select_boiler(page, "<brand/model search>", "<pcdb_id>")` drives the search
+  dialog two-step (click the result ROW to highlight → click the top **Select**
+  span). The lodged `main_heating_index_number` IS the `pcdb_id`. Look up the Ref/
+  type/efficiency in **`domain/elmhurst/pcdb_gas_oil_boiler_codes.csv`**. NB:
+  typing the number straight into the *PCDF boiler Reference* box is COSMETIC — it
+  doesn't re-resolve the boiler; only the search dialog sets type/efficiency. A
+  combi keeps the cylinder checked from a prior regular boiler → `clear_hot_water_
+  cylinder()`, then set water method "From Space Heating → primary" via
+  `set_heating_dialog(..ButtonWaterHeatingCode, 'From Space Heating', 'From the
+  primary heating system')`.
+- **Reduced-field (16.x) semi/terraced party wall.** 16.x lodges no
+  `party_wall_length`, so the engine models NO party wall (defaults 0). But
+  Elmhurst REJECTS a semi/terraced with a zero party wall ("At least one building
+  part must have a party wall length of non zero"). Enter the geometry-derived
+  length (solve `2w+d=heat_loss_perimeter`, `w*d=floor_area`; party wall = the
+  joined side `d`) on every floor + a filled-cavity party-wall type (CF), and
+  EXPECT engine to over-read Elmhurst by ~1–2 SAP (engine's no-party-wall vs
+  Elmhurst's forced one). That delta is the documented reduced-field gap, not a
+  bug — confirm via engine-on-Elmhurst-inputs ≈ worksheet. Pin the engine value.
+- **Main-heating control must match the boiler's system type.** Heat-pump leftover
+  control (e.g. CHJ/2210, ctrl-group-2) is invalid for a gas boiler (ctrl-group-1)
+  and blocks the report. For a boiler programmer+room-stat+TRVs (SAP 2106):
+  `set_heating_dialog(..ButtonMainHeatingControls, '^Boilers', '^Standard', 'CBE
+  Programmer, room thermostat and TRVs')`.
+  ⚠ **Zone-control codes are under L2 "Zone control", NOT "Standard".** SAP 2110
+  "Time and temperature zone control" = `set_heating_dialog(.., '^Boilers', 'Zone
+  control', 'CBI Time and temperature zone control')` (Boilers→Standard L3 only has
+  CBA…CBH — no zone option, so a wrong L2 leaves the cascade incomplete and the OK
+  click is swallowed by the modalBackground, hanging the run). CBL is the PCDF
+  variant. Match the lodged `main_heating_control`: 2110 → CBI, 2106 → CBE (Standard).
+- **Removing an inherited secondary when the cert lodges NONE** — `present=No` ALONE
+  does NOT remove it: a persisted secondary CODE (e.g. an electric REA/691 from a
+  prior cert) survives the dropdown=No and the worksheet still applies it at Table-11
+  fraction 0.1 (worth ~1.5 SAP on a gas-combi cert — the electric secondary is priced
+  at the 13.19p peak rate vs gas 3.48p). The flag and the code are independent; the
+  worksheet keys off the CODE. ✅ FIX: `present=Yes` (exposes `TextBoxSecondaryHeating
+  Code`) → JS-clear that textbox to `''` + dispatch change → `present=No` → Save&Close.
+  An EMPTY code drops the worksheet's "Secondary Heating" to None / fraction 0.0.
+  Verify by re-downloading: worksheet line (201) "Fraction of space heat from
+  secondary" must read 0.0000. Seen on uprn_10090944225 (worksheet 79→80; closed the
+  cross-check gap to the residual +1 floor-U difference).
 
 ## Limitations / next improvements (make the campaign scale)
 - **Per-assessment GUID** — `elmhurst_lib.py` reuses one `ASSESSMENT_GUID`
-  (Khalim-test), overwritten per UPRN. For parallelism, create one assessment per
-  UPRN and parameterize the GUID.
-- **Data-driven fill** — `elmhurst_lib.py` gives the primitives; a per-cert driver
-  that reads field values straight from `elmhurst_inputs.md` (or a JSON sidecar)
-  would remove the remaining hand-keying. `elmhurst_fill.py` is the older template.
-- **More dialogs** — boiler cascade is automatable; the control-code (2110) and
-  FGHRS/MV-unit search dialogs still need the open→search→select→OK pattern.
+  (Khalim-test), overwritten per UPRN. ⚠ This is a SHARED assessment: a concurrent
+  user (Khalim) overwrote a build mid-session once — coordinate before long runs,
+  or (better) create one assessment per UPRN and parameterize the GUID.
+- **Data-driven fill** — `build_<uprn>.py` per-cert scripts now drive every page
+  incl. all dialogs via the `elmhurst_lib` helpers (see build_100021943298.py /
+  build_10096028301.py as templates). A generic driver reading `elmhurst_inputs.md`
+  is the remaining step. `elmhurst_fill.py` is the older single-cert template.
+- **Per-schema mappers** — every SAP/RdSAP schema gets its own dedicated
+  `from_*_schema_*` mapper in `datatypes/epc/domain/mapper.py` (the 16.x family
+  shares `_normalize_sap_schema_16_x`; full-SAP revisions delegate to
+  `from_sap_schema_17_1`). Add new schema coverage as a dedicated method + dispatch
+  branch, never by tuple-stuffing. Guard with the RdSAP-21.0.1 corpus gauge.
diff --git a/.claude/skills/expand-sap-accuracy-corpus/worklist.md b/.claude/skills/expand-sap-accuracy-corpus/worklist.md
index c062be227..58f3b9842 100644
--- a/.claude/skills/expand-sap-accuracy-corpus/worklist.md
+++ b/.claude/skills/expand-sap-accuracy-corpus/worklist.md
@@ -4,12 +4,260 @@ Process **one at a time**, top to bottom (see [SKILL.md](SKILL.md)). After each
 UPRN, tick it and annotate: `— <schema> · eng <X> / elm <Y> · <note>`.
 
 **Legend:** `[ ]` todo · `[x]` pinned (≤0.5) · `🔧` mapper extended · `⚠` xfail
-(engine bug) · `⛔` blocked.
+(engine bug) · `⛔` blocked · `[🔍]` flagged — engine vs Elmhurst-worksheet gap too
+large, or a new/complex build pattern needed; NEEDS INVESTIGATION.
 
 **Worked reference (not in the 100):** `uprn_10092973954` (SAP-Schema-17.1,
 2020 new-build flat) — full loop proven: eng 77 / elm 78, engine-on-Elmhurst-
 inputs 79 (calculator faithful within ~1). Use it to sanity-check the pipeline.
 
+# Files saving instructions
+I've noticed we arn't saving the epc.json (from epc api), input summary and worksheets from elmhurst. We shuold be doing that so we can reproduce behaviours quicker and verify. This is important as other memebers of team can help improve the verification. Files should be saved on backend/epc_api/json_samples/real_life_examples/<schema>/uprn_<uprn>/<files>
+
+
+## Do next — new schemas (need a mapper)
+
+These two were flagged NOT MAPPABLE in the UI (red ✗). Mapper coverage now ADDED
+(dedicated per-schema methods in `EpcPropertyDataMapper`; corpus gauge green, 0
+new pyright errors). Elmhurst build + pin still pending — run the normal loop.
+
+### 🔧🔍 FOR KHALIM — 100061905751 (cert 2628-3046-6233-4584-2970, SAP-16.3) — mapper fix landed, Elmhurst +5 to review
+Surfaced as a PRODUCTION crash (NOT in The 100): `modelling_e2e` property 730259
+`predict_epc` → `EpcComparablePropertiesRepository.candidates_for(postcode)` maps
+EVERY cohort cert in one list comprehension, and THIS cert raised
+`ValueError: RdSapSchema17_1: missing required field 'insulated_door_count'`,
+aborting the whole prediction. 🔧 FIXED generically in `_normalize_sap_schema_16_x`
+(`mapper.py`): `setdefault("insulated_door_count", 0)` — door refinement, absent →
+"no insulated doors recorded" → 0 (conservative RdSAP). +regression test
+`test_16_x_missing_insulated_door_count_defaults_to_zero` (test_from_sap_schema.py);
+0 new pyright errors; real-cert accuracy + 16.x suites green.
+Cert: END-TERRACE HOUSE 2-storey, band A pre-1900, cavity wall AS-BUILT **no
+insulation** (U0.70), pitched 100mm loft, suspended uninsulated floor, mains-gas
+COMBI (PCDB 16366 Glow-worm Ultracom 2 35cxi), control 2106 CBE, double glazed,
+**2 OPEN FIREPLACES** (chimneys), lodged **secondary** open-fire smokeless fuel
+(SAP 631 = Elmhurst RKJ), 3.84m² band-B extension, natural vent, 17% LED, TFA 139.
+**eng 57 = lodged 57 EXACTLY** / elm worksheet 52 (+5). Built in Elmhurst end-to-end
+(boiler 16366, CBE/2106, 2 open chimneys, secondary RKJ open-fire-in-grate, window
+20.57m², party wall geometry GF 6.31/1F 5.14 CF). engine-on-Elmhurst-inputs 53 ≈
+worksheet 52 → **calculator faithful**. The +5 decomposes as: ~2 SAP = the documented
+16.x reduced-field **party-wall gap** (lodges no party_wall_length → engine models
+NONE; Elmhurst forces `Party walls Main 31.02m² × U0.250 = 7.76 W/K`), SCALED UP by
+2-storey geometry (party wall area ~31m² vs ~16m² on the single-storey 16.2 pins
+100021985993/100090182288 which showed only +2); remainder ~2-3 = reduced-field
+build choices (3.84m² extension folded into GF, wall thickness 250 vs lodged 300,
+draughtproofing default). build_100061905751.py complete. **NOT yet pinned** — to
+review with Khalim (his call per CONTEXT.md): pin engine=lodged 57 like other 16.x,
+and/or whether 16.x end-terrace should model a party wall to close the reduced-field
+gap. Sample saved under SAP-Schema-16.3/uprn_100061905751 (epc.json + both PDFs).
+
+### 🔧🔍 modelling_e2e production failure sweep (2026-06-23) — cohort resilience + mapper gaps
+Investigated the 45 FAILED `modelling_e2e` subtasks (DevAssessmentModelDB, portfolio
+796) — 36 property rows, ~25 unique UPRNs. Root cause for most: `predict_epc` →
+`EpcComparablePropertiesRepository.candidates_for(postcode)` mapped EVERY cohort cert
+in one comprehension, so ONE unmappable cohort cert aborted the whole prediction.
+
+**✅ DONE — cohort resilience (skip + report)** so a single bad cert can't sink a
+prediction, and the skipped certs surface for follow-up:
+- `candidates_for` now skips certs that raise `ValueError` (mapper failures:
+  missing-field + `UnmappedApiCode`/`UnmappedElmhurstLabel`, both `ValueError`),
+  recording `SkippedCohortCert(certificate_number, error)` on `repo.skipped` + a
+  `logger.warning`. Transient API errors (not `ValueError`) still propagate.
+- handler surfaces them in the subtask **outputs** (success → `outputs.result.
+  skipped_unmappable_cohort_certs`; failure → appended to the error message), with
+  cert numbers, so the gaps can be closed deliberately. +3 tests; 0 new pyright.
+  Live-verified on BN11 4EP: cohort now builds 35 + records the 1 skip.
+
+**✅ DONE — generic mapper fixes (+regression tests, 0 new pyright):**
+- `_normalize_sap_schema_16_x`: `setdefault("insulated_door_count", 0)` (the
+  original prod crash).
+- ⚠️ REVERTED `setdefault("multiple_glazed_proportion", 100)` — it made an
+  otherwise-unmappable 16.3 cert (0418-3986-7250-2884-7970) join the EPC-prediction
+  **frozen-fixture donor pool** and tipped near-tie similarity matches, regressing
+  the component-accuracy gate (`has_hot_water_cylinder` 30→29/36; `door_count`
+  residual 23→25/36 — both ≫ the gate's 1e-3 float tolerance). The field is ML-only
+  (SAP calc never reads it) and the cohort skip-and-report path handles the cert,
+  so we leave it fail-loud instead of synthesising a value. Re-baselining the gate
+  was rejected (loosens a tighten-only gate for a real regression). For Khalim: if
+  16.x certs missing `multiple_glazed_proportion` should map, derive it (single→0 /
+  double→100) rather than a flat default, and re-measure the gate.
+- `_with_recorded_performance` co2/consumption/rating: `float(co2)` → crashed on
+  certs lodging `co2_emissions_current` as a Measurement dict `{'value':3.5,
+  'quantity':'tonnes per year'}` (16.x cert 2308-4997-7262-0137-9930, surfaced as
+  `TypeError: float() argument must be ... not 'dict'`). Now coerced via
+  `_measurement_value` (handles Measurement/dict/number). Verified maps → 3.5.
+
+**⚖️ FOR KHALIM — uncovered mapper gaps (mapper is your domain per CONTEXT.md):**
+- **`built_form` missing (SAP-16.0)** — cert 8742-6624-9300-2780-4926 (uprn
+  10070004512); has `property_type` but no `built_form`. Defaulting it drives
+  party-wall/exposed-perimeter modelling → a real modelling decision, not a neutral
+  default. Blocks props 710339, 723589.
+- **`window` missing + genuinely sparse (SAP-16.2)** — cert 8257-7539-1649-0633-4992
+  (uprn 10070009758); `windows` is a DICT not list, AND it omits `door_count`,
+  `habitable_room_count`, `glazed_area` — fail-loud is likely correct (data
+  insufficient). Blocks props 733315, 730259.
+- **🔍 RdSAP-21.0.0 systematically lacks the ADR-0028 Optional widenings 21.0.1 got.**
+  Cert 3135-3223-5500-0919-2206 (uprn 100021919725) omits 13 top-level fields
+  (`wet_rooms_count`, `open_chimneys_count`, `mechanical_ventilation_index_number`,
+  `led/cfl_fixed_lighting_bulbs_count`, the `mechanical_vent_duct_*`,
+  `insulated_door_u_value`, `pressure_test_certificate_number`,
+  `windows_transmission_details`) + `SapWindow` (`pvc_frame`/`glazing_gap`/
+  `frame_factor`/`window_transmission_details`) — ALL required in 21.0.0 but
+  `Optional[...] = None` in 21.0.1. NOT applied: widening risks pushing `None` into
+  `from_rdsap_schema_21_0_0` which may assume non-None (needs mapper-coalescing
+  review). Recommend aligning RdSapSchema21_0_0 to 21.0.1 (incl. the same Optionals
+  on insulated_door_count etc.) + reviewing the 21.0.0 mapper. Blocks prop 719897.
+  (The resilience change already stops all of these from crashing prod.)
+
+Caveat: ~13 other failed props showed no mapper gap on replay — genuinely
+not-predictable (empty/insufficient cohort) or already fixed by the
+`insulated_door_count` default; cohort replay only checked the first 60 certs/postcode
+and skipped rate-limited fetches, so a deeper gap could be missed.
+
+**Also done:** `deployment/terraform/lambda/modelling_e2e/variables.tf`
+`maximum_concurrency` default 2 → 4 (per request). Cohort skip-guard widened to
+`(ValueError, AttributeError, KeyError, TypeError)` (mapper-shape errors) so a
+malformed cert (e.g. PV-as-list AttributeError) is skipped+reported too, not just
+missing-field ValueErrors; transient `EpcApiError` (subclasses `Exception`) still
+propagates. +regression test.
+
+### 🔧🔍 modelling_e2e failure sweep — later run (2026-06-23 14:48 BST, portfolio 796, scenario 1268)
+A second `modelling_e2e` run (filter `task_source='modelling_e2e' AND job_started >
+'2026-06-23 14:48:01.806 +0100'`): **200 tasks, 30 FAILED (15%) → 22 unique props**
+(8 retried once). The DB only stores bare `property_id` in subtask `outputs`
+(`cloud_logs_url` empty) — root causes recovered by replaying each through
+`scripts.run_modelling_e2e --scenario-id 1268`. Four root-cause clusters:
+
+**① ✅ FIXED — `KeyError: BuildingPartIdentifier.EXTENSION_1` (14 props, the dominant
+failure).** A **Landlord Override** targeted `extension_1` but the lodged/predicted EPC
+had no such part; `overlay_applicator.apply_simulations` indexed `parts_by_id[identifier]`
+unguarded → crashed the whole property. Root cause is a **numbering mismatch**: the
+override's `building_part` is a positional index (0=main, 1=extension 1…, ADR-0004), but
+the gov-API EPC can label that slot differently (720142's 2nd part lodged as `other`, no
+`extension_1`). Fix (per product decision — *honour the override, don't drop it*):
+`_resolve_part` falls back to the EPC's part **at that position** when the semantic label
+is absent, so the landlord's correction lands; only a position the EPC models no part at
+is skipped (no geometry to model a wholly-absent part). +regression tests
+`test_override_for_an_absent_semantic_part_lands_on_the_part_at_that_position` /
+`test_override_with_no_part_at_that_position_is_skipped`. Not a mapper gap — a
+modelling-overlay bug. The 14 (pid / uprn):
+710295/100020458237, 710482/100020450179, 713040/100020404702, 715575/100020397529,
+715894/100020604961, 717435/22010468, 720142/100020383544, 720560/100021921443,
+721241/100020453651, 724945/100021915421, 725415/100020404036, 726517/100020631307,
+726592/100021918195, 730800/100021920273. (Observed post-fix eng: 720142 69.2,
+710295 63.2→69.8, 720560 61.8→70.4 predicted.)
+
+**② 🔍 mapper/cascade gap — `UnmappedSapCode: fuel_code 10`** (1 prop, 730259 / uprn
+100061905741). EPC-less → prediction synthesises a cohort EPC carrying `fuel_code 10`,
+absent from the calculator's cascade dispatch dict → FATAL (it's the target prop's own
+fuel, not a skippable cohort cert). FOR KHALIM: add fuel-code-10 to the cascade.
+
+**③ ⛔ not-predictable — empty/unresolved postcode cohort** (3 props): 714585/100020612517
+(`CR0 0DD`), 718580/10013149015 (`BR6 6BS`), 723881/22005280 (`BN41 2TP`). EPC-less AND
+cohort empty after filtering → Prediction Path 3 can't fire. Coverage gap, not a crash bug.
+
+**④ ⚠ transient — pass clean on replay** (4 props): 712401/100020394694 (eng 75.3),
+718138/100020397707 (eng 63.5→69.2), 720844/100020472603 (eng 71.8), 723648/100020480302
+(eng 70.8). Likely a flaky EPC/Solar API call during the batch — no code defect.
+
+**E2E candidates to pin (best = the lodged-EPC ones, clean to build in Elmhurst):**
+`[ ]` 100020383544 (pid 720142, eng 69.2) · `[ ]` 100020458237 (710295) · `[ ]`
+100020404702 (713040) · `[ ]` 100020450179 (710482) · `[ ]` 100021915421 (724945) ·
+`[ ]` 100021920273 (730800) · `[ ]` 100020394694 (712401, eng 75.3) · `[ ]`
+100020397707 (718138) · `[ ]` 100020472603 (720844, eng 71.8) · `[ ]` 100020480302
+(723648, eng 70.8). (Schema not populated on the gov-API objects — confirm when keying
+each into Elmhurst.)
+
+### 📋 PLAN — close the 8 modelling_e2e mapping gaps (2026-06-23 run, portfolio 796)
+The 8 failed prediction targets reduce to **5 distinct mapper-gap classes** (the fix
+targets). Per class: fix the mapper GENERICALLY, guard with BOTH the RdSAP-21.0.1
+corpus gauge AND the **component-accuracy gate** (`test_component_accuracy_gate.py`
+— every newly-mappable cert joins the prediction donor pool and can tip near-tie
+similarity, as `multiple_glazed_proportion=100` did: regressed has_hot_water_cylinder
+30→29/36 + door_count 23→25/36 ⇒ REVERTED). Then validate the now-mappable cert via
+`/expand-sap-accuracy-corpus` on **the cohort cert's UPRN** (below), saving
+epc.json + elmhurst_summary.pdf + elmhurst_worksheet.pdf under
+`real_life_examples/<schema>/uprn_<uprn>/` and committing them.
+
+- **P1 — `built_form` missing (SAP-16.0)** — HIGHEST impact (5 certs / 3 targets:
+  10013151061, 100020397529, 100020407755). Cert→UPRN: 8742-…-4926→10070004512,
+  0004-…-7395→100020407745, 2338-…-5950→100020407732, 9328-…-0924→100020407771
+  (8904-…-4623 has NO uprn — validate via one of the others). ⚠ built_form IS a
+  strong prediction similarity feature → highest gate-regression risk: DERIVE it
+  (from `dwelling_type` text / `property_type`), don't flat-default; re-measure the
+  gate. Corpus-validate uprn 10070004512.
+- **P2 — `photovoltaic_supply` lodged as a LIST → AttributeError (`'list' has no
+  attribute none_or_no_details`)** — target 22086690 (BN2 9ZN). NEW real shape bug
+  (not missing-field); escaped the skip net until widened above. Clean fix: coerce
+  the list shape in the PV mapper (like the Measurement-dict co2 fix). Low gate risk.
+  ⚠ FIRST identify the offending cert in the BN2 9ZN cohort (lookup didn't surface it
+  in the first 50 — search the full cohort for `photovoltaic_supply` as list).
+- **P3 — `window` missing, `windows` is a DICT not list (SAP-16.1)** — cert
+  9768-…-7974 → uprn 100062614005, target 100061905741. Clean normaliser fix: handle
+  `windows` as a dict (take it directly) in `_normalize_sap_schema_16_x`. Corpus-
+  validate uprn 100062614005.
+- **P4 — `multiple_glazed_proportion` missing (SAP-16.3)** — cert 0418-…-7970 → uprn
+  22144943, target 22082258. The flat-100 default REGRESSED the gate (reverted).
+  DERIVE it (single→0 / double→100 from `multiple_glazing_type` / window desc) so it
+  doesn't perturb similarity, then re-measure the gate. Corpus-validate uprn 22144943.
+- **P5 — RdSAP-21.0.0 systematic ADR-0028 alignment** (`SapWindow.glazing_gap` +
+  13 top-level fields) — cert 3135-…-2206 → uprn 100021919725, target 100021919718.
+  Align RdSapSchema21_0_0 Optionals to 21.0.1 + review `from_rdsap_schema_21_0_0`
+  None-coalescing. Larger/riskier. Corpus-validate uprn 100021919725.
+- **P6 — `window` + genuinely sparse (SAP-16.2)** — cert 8257-…-4992 → uprn
+  10070009758, target 100020401711. Also omits door_count/habitable/glazed_area →
+  fail-loud is likely CORRECT (insufficient data). DOCUMENT decision; don't force-map.
+
+After all: re-run the modelling_e2e failure sweep to confirm the cohort skips drop
+to zero (or only P6-class), and that no new gate regression slipped in.
+
+### ✅ OUTCOMES (2026-06-23, "do all") — 553 tests pass, gate 26/26, 0 new pyright
+- **P1 ✅ FIXED** — `_normalize_sap_schema_16_x` derives `built_form` from the
+  dwelling_type text (`_derive_built_form_16x`: Mid-terrace→4 / End-terrace→3 /
+  Semi-detached→2 / Detached→1; flats → modal 4). built_form is ML-only (SAP calc
+  never reads it) so SAP-neutral; gate verified insensitive (26/26). 5 SAP-16.0
+  flat certs now map (8742→SAP 66=lodged, etc.). +2 tests.
+- **P2 ✅ FIXED** — `photovoltaic_supply` as a measured-array LIST crashed
+  `from_rdsap_schema_{17_0,17_1,18_0,19_0,20_0_0}` (`'list' has no attribute
+  none_or_no_details`). All 5 now route through `_map_schema_21_pv`, whose list
+  branch is made dict-tolerant (`_pv_array_field` reads dict OR dataclass) — they
+  now CAPTURE the PV arrays like 21.0.x instead of crashing/dropping. cert
+  6102-…-2292 (uprn 22086693, RdSAP-20.0.0) maps with 2 arrays @1.14kW. +test.
+- **P3 ✅ generalised / cert fail-loud** — `_normalize_sap_schema_16_x` now handles
+  `windows` as a dict (not just list). cert 9768 (uprn 100062614005, 16.1) still
+  fails loud — it ALSO omits door_count/habitable_room_count/glazed_area
+  (genuinely sparse "High performance glazing" cert) → CORRECT to fail; resilience
+  skips+reports it.
+- **P6 ✅ same as P3** — cert 8257 (uprn 10070009758, 16.2) — identical sparse
+  "High performance glazing" pattern, fails loud on door_count. Correct.
+- **P4 ⚖️ FOR KHALIM (gate decision)** — left `multiple_glazed_proportion` fail-loud.
+  Re-confirmed: defaulting it (ANY value) still regresses the gate (29/36 +
+  25/36) because it makes a frozen-fixture cert a prediction donor — the field is
+  ML-only (not carried to EpcPropertyData), so the regression is donor-pool
+  composition, NOT the value. Closing this gap needs a GATE RE-BASELINE decision
+  (whether the donor-pool tip is benign per the #1245 precedent) — your call; I did
+  not unilaterally loosen the tighten-only gate.
+- **P5 🔍 FOR KHALIM (large recursive alignment)** — RdSAP-21.0.0 lacks the
+  ADR-0028 Optional widenings 21.0.1 has, and the gap is RECURSIVE (not just the
+  ~13 top-level + SapWindow): `SapBuildingPart` (13 fields incl.
+  construction_age_band/wall_construction/identifier — CORE FABRIC),
+  `SapEnergySource` (pv_battery_count, wind_turbine_details), MainHeatingDetail,
+  ShowerOutlets, PvBatteries, Addendum, + top-level low_energy_fixed_lighting_
+  bulbs_count/multiple_glazed_proportion/suggested_improvements. Aligning to
+  21.0.1's "everything Optional, tolerate sparse" means the 21.0.0 mapper must
+  None-coalesce CORE fabric — a modelling decision in your domain. Partial widening
+  was REVERTED (half-aligned schema is worse). cert 3135 (uprn 100021919725) stays
+  fail-loud → resilience skips+reports. Recommend: align RdSapSchema21_0_0 fully to
+  21.0.1 (recursive) + review mapper coalescing, in a dedicated change.
+- **Corpus-validation pending** for the 2 now-mappable certs (P1 uprn 10070004512,
+  P2 uprn 22086693) — Elmhurst build + summary/worksheet + commit.
+
+- [x] 🔧 10096028301 — SAP-Schema-19.1.0 (full-SAP g/f FLAT, band M, combi PCDB 17929, MEV, AP50 3.5) · eng 82 / elm 82 (lodged 85) · PINNED engine 82. 🔧 mapper added: `from_sap_schema_19_1_0`. Built in Elmhurst (boiler 17929 via search, control CBE/2106, water from primary, MEV on, AP50 Blower Door 3.5+cert). Engine EXACTLY matches Elmhurst worksheet (82.11 vs 82); engine-on-Elmhurst-inputs 82.16 ≈ 82 → calculator faithful. −3 vs lodged = measured-U-vs-RdSAP-default + MEV extract-not-recovery (documented). No mapper change beyond coverage.
+- [x] 🔧 100021943298 — SAP-Schema-16.1 (g/f FLAT, band B, solid-brick internal, combi PCDB 10328) · eng 76 / elm 75 (lodged 72) · PINNED engine 76. 🔧 mapper added: `from_sap_schema_16_1`. Built in Elmhurst (boiler 10328 via search, control CBE/2106, water from primary, wall insulation thickness Unknown); worksheet 75 → engine within ~1 (tightest agreement, reduced-field). Boiler-select + water-heating + control dialogs all driven via automation (two-step row→Select / cascade + coordinate-OK). No mapper change beyond coverage.
+
+(Refactor: split the full-SAP + 16.x dispatch tuples into dedicated per-schema
+mappers — from_sap_schema_17_0/18_0_0/19_1_0 + from_sap_schema_16_0/1/2/3 — so
+each schema has one mapper home for future divergence; all delegate to shared logic.)
+
 ## E2E testing set
 
 UPRNs needed for end-to-end testing (also tracked in The 100 below).
@@ -41,30 +289,30 @@ Skip the 🚩 MVHR / 🚩 heat-pump-fuel and ⛔ sparse certs.
 - [x] 10093116543 — SAP-17.1 (2017 gas-combi semi) · eng 81 / elm 77 (lodged 82) · PINNED engine 81. +4 = documented full-SAP→RdSAP residual, NOT a mapper bug: ~1.5 floor-U (cert lodges measured 0.11 vs Elmhurst RdSAP solid default 0.23; U-known override disabled) + ~1 boiler-eff (cert PCDB 17644 88.5% vs Elmhurst generic BGW combi 84%; PCDB search disabled, 89% cascade option is a regular boiler needing a cylinder) + ~0.5 roof band-L/infil. Conservatory leftover from prior cert cleared (worksheet 73→77). No mapper change.
 - [x] 🔧 10093116529 — SAP-17.1 (2017 gas-combi ground-floor FLAT, TFA 49) · eng 81 / elm 78 (lodged 81) · PINNED engine 81. 🔧 FIXED a real calc bug: full-SAP flats took the 0.25 house party-wall default instead of the RdSAP Table-15 flat 0.0 (flatness is in dwelling_type, not property_type) — heat_transmission._is_flat_or_maisonette_dwelling; +regression test. Cert lodges party u_value 0; Elmhurst worksheet 0.0; fix 80→81. Residual +3 vs Elmhurst = documented full-SAP→RdSAP gap (measured wall 0.184/floor 0.12 + PCDB 88.5% vs generic 84%). Calculator faithful: fed Elmhurst's Us, HTC 93.4 vs ~94. House→Flat Elmhurst switch (storeys→1, roof→another-dwelling-above). No mapper change.
 - [ ] 🔧 100020933699 — SAP-16.2 SCHEMA COVERAGE ADDED (end-terrace house, band G). 16.2 is structurally RdSAP-17.1 (reduced fields, glazed_area band, construction-code building parts) under a different name; mapped via `_normalize_sap_schema_16_2` (renames windows→window, main_gas→mains_gas, boiler_index_number→main_heating_index_number, wwhrs→instantaneous_wwhrs + defaults) → reuses from_rdsap_schema_17_1. 🔧 Also fixed: "Single glazed" description honoured when multiple_glazing_type="ND" (was defaulting to double; RdSAP-21 code 5) → eng 72→71. +4 regression tests, sap_16_2.json fixture, 0 new pyright errors. eng 71 / lodged 70. ⚠ Known gap: 16.2 lodges no party_wall_length → end-terrace party wall unmodelled (likely the residual +1). ⏳ Elmhurst build (partial: PropDesc/Dims/Walls/Roofs done) + pin still pending.
-- [ ] 🔧 44012843 — SAP-16.3 schema coverage (same _normalize_sap_schema_16_x reduced-field path as 16.2) · eng 79 / lodged 81 · g/f flat band K · Elmhurst pin pending
-- [ ] 🔧 10023444324 — SAP-17.0 schema coverage (full-SAP shape ≡ 17.1; dispatched to from_sap_schema_17_1, no normalization) · eng 80 / lodged 82 · Elmhurst pin pending
+- [x] 🔧 44012843 — SAP-16.3 (g/f FLAT, band K, cavity insulated, REGULAR boiler PCDB 9895 + cylinder, double glazed) · eng 79 / elm 78 (lodged 81) · PINNED engine 79. Built in Elmhurst (boiler 9895 via search, control CBE/2106, cylinder Large/foam/50mm, water from primary). Engine within ~1 (78.82 vs 78); engine-on-Elmhurst-inputs 78.48 ≈ 78 → calculator faithful. −2 vs lodged = reduced-field defaults. No mapper change beyond coverage.
+- [x] 🔧 10023444324 — SAP-17.0 (full-SAP g/f FLAT, band M, combi PCDB 16211, MEV, AP50 3.2, party wall 6.43) · eng 80 / elm 80 (lodged 82) · PINNED engine 80. Built in Elmhurst (boiler 16211 via search, control CBE/2106, water from primary, MEV on, AP50 Blower Door 3.2, party wall 6.43). Engine EXACTLY matches Elmhurst worksheet (80.13 vs 80); engine-on-Elmhurst-inputs 81.03 ≈ 80 → calculator faithful. −2 vs lodged = full-SAP→RdSAP residual (measured U + MEV). No mapper change beyond coverage.
 - [⚠] 10092970673 — SAP-17.0 · eng 77 / lodged 86 · 🚩 MVHR idx 500418 not credited (flagged)
 - [⚠] 10094601287 — SAP-18.0.0 · eng 80 / lodged 84 · 🚩 MVHR idx 500230 not credited (flagged)
-- [ ] 10090844932 — RdSAP-20.0.0 · eng 78 / lodged 78
+- [x] 10090844932 — RdSAP-20.0.0 (end-terrace HOUSE 2-storey, band L, combi PCDB 10327, party wall 4.93, 250mm loft) · eng 78 / elm 77 (lodged 78) · PINNED engine 78. Built in Elmhurst (House, boiler 10327 via search, control CBE/2106, water from primary, party wall 4.93 filled). Within ~1 (78.13 vs 77); engine-on-Elmhurst-inputs 77.24 ≈ 77 → faithful.
 - [⛔] 10090844948 — SAP-16.3 · NOT MAPPABLE (ValueError: RdSapSchema17_1: missing required field )
-- [ ] 100090182288 — SAP-16.2 · eng 71 / lodged 71
+- [x] 100090182288 — SAP-16.2 (semi-detached HOUSE 2-storey, band D, filled cavity, combi PCDB 10327, double glazed) · eng 71 / elm 69 (lodged 71) · PINNED engine 71. Built in Elmhurst (semi, boiler 10327, control CBE/2106, water from primary, party wall 4.28 filled — Elmhurst requires non-zero for a semi). +2 vs Elmhurst = documented 16.2 reduced-field party-wall gap (gov-API lodges no party_wall_length → engine models none); engine-on-Elmhurst-inputs 69.35 ≈ worksheet 69 → calculator faithful.
 - [⚠] 10093114053 — SAP-17.0 · eng 93 / lodged 79 · 🚩 heat-pump fuel-39 (flagged)
-- [ ] 10091568921 — SAP-17.1 · eng 82 / lodged 85
-- [ ] 10093718424 — SAP-17.1 · eng 81 / lodged 84
-- [ ] 10022893721 — RdSAP-18.0 · eng 79 / lodged 79
-- [ ] 10023443426 — RdSAP-21.0.1 · eng 76 / lodged 76
-- [ ] 10093412452 — SAP-17.1 · eng 81 / lodged 84
+- [x] 10091568921 — SAP-17.1 (full-SAP END-TERRACE HOUSE 2-storey, band L 2018, combi PCDB 17615 Potterton Promax Ultra, party wall 40.56m², natural vent + 3 extract fans, AP50 4.45, 20 LED, measured U 0.18/0.10/0.15) · eng 82 / elm 80 (lodged 85) · PINNED engine 82. Built in Elmhurst (end-terrace house, boiler 17615, CBE/2106, water from primary, party wall 8.45 filled, AP50 Blower Door 4.45+cert). +2 = documented full-SAP→RdSAP residual (measured U beats band-L defaults); engine-on-Elmhurst-inputs 80.16 ≈ worksheet 80 → faithful. has_hot_water_cylinder lodged true but combi PCDB + no cylinder detail → built combi. No mapper change.
+- [x] 10093718424 — SAP-17.1 (full-SAP SEMI-DETACHED HOUSE 2-storey, band L, combi PCDB 17615, party wall 40.89m², natural vent + 3 extract fans, AP50 4.18, 20 LED, measured U 0.25/0.13/0.16; sibling of 10091568921) · eng 81 / elm 80 (lodged 84) · PINNED engine 81. +1 = documented full-SAP→RdSAP residual; engine-on-Elmhurst-inputs 80.12 ≈ worksheet 80 → faithful. Built combi (cylinder lodged true but combi PCDB). No mapper change.
+- [x] 10022893721 — RdSAP-18.0 (GF FLAT, band I, cavity insulated, ELECTRIC STORAGE HEATERS SAP 402 SEB Modern slimline + manual charge CSA/2401, immersion off-peak dual + cylinder Normal/110L foam 50mm, party wall 21.48) · eng 79 / elm 81 (lodged 79) · PINNED engine 79 = lodged. Built in Elmhurst (storage SEB, CSA control, immersion dual + cylinder, **Dual electricity meter / Economy 7**). engine -2 vs Elmhurst, within tolerance; engine-on-Elmhurst-inputs 78.76 ≈ 79 → faithful. Economy-7 off-peak pricing is CORRECT (Table 12a/13, fixed PR #1217) — NOT a bug. ⚠ Earlier mis-build left Elmhurst meter on Single/Standard → bogus worksheet 66; fixed by setting Dual meter on the Meters sub-tab. 🔧 First non-boiler cert — SOLVED storage-heater automation (see banked findings: clear PCDB boiler → ButtonMainHeatingCode Electric→Electric→Storage→SEB; set Dual meter). build_10022893721.py complete.
+- [x] 10023443426 — RdSAP-21.0.1 (END-TERRACE HOUSE 2-storey, band L, cavity insulated, combi PCDB 17045 Ideal Logic ES35, 300mm loft, party wall 9.2 lodged, 11 dbl-glazed windows ~10.3m², 9 LED, mains-gas room-heater SECONDARY code 612 eff 0.20) · eng 76 / elm 79 (lodged 76) · PINNED engine 76 = lodged EXACTLY (native RdSAP-21.0.1 schema; reproduces every component: space 6129/main 6247/HW 2752/CO2 2232). Elmhurst +3 is a BUILD gap — my build omitted the lodged secondary gas fire (engine models it 3065 kWh = 0.1÷0.20); engine-on-Elmhurst-inputs 79.29 ≈ worksheet 79 → calculator faithful. NB: shared-assessment storage→combi reset needed (clear leftover MainHeatingCode) + meter reset to Single. build_10023443426.py.
+- [x] 10093412452 — SAP-17.1 (full-SAP END-TERRACE HOUSE 2-storey, band L, combi PCDB 17615, party wall 41.01m², natural vent + 3 extract fans, AP50 4.62, 20 LED, measured U 0.25/0.13/0.16; sibling of 10093718424/10091568921) · eng 81 / elm 80 (lodged 84) · PINNED engine 81. +1 = documented full-SAP→RdSAP residual; engine-on-Elmhurst-inputs 79.91 ≈ worksheet 80 → faithful. Built combi (cylinder lodged true but combi PCDB). No mapper change.
 - [⛔] 10014314798 — SAP-16.2 · NOT MAPPABLE (ValueError: RdSapSchema17_1: missing required field )
 - [⚠] 10094601294 — SAP-18.0.0 · eng 81 / lodged 84 · 🚩 MVHR idx 500230 not credited (flagged)
-- [ ] 10090343335 — SAP-17.0 · eng 86 / lodged 88
-- [ ] 10093115480 — SAP-17.1 · eng 81 / lodged 81
-- [ ] 68151071 — RdSAP-17.0 · eng 68 / lodged 70
-- [ ] 100021985993 — SAP-16.2 · eng 74 / lodged 70
-- [ ] 100020665611 — RdSAP-20.0.0 · eng 36 / lodged 37
+- [🔍] 10090343335 — SAP-17.0 (full-SAP SEMI-DETACHED HOUSE, 3-storey incl. ROOM-IN-ROOF top floor h1.95, combi PCDB 16841 Vaillant ecoTEC plus 824, party wall 48.51m², 10 windows 18.46m² + 1 ROOF WINDOW type-12 2.31m², 3 doors, AP50 3.98, 10 LED, measured U walls 0.18/roof 0.15/floor 0.13, TFA 122) · eng 86 / lodged 88 · 🔍 FLAGGED — NEEDS NEW BUILD PATTERN: room-in-roof + roof-window not covered by templates (Elmhurst DIM panel only exposes 2 floors; room-in-roof entered via RoomInRoofMain age-band + separate RiR dimensions TBD; roof window type-12 entry TBD). Elmhurst build + worksheet comparison pending. Skipped in autonomous sweep to keep momentum; revisit with a dedicated room-in-roof build.
+- [x] 10093115480 — SAP-17.1 (full-SAP END-TERRACE BUNGALOW single-storey, band L 2016, combi PCDB 16841, party wall 10.99m² CF filled, natural vent + 2 fans, AP50 3.85, 9 LED, measured U 0.19/0.11/0.12, TFA 56) · eng 81 / elm 78 (lodged 81) · PINNED engine 81 = lodged EXACT. +3 = documented full-SAP→RdSAP residual (measured U beats band-L defaults); engine-on-Elmhurst-inputs 78.29 ≈ worksheet 78 → faithful. Built combi. No mapper change.
+- [🔍] 68151071 — RdSAP-17.0 (semi-detached BUNGALOW single-storey, band H 1991-1995, cavity insulated, REGULAR boiler PCDB 17550 Worcester Greenstar 18Ri + cylinder size2/foam/50mm, pitched 200mm loft, suspended uninsulated floor, party wall 9.48 lodged, TFA 50) · eng 68 / elm 71 (lodged 70) · 🔍 FLAGGED — MAPPER GAP (cylinder insulation thickness dropped). engine -3 vs Elmhurst, -2 vs lodged; engine HW 3446 kWh vs Elmhurst 2911. ROOT CAUSE confirmed: raw cert lodges sap_heating.cylinder_insulation_thickness=50 but the RdSAP-17.0 mapper maps cylinder_size + cylinder_insulation_type only, leaving EpcPropertyData.sap_heating.cylinder_insulation_thickness_mm=None → engine assumes a poorly-insulated cylinder → over-counts HW cylinder loss → under-rates. FIX: carry cylinder_insulation_thickness → cylinder_insulation_thickness_mm in the RdSAP mapper (check blast radius across schemas + regression). engine-on-Elmhurst-inputs 71.34 ≈ worksheet 71 → calculator faithful (gap is purely the dropped input). build_68151071.py + evidence saved.
+- [x] 100021985993 — SAP-16.2 (END-TERRACE BUNGALOW single-storey, band C, solid-brick internal insulation, combi PCDB 10328, double glazed, 100mm loft, suspended uninsulated floor) · eng 74 / elm 72 (lodged 70) · PINNED engine 74. Built in Elmhurst (end-terrace, boiler 10328, control CBE/2106, water from primary, party wall 6.89 solid masonry — Elmhurst requires non-zero for an end-terrace). +2 vs Elmhurst = documented 16.2 reduced-field party-wall gap (gov-API lodges no party_wall_length → engine models none; worksheet's only extra element is party wall 16.19m²×U0.25=4.05 W/K ≈ 2 SAP). engine-on-Elmhurst-PDF-inputs 67 is PDF-parser noise (HW over-parsed), not a calc bug.
+- [x] 100020665611 — RdSAP-20.0.0 (END-TERRACE HOUSE 2-storey, band E 1967-1975, cavity UNINSULATED, ELECTRIC STORAGE HEATERS SAP 402 SEB + manual charge CSA/2401, immersion off-peak Economy-7 Dual + cylinder Normal/110L foam 38mm, double glazed PVC, party wall 9.5m/floor U0.25, secondary portable electric heaters/SAP 691, TFA 87.4) · eng 36 / elm 35 (lodged 37) · PINNED engine 36. Built in Elmhurst (storage SEB, CSA control, immersion Dual + cylinder, **Dual electricity meter**, secondary electric room heater). engine-on-Elmhurst-inputs 35 ≡ worksheet 35 → calculator faithful; eng 36 ≈ lodged 37 (−1). Cylinder thickness 38mm correctly carried by RdSAP-20.0.0 mapper (no cylinder-gap here). ⚠ Secondary had to be set EXPLICITLY: shared-assessment leftover House-Coal secondary (633) survived `present=No` and inflated worksheet to 44 until overwritten with electric room heater. build_100020665611.py. No mapper change.
 - [⚠] 10093388044 — SAP-17.1 · eng 87 / lodged 93 · 🚩 heat-pump fuel-39 (flagged)
-- [ ] 10090944225 — SAP-17.0 · eng 81 / lodged 82
+- [x] 10090944225 — SAP-17.0 (full-SAP GROUND-FLOOR FLAT, band L 2015, combi PCDB 17045 Ideal Logic Combi ES35, control 2110 CBI time+temp zone, NATURAL vent + 2 extract fans, AP50 3.48, party wall 3.41m² U0, measured U walls 0.27/floor 0.14/window 1.41, TFA 49.97, no cylinder/no secondary) · eng 81 / elm 80 (lodged 82) · PINNED engine 81. Built in Elmhurst (boiler 17045 via search, control CBI/2110 under Boilers→Zone control, water from primary, AP50 Blower Door 3.48+cert, Single meter). engine-on-Elmhurst-inputs 80 = worksheet 80 (exact) → faithful; eng 81 ≈ lodged 82 (−1). Remaining +1 = documented full-SAP→RdSAP residual localised to the FLOOR (cert measured U 0.14 vs Elmhurst RdSAP solid default 0.23; walls/party match) — engine correctly uses measured 0.14, NOT a mapper bug. ⚠ Initial worksheet read 79 due to a spurious leftover REA/691 electric secondary (Table-11 frac 0.1, ~1.5 SAP) the shared assessment retained — REMOVED via present=Yes→clear secondary code to empty→present=No (79→80). 🔧 Build notes: storage→combi reset (clear leftover SEB MainHeatingCode pass-1, reset meter Single); control 2110 is Boilers→**Zone control**→CBI (not Standard). No mapper change.
 - [⚠] 10090341811 — SAP-17.0 · eng 80 / lodged 89 · 🚩 MVHR idx 500352 not credited (flagged)
-- [ ] 10010215568 — RdSAP-17.1 · eng 75 / lodged 74
+- [x] 10010215568 — RdSAP-17.1 (NATIVE; END-TERRACE BUNGALOW single-storey, band J 2003-2006, cavity as-built insulated, pitched 200mm loft, solid insulated floor, mains-gas REGULAR boiler PCDB 15100 Vaillant Ecotec plus 415 + cylinder size2/Normal-110L/foam 25mm/thermostat, control 2106 CBE, water from primary, party wall 9.8m, double glazed, natural vent, 86% LED, TFA 75.46) · eng 75 / elm 73 (lodged 74) · PINNED engine 75. Built in Elmhurst (House+1 storey bungalow, boiler 15100 via search, CBE/2106 control, cylinder Normal/foam/25mm/thermostat, water from primary, window 11.1m² double-unknown-date). engine-on-Elmhurst-inputs 74 ≈ worksheet 73 → calculator faithful; eng 75 ≈ lodged 74 (+1). +2 vs Elmhurst = documented engine-uses-lodged vs Elmhurst-RdSAP-default (wall thickness 250 default vs lodged 310, baths 2 vs lodged 1). Cylinder thickness 25mm correctly carried by RdSAP-17.1 mapper (no cylinder-gap). ⚠ window width fill bug: `.fill("11.1")` rendered 111.10 (keystroke formatter doubled it) → validation "Width ≤ 50"; fixed by JS-setting width. No mapper change. build_10010215568.py.
 - [⚠] 10093117227 — SAP-17.1 · eng 90 / lodged 80 · 🚩 heat-pump fuel-39 (flagged)
 - [⚠] 10023444170 — SAP-17.0 · eng 80 / lodged 83 · 🚩 MVHR idx 500167 not credited (flagged)
 - [ ] 100020980961 — SAP-16.3 · eng 66 / lodged 65
@@ -86,7 +334,7 @@ Skip the 🚩 MVHR / 🚩 heat-pump-fuel and ⛔ sparse certs.
 - [⚠] 10091636116 — SAP-17.0 · eng 80 / lodged 88 · 🚩 MVHR idx 500249 not credited (flagged)
 - [ ] 10093049853 — SAP-17.0 · eng 82 / lodged 87
 - [ ] 10093390790 — SAP-17.1 · eng 79 / lodged 82
-- [ ] 10093116330 — SAP-17.1 · eng 82 / lodged 83
+- [x] 10093116330 — SAP-17.1 (2017 gas-combi 2-storey semi HOUSE, TFA 73) · eng 82 / elm 78 (lodged 83) · PINNED engine 82. +4 = documented full-SAP→RdSAP residual. Build clean. No mapper change.
 - [ ] 10093116326 — SAP-17.1 · eng 82 / lodged 82
 - [ ] 10090317693 — SAP-17.0 · eng 81 / lodged 88
 - [ ] 10090034872 — SAP-17.0 · eng 83 / lodged 85
@@ -100,7 +348,7 @@ Skip the 🚩 MVHR / 🚩 heat-pump-fuel and ⛔ sparse certs.
 - [⚠] 10093305101 — SAP-17.1 · eng 81 / lodged 85 · 🚩 MVHR idx 500140 not credited (flagged)
 - [ ] 100020933894 — SAP-16.0 · eng 61 / lodged 56
 - [ ] 100020937013 — RdSAP-20.0.0 · eng 70 / lodged 73
-- [ ] 🔧 10023444320 — SAP-17.0 schema coverage (full-SAP ≡ 17.1) · eng 81 / lodged 81 · Elmhurst pin pending
+- [x] 🔧 10023444320 — SAP-17.0 (full-SAP MID-FLOOR FLAT, sibling of 324, combi PCDB 16211, MEV, AP50 3.09, no party wall) · eng 81 / elm 82 (lodged 81) · PINNED engine 81. Built in Elmhurst (boiler 16211, control CBE/2106, water from primary, MEV, AP50 3.09, mid-floor=floor to dwelling below). Within ~1 (81.38 vs 82); engine-on-Elmhurst-inputs 82.46 ≈ 82 → faithful. No mapper change beyond coverage.
 - [ ] 100062188801 — SAP-16.3 · eng 68 / lodged 70
 - [ ] 10008048040 — SAP-16.2 · eng 77 / lodged 75
 - [ ] 10093101966 — SAP-17.1 · eng 82 / lodged 84
diff --git a/.devcontainer/backend/requirements.txt b/.devcontainer/backend/requirements.txt
index 2db3710a0..f98b167e0 100644
--- a/.devcontainer/backend/requirements.txt
+++ b/.devcontainer/backend/requirements.txt
@@ -24,7 +24,13 @@ ipykernel>=6.25,<7
 dotenv
 psycopg[binary]
 pytest-postgresql
+moto[s3,sqs]==5.0.28  # mock_aws (moto 5.x) for S3/SQS in orchestration tests
 # Formatting
 black==26.1.0
 boto3-stubs
 openai
+# Type checking — strict pyright gate (CLAUDE.md). The pip `pyright` wrapper uses
+# the container's Node. pandas-stubs lets pandas-typed modules check cleanly
+# (CLAUDE.md: add pandas-stubs when introducing pandas to a module).
+pyright==1.1.411
+pandas-stubs
diff --git a/.github/workflows/_deploy_lambda.yml b/.github/workflows/_deploy_lambda.yml
index 0035a5796..bce793dcb 100644
--- a/.github/workflows/_deploy_lambda.yml
+++ b/.github/workflows/_deploy_lambda.yml
@@ -97,6 +97,9 @@ on:
 
       TF_VAR_openai_api_key:
         required: false
+
+      TF_VAR_open_epc_api_token:
+        required: false
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -170,6 +173,7 @@ jobs:
           TF_VAR_magicplan_customer_id: ${{ secrets.TF_VAR_magicplan_customer_id }}
           TF_VAR_magicplan_api_key: ${{ secrets.TF_VAR_magicplan_api_key }}
           TF_VAR_openai_api_key: ${{ secrets.TF_VAR_openai_api_key }}
+          TF_VAR_open_epc_api_token: ${{ secrets.TF_VAR_open_epc_api_token }}
         run: |
           ECR_REPO_URL_VAR=""
           if [[ -n "${{ inputs.ecr_repo }}" ]]; then
@@ -222,6 +226,7 @@ jobs:
           TF_VAR_magicplan_customer_id: ${{ secrets.TF_VAR_magicplan_customer_id }}
           TF_VAR_magicplan_api_key: ${{ secrets.TF_VAR_magicplan_api_key }}
           TF_VAR_openai_api_key: ${{ secrets.TF_VAR_openai_api_key }}
+          TF_VAR_open_epc_api_token: ${{ secrets.TF_VAR_open_epc_api_token }}
         run: |
           EXTRA_VARS=""
           if [[ -n "${{ inputs.ecr_repo }}" ]]; then
diff --git a/.github/workflows/deploy_fastapi_backend.yml b/.github/workflows/deploy_fastapi_backend.yml
index 6ebb6cef6..645d6bc1d 100644
--- a/.github/workflows/deploy_fastapi_backend.yml
+++ b/.github/workflows/deploy_fastapi_backend.yml
@@ -1,170 +1,173 @@
-name: Fast Api Backend Deploy
-
-on:
-  push:
-    branches: [ dev, prod ]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.10.12
-
-      - name: Install Serverless and plugins
-        run: |
-          npm install -g serverless@^3.38.0
-          npm install -g serverless-domain-manager@^7.3.8
-          npm install -g serverless-python-requirements
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-
-      - name: AWS credentials for dev
-        if: github.ref == 'refs/heads/dev'
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-2
-
-      - name: AWS credentials for prod
-        if: github.ref == 'refs/heads/prod'
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-2
-
-      - name: Set domain name
-        id: set_domain
-        run: echo "::set-output name=domain::${{ secrets[format('{0}_DOMAIN_NAME', github.ref_name)] }}"
-
-      - name: Set EPC auth token
-        id: set_auth_token
-        run: echo "::set-output name=auth_token::${{ secrets[format('{0}_EPC_AUTH_TOKEN', github.ref_name)] }}"
-
-      - name: Set Open EPC API token
-        id: set_open_epc_token
-        run: echo "::set-output name=open_epc_token::${{ secrets[format('{0}_OPEN_EPC_API_TOKEN', github.ref_name)] }}"
-
-      # Store port, name and host in github secrets
-      - name: Set DB credentials
-        id: set_db_credentials
-        run: |
-          echo "::set-output name=db_host::${{ secrets[format('{0}_DB_HOST', github.ref_name)] }}"
-          echo "::set-output name=db_port::${{ secrets[format('{0}_DB_PORT', github.ref_name)] }}"
-          echo "::set-output name=db_name::${{ secrets[format('{0}_DB_NAME', github.ref_name)] }}"
-
-      - name: Set ECR credentials
-        id: set_ecr_credentials
-        run: |
-          echo "::set-output name=ecr_uri::${{ secrets[format('{0}_ECR_URI', github.ref_name)] }}"
-
-      - name: Set Secrets
-        id: set_api_secrets
-        run: |
-          echo "::set-output name=sap_predictions_bucket::${{ secrets[format('{0}_SAP_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=carbon_predictions_bucket::${{ secrets[format('{0}_CARBON_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=heat_predictions_bucket::${{ secrets[format('{0}_HEAT_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=lighting_cost_predictions_bucket::${{ secrets[format('{0}_LIGHTING_COST_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=heating_cost_predictions_bucket::${{ secrets[format('{0}_HEATING_COST_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=hot_water_cost_predictions_bucket::${{ secrets[format('{0}_HOT_WATER_COST_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=heating_kwh_predictions_bucket::${{ secrets[format('{0}_HEATING_KWH_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=hotwater_kwh_predictions_bucket::${{ secrets[format('{0}_HOTWATER_KWH_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=energy_asessments_bucket::${{ secrets[format('{0}_ENERGY_ASSESSMENTS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=google_solar_api_key::${{ secrets[format('{0}_GOOGLE_SOLAR_API_KEY', github.ref_name)] }}"
-          echo "::set-output name=sap_baseline_predictions_bucket::${{ secrets[format('{0}_SAP_BASELINE_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=carbon_baseline_predictions_bucket::${{ secrets[format('{0}_CARBON_BASELINE_PREDICTIONS_BUCKET', github.ref_name)] }}"
-          echo "::set-output name=heat_baseline_predictions_bucket::${{ secrets[format('{0}_HEAT_BASELINE_PREDICTIONS_BUCKET', github.ref_name)] }}"
-
-      - name: Setup Docker
-        uses: docker/setup-buildx-action@v1
-
-      #      - name: Setup Docker Buildx
-      #        run: |
-      #          docker buildx create --use
-
-      - name: Build Docker Image For Engine
-        run: |
-          docker buildx build \
-            --platform linux/amd64 \
-            --provenance=false \
-            --output=type=docker \
-            -t fastapi-lambda-image:${{ github.sha }} \
-            -f backend/docker/engine.Dockerfile \
-            .
-
-      - name: Login to ECR
-        run: |
-          aws ecr get-login-password --region eu-west-2 | docker login --username AWS --password-stdin ${{ steps.set_ecr_credentials.outputs.ecr_uri }}
-
-      - name: Tag and Push Docker Image to ECR
-        run: |
-          docker tag fastapi-lambda-image:${{ github.sha }} ${{ steps.set_ecr_credentials.outputs.ecr_uri }}:${{ github.sha }}
-          docker push ${{ steps.set_ecr_credentials.outputs.ecr_uri }}:${{ github.sha }}
-
-      - name: Deploy to AWS Lambda via Serverless
-        env:
-          API_KEY: ${{ secrets.FASTAPI_API_KEY }}
-          ENVIRONMENT: ${{ github.ref_name }}
-          SECRET_KEY: ${{ secrets.NEXTAUTH_SECRET }}
-          PLAN_TRIGGER_BUCKET: 'retrofit-plan-inputs-${{ github.ref_name }}'
-          DATA_BUCKET: 'retrofit-data-${{ github.ref_name }}'
-          PREDICTIONS_BUCKET: 'retrofit-sap-predictions-${{ github.ref_name }}'
-          SAP_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.sap_predictions_bucket }}
-          CARBON_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.carbon_predictions_bucket }}
-          HEAT_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.heat_predictions_bucket }}
-          LIGHTING_COST_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.lighting_cost_predictions_bucket }}
-          HEATING_COST_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.heating_cost_predictions_bucket }}
-          HOT_WATER_COST_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.hot_water_cost_predictions_bucket }}
-          HEATING_KWH_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.heating_kwh_predictions_bucket }}
-          HOTWATER_KWH_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.hotwater_kwh_predictions_bucket }}
-          ENERGY_ASSESSMENTS_BUCKET: ${{ steps.set_api_secrets.outputs.energy_asessments_bucket }}
-          GOOGLE_SOLAR_API_KEY: ${{ steps.set_api_secrets.outputs.google_solar_api_key }}
-          DOMAIN_NAME: ${{ steps.set_domain.outputs.domain }}
-          EPC_AUTH_TOKEN: ${{ steps.set_auth_token.outputs.auth_token }}
-          OPEN_EPC_API_TOKEN: ${{ steps.set_open_epc_token.outputs.open_epc_token }}
-          DB_HOST: ${{ steps.set_db_credentials.outputs.db_host }}
-          DB_PORT: ${{ steps.set_db_credentials.outputs.db_port }}
-          DB_NAME: ${{ steps.set_db_credentials.outputs.db_name }}
-          ECR_URI: ${{ steps.set_ecr_credentials.outputs.ecr_uri }}
-          GITHUB_SHA: ${{ github.sha }}
-          SAP_BASELINE_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.sap_baseline_predictions_bucket }}
-          CARBON_BASELINE_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.carbon_baseline_predictions_bucket }}
-          HEAT_BASELINE_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.heat_baseline_predictions_bucket }}
-        run: |
-          # Fetch database credentials from AWS Secrets Manager
-          SECRET_VALUE=$(aws secretsmanager get-secret-value --secret-id ${{ github.ref_name }}/assessment_model/db_credentials --query SecretString)
-          DB_USERNAME=$(echo "$SECRET_VALUE" | jq -r '. | fromjson | .db_assessment_model_username')
-          DB_PASSWORD=$(echo "$SECRET_VALUE" | jq -r '. | fromjson | .db_assessment_model_password')
-
-          # Set the database credentials as environment variables
-          export DB_USERNAME
-          export DB_PASSWORD
-
-          # Deploy to AWS Lambda via Serverless
-          sls deploy --stage ${{ github.ref_name }} --verbose
-
-      - name: Smoke test deployed /health
-        env:
-          EXPECTED_SHA: ${{ github.sha }}
-          HEALTH_URL: https://api.${{ steps.set_domain.outputs.domain }}/health
-        run: |
-          set -euo pipefail
-          echo "Probing $HEALTH_URL"
-          RESPONSE=$(curl -fsSL --max-time 30 --retry 3 --retry-delay 5 --retry-connrefused "$HEALTH_URL")
-          echo "Response: $RESPONSE"
-          ACTUAL_SHA=$(echo "$RESPONSE" | jq -r '.sha')
-          if [[ "$ACTUAL_SHA" != "$EXPECTED_SHA" ]]; then
-            echo "::error::SHA mismatch. expected=$EXPECTED_SHA actual=$ACTUAL_SHA"
-            exit 1
-          fi
-          echo "Health check passed. sha=$ACTUAL_SHA"
+# Temporarily disabled — the FastAPI backend deploy pipeline (deploys must be run manually via `sls deploy` while disabled).
+# Commented out to cut GitHub Actions minutes; uncomment to re-enable.
+#
+# name: Fast Api Backend Deploy
+#
+# on:
+#   push:
+#     branches: [ dev, prod ]
+#
+# jobs:
+#   deploy:
+#     runs-on: ubuntu-latest
+#
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
+#
+#       - name: Set up Python
+#         uses: actions/setup-python@v2
+#         with:
+#           python-version: 3.10.12
+#
+#       - name: Install Serverless and plugins
+#         run: |
+#           npm install -g serverless@^3.38.0
+#           npm install -g serverless-domain-manager@^7.3.8
+#           npm install -g serverless-python-requirements
+#
+#       - name: Install dependencies
+#         run: |
+#           python -m pip install --upgrade pip
+#
+#       - name: AWS credentials for dev
+#         if: github.ref == 'refs/heads/dev'
+#         uses: aws-actions/configure-aws-credentials@v1
+#         with:
+#           aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
+#           aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
+#           aws-region: eu-west-2
+#
+#       - name: AWS credentials for prod
+#         if: github.ref == 'refs/heads/prod'
+#         uses: aws-actions/configure-aws-credentials@v1
+#         with:
+#           aws-access-key-id: ${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
+#           aws-secret-access-key: ${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
+#           aws-region: eu-west-2
+#
+#       - name: Set domain name
+#         id: set_domain
+#         run: echo "::set-output name=domain::${{ secrets[format('{0}_DOMAIN_NAME', github.ref_name)] }}"
+#
+#       - name: Set EPC auth token
+#         id: set_auth_token
+#         run: echo "::set-output name=auth_token::${{ secrets[format('{0}_EPC_AUTH_TOKEN', github.ref_name)] }}"
+#
+#       - name: Set Open EPC API token
+#         id: set_open_epc_token
+#         run: echo "::set-output name=open_epc_token::${{ secrets[format('{0}_OPEN_EPC_API_TOKEN', github.ref_name)] }}"
+#
+#       # Store port, name and host in github secrets
+#       - name: Set DB credentials
+#         id: set_db_credentials
+#         run: |
+#           echo "::set-output name=db_host::${{ secrets[format('{0}_DB_HOST', github.ref_name)] }}"
+#           echo "::set-output name=db_port::${{ secrets[format('{0}_DB_PORT', github.ref_name)] }}"
+#           echo "::set-output name=db_name::${{ secrets[format('{0}_DB_NAME', github.ref_name)] }}"
+#
+#       - name: Set ECR credentials
+#         id: set_ecr_credentials
+#         run: |
+#           echo "::set-output name=ecr_uri::${{ secrets[format('{0}_ECR_URI', github.ref_name)] }}"
+#
+#       - name: Set Secrets
+#         id: set_api_secrets
+#         run: |
+#           echo "::set-output name=sap_predictions_bucket::${{ secrets[format('{0}_SAP_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=carbon_predictions_bucket::${{ secrets[format('{0}_CARBON_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=heat_predictions_bucket::${{ secrets[format('{0}_HEAT_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=lighting_cost_predictions_bucket::${{ secrets[format('{0}_LIGHTING_COST_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=heating_cost_predictions_bucket::${{ secrets[format('{0}_HEATING_COST_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=hot_water_cost_predictions_bucket::${{ secrets[format('{0}_HOT_WATER_COST_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=heating_kwh_predictions_bucket::${{ secrets[format('{0}_HEATING_KWH_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=hotwater_kwh_predictions_bucket::${{ secrets[format('{0}_HOTWATER_KWH_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=energy_asessments_bucket::${{ secrets[format('{0}_ENERGY_ASSESSMENTS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=google_solar_api_key::${{ secrets[format('{0}_GOOGLE_SOLAR_API_KEY', github.ref_name)] }}"
+#           echo "::set-output name=sap_baseline_predictions_bucket::${{ secrets[format('{0}_SAP_BASELINE_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=carbon_baseline_predictions_bucket::${{ secrets[format('{0}_CARBON_BASELINE_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#           echo "::set-output name=heat_baseline_predictions_bucket::${{ secrets[format('{0}_HEAT_BASELINE_PREDICTIONS_BUCKET', github.ref_name)] }}"
+#
+#       - name: Setup Docker
+#         uses: docker/setup-buildx-action@v1
+#
+#       #      - name: Setup Docker Buildx
+#       #        run: |
+#       #          docker buildx create --use
+#
+#       - name: Build Docker Image For Engine
+#         run: |
+#           docker buildx build \
+#             --platform linux/amd64 \
+#             --provenance=false \
+#             --output=type=docker \
+#             -t fastapi-lambda-image:${{ github.sha }} \
+#             -f backend/docker/engine.Dockerfile \
+#             .
+#
+#       - name: Login to ECR
+#         run: |
+#           aws ecr get-login-password --region eu-west-2 | docker login --username AWS --password-stdin ${{ steps.set_ecr_credentials.outputs.ecr_uri }}
+#
+#       - name: Tag and Push Docker Image to ECR
+#         run: |
+#           docker tag fastapi-lambda-image:${{ github.sha }} ${{ steps.set_ecr_credentials.outputs.ecr_uri }}:${{ github.sha }}
+#           docker push ${{ steps.set_ecr_credentials.outputs.ecr_uri }}:${{ github.sha }}
+#
+#       - name: Deploy to AWS Lambda via Serverless
+#         env:
+#           API_KEY: ${{ secrets.FASTAPI_API_KEY }}
+#           ENVIRONMENT: ${{ github.ref_name }}
+#           SECRET_KEY: ${{ secrets.NEXTAUTH_SECRET }}
+#           PLAN_TRIGGER_BUCKET: 'retrofit-plan-inputs-${{ github.ref_name }}'
+#           DATA_BUCKET: 'retrofit-data-${{ github.ref_name }}'
+#           PREDICTIONS_BUCKET: 'retrofit-sap-predictions-${{ github.ref_name }}'
+#           SAP_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.sap_predictions_bucket }}
+#           CARBON_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.carbon_predictions_bucket }}
+#           HEAT_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.heat_predictions_bucket }}
+#           LIGHTING_COST_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.lighting_cost_predictions_bucket }}
+#           HEATING_COST_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.heating_cost_predictions_bucket }}
+#           HOT_WATER_COST_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.hot_water_cost_predictions_bucket }}
+#           HEATING_KWH_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.heating_kwh_predictions_bucket }}
+#           HOTWATER_KWH_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.hotwater_kwh_predictions_bucket }}
+#           ENERGY_ASSESSMENTS_BUCKET: ${{ steps.set_api_secrets.outputs.energy_asessments_bucket }}
+#           GOOGLE_SOLAR_API_KEY: ${{ steps.set_api_secrets.outputs.google_solar_api_key }}
+#           DOMAIN_NAME: ${{ steps.set_domain.outputs.domain }}
+#           EPC_AUTH_TOKEN: ${{ steps.set_auth_token.outputs.auth_token }}
+#           OPEN_EPC_API_TOKEN: ${{ steps.set_open_epc_token.outputs.open_epc_token }}
+#           DB_HOST: ${{ steps.set_db_credentials.outputs.db_host }}
+#           DB_PORT: ${{ steps.set_db_credentials.outputs.db_port }}
+#           DB_NAME: ${{ steps.set_db_credentials.outputs.db_name }}
+#           ECR_URI: ${{ steps.set_ecr_credentials.outputs.ecr_uri }}
+#           GITHUB_SHA: ${{ github.sha }}
+#           SAP_BASELINE_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.sap_baseline_predictions_bucket }}
+#           CARBON_BASELINE_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.carbon_baseline_predictions_bucket }}
+#           HEAT_BASELINE_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.heat_baseline_predictions_bucket }}
+#         run: |
+#           # Fetch database credentials from AWS Secrets Manager
+#           SECRET_VALUE=$(aws secretsmanager get-secret-value --secret-id ${{ github.ref_name }}/assessment_model/db_credentials --query SecretString)
+#           DB_USERNAME=$(echo "$SECRET_VALUE" | jq -r '. | fromjson | .db_assessment_model_username')
+#           DB_PASSWORD=$(echo "$SECRET_VALUE" | jq -r '. | fromjson | .db_assessment_model_password')
+#
+#           # Set the database credentials as environment variables
+#           export DB_USERNAME
+#           export DB_PASSWORD
+#
+#           # Deploy to AWS Lambda via Serverless
+#           sls deploy --stage ${{ github.ref_name }} --verbose
+#
+#       - name: Smoke test deployed /health
+#         env:
+#           EXPECTED_SHA: ${{ github.sha }}
+#           HEALTH_URL: https://api.${{ steps.set_domain.outputs.domain }}/health
+#         run: |
+#           set -euo pipefail
+#           echo "Probing $HEALTH_URL"
+#           RESPONSE=$(curl -fsSL --max-time 30 --retry 3 --retry-delay 5 --retry-connrefused "$HEALTH_URL")
+#           echo "Response: $RESPONSE"
+#           ACTUAL_SHA=$(echo "$RESPONSE" | jq -r '.sha')
+#           if [[ "$ACTUAL_SHA" != "$EXPECTED_SHA" ]]; then
+#             echo "::error::SHA mismatch. expected=$EXPECTED_SHA actual=$ACTUAL_SHA"
+#             exit 1
+#           fi
+#           echo "Health check passed. sha=$ACTUAL_SHA"
diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml
index 0780c5804..5e469dc66 100644
--- a/.github/workflows/deploy_terraform.yml
+++ b/.github/workflows/deploy_terraform.yml
@@ -736,6 +736,44 @@ jobs:
       TF_VAR_db_name: ${{ secrets.DEV_DB_NAME }}
       TF_VAR_db_port: ${{ secrets.DEV_DB_PORT }}
 
+  # ============================================================
+  # Build Modelling E2E image and Push
+  # ============================================================
+  modelling_e2e_image:
+    needs: [determine_stage, shared_terraform]
+    uses: ./.github/workflows/_build_image.yml
+    with:
+      ecr_repo: modelling-e2e-${{ needs.determine_stage.outputs.stage }}
+      dockerfile_path: applications/modelling_e2e/Dockerfile
+      build_context: .
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: ${{ secrets.DEV_AWS_REGION }}
+
+  # ============================================================
+  # Deploy Modelling E2E Lambda
+  # ============================================================
+  modelling_e2e_lambda:
+    needs: [modelling_e2e_image, determine_stage]
+    uses: ./.github/workflows/_deploy_lambda.yml
+    with:
+      lambda_name: modelling_e2e
+      lambda_path: deployment/terraform/lambda/modelling_e2e
+      stage: ${{ needs.determine_stage.outputs.stage }}
+      ecr_repo: modelling-e2e-${{ needs.determine_stage.outputs.stage }}
+      image_digest: ${{ needs.modelling_e2e_image.outputs.image_digest }}
+      terraform_apply: ${{ needs.determine_stage.outputs.terraform_apply }}
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: ${{ secrets.DEV_AWS_REGION }}
+      TF_VAR_db_host: ${{ secrets.DEV_DB_HOST }}
+      TF_VAR_db_name: ${{ secrets.DEV_DB_NAME }}
+      TF_VAR_db_port: ${{ secrets.DEV_DB_PORT }}
+      TF_VAR_open_epc_api_token: ${{ secrets.DEV_OPEN_EPC_API_TOKEN }}
+      TF_VAR_google_solar_api_key: ${{ secrets.DEV_GOOGLE_SOLAR_API_KEY }}
+
   # ============================================================
   # Deploy Hubspot ETL Lambda
   # ============================================================
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 6093e2492..374bf94e8 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1,35 +1,38 @@
-name: Rebaselining Integration Test
-
-on:
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  rebaselining-integration-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-
-      - name: Install tox via Makefile
-        run: |
-          make setup
-
-      - name: Configure AWS credentials for dev
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-2
-
-      - name: Run only rebaselining integration test
-        env:
-          EPC_AUTH_TOKEN: ${{ secrets.DEV_EPC_AUTH_TOKEN }}
-        run: |
-          make test ARGS="-m integration"
+# Temporarily disabled — the rebaselining integration suite.
+# Commented out to cut GitHub Actions minutes; uncomment to re-enable.
+#
+# name: Rebaselining Integration Test
+#
+# on:
+#   pull_request:
+#     branches:
+#       - main
+#
+# jobs:
+#   rebaselining-integration-test:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v4
+#
+#       - name: Set up Python 3.11
+#         uses: actions/setup-python@v4
+#         with:
+#           python-version: '3.11'
+#
+#       - name: Install tox via Makefile
+#         run: |
+#           make setup
+#
+#       - name: Configure AWS credentials for dev
+#         uses: aws-actions/configure-aws-credentials@v1
+#         with:
+#           aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
+#           aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
+#           aws-region: eu-west-2
+#
+#       - name: Run only rebaselining integration test
+#         env:
+#           EPC_AUTH_TOKEN: ${{ secrets.DEV_EPC_AUTH_TOKEN }}
+#         run: |
+#           make test ARGS="-m integration"
diff --git a/.github/workflows/lambda_smoke_tests.yml b/.github/workflows/lambda_smoke_tests.yml
index 1830fcd9d..d958abcb9 100644
--- a/.github/workflows/lambda_smoke_tests.yml
+++ b/.github/workflows/lambda_smoke_tests.yml
@@ -1,144 +1,154 @@
-name: Lambda Smoke Tests
+# name: Lambda Smoke Tests
 
-on:
-  pull_request:
-    branches:
-      - main
+# on:
+#   pull_request:
+#     branches:
+#       - main
 
-jobs:
-  # ============================================================
-  # Ara Engine
-  # ============================================================
-  ara_engine_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: backend/docker/engine.Dockerfile
-      build_context: .
-      service_name: ara-engine
+# jobs:
+#   # ============================================================
+#   # Ara Engine
+#   # ============================================================
+#   ara_engine_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: backend/docker/engine.Dockerfile
+#       build_context: .
+#       service_name: ara-engine
 
-  # ============================================================
-  # Address 2 UPRN
-  # ============================================================
-  address2uprn_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: backend/address2UPRN/handler/Dockerfile
-      build_context: .
-      service_name: address2uprn
+#   # ============================================================
+#   # Address 2 UPRN
+#   # ============================================================
+#   address2uprn_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: backend/address2UPRN/handler/Dockerfile
+#       build_context: .
+#       service_name: address2uprn
 
-  # ============================================================
-  # Postcode Splitter
-  # ============================================================
-  postcode_splitter_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: backend/postcode_splitter/handler/Dockerfile
-      build_context: .
-      service_name: postcode-splitter
+#   # ============================================================
+#   # Postcode Splitter
+#   # ============================================================
+#   postcode_splitter_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: backend/postcode_splitter/handler/Dockerfile
+#       build_context: .
+#       service_name: postcode-splitter
 
-  postcode_splitter_ddd_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: applications/postcode_splitter/Dockerfile
-      build_context: .
-      service_name: postcode-splitter-ddd
+#   postcode_splitter_ddd_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: applications/postcode_splitter/Dockerfile
+#       build_context: .
+#       service_name: postcode-splitter-ddd
 
-  # ============================================================
-  # Landlord Description Overrides
-  # ============================================================
-  landlord_description_overrides_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: applications/landlord_description_overrides/Dockerfile
-      build_context: .
-      service_name: landlord-description-overrides
+#   # ============================================================
+#   # Landlord Description Overrides
+#   # ============================================================
+#   landlord_description_overrides_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: applications/landlord_description_overrides/Dockerfile
+#       build_context: .
+#       service_name: landlord-description-overrides
 
-  # ============================================================
-  # Bulk Address2UPRN Combiner
-  # ============================================================
-  bulk_address2uprn_combiner_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: backend/bulk_address2uprn_combiner/handler/Dockerfile
-      build_context: .
-      service_name: bulk-address2uprn-combiner
+#   # ============================================================
+#   # Bulk Address2UPRN Combiner
+#   # ============================================================
+#   bulk_address2uprn_combiner_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: backend/bulk_address2uprn_combiner/handler/Dockerfile
+#       build_context: .
+#       service_name: bulk-address2uprn-combiner
 
-  # ============================================================
-  # Bulk Upload Finaliser
-  # ============================================================
-  bulk_upload_finaliser_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: applications/bulk_upload_finaliser/Dockerfile
-      build_context: .
-      service_name: bulk-upload-finaliser
+#   # ============================================================
+#   # Bulk Upload Finaliser
+#   # ============================================================
+#   bulk_upload_finaliser_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: applications/bulk_upload_finaliser/Dockerfile
+#       build_context: .
+#       service_name: bulk-upload-finaliser
 
-  # ============================================================
-  # Condition ETL
-  # ============================================================
-  condition_etl_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: backend/condition/handler/Dockerfile
-      build_context: .
-      service_name: condition-etl
+#   # ============================================================
+#   # Condition ETL
+#   # ============================================================
+#   condition_etl_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: backend/condition/handler/Dockerfile
+#       build_context: .
+#       service_name: condition-etl
 
-  # ============================================================
-  # Categorisation
-  # ============================================================
-  categorisation_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: backend/categorisation/handler/Dockerfile
-      build_context: .
-      service_name: categorisation
+#   # ============================================================
+#   # Categorisation
+#   # ============================================================
+#   categorisation_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: backend/categorisation/handler/Dockerfile
+#       build_context: .
+#       service_name: categorisation
 
-  # ============================================================
-  # Ordnance Survey
-  # ============================================================
-  ordnance_survey_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: backend/ordnanceSurvey/handler/Dockerfile
-      build_context: .
-      service_name: ordnance-survey
+#   # ============================================================
+#   # Ordnance Survey
+#   # ============================================================
+#   ordnance_survey_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: backend/ordnanceSurvey/handler/Dockerfile
+#       build_context: .
+#       service_name: ordnance-survey
 
-  # ============================================================
-  # Pas Hub Fetcher
-  # ============================================================
-  pashub_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: backend/pashub_fetcher/handler/Dockerfile
-      build_context: .
-      service_name: pashub
+#   # ============================================================
+#   # Pas Hub Fetcher
+#   # ============================================================
+#   pashub_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: backend/pashub_fetcher/handler/Dockerfile
+#       build_context: .
+#       service_name: pashub
 
-  # ============================================================
-  # MagicPlan
-  # ============================================================
-  magic_plan_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: applications/magic_plan/handler/Dockerfile
-      build_context: .
-      service_name: magic-plan
+#   # ============================================================
+#   # MagicPlan
+#   # ============================================================
+#   magic_plan_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: applications/magic_plan/handler/Dockerfile
+#       build_context: .
+#       service_name: magic-plan
 
-  # ============================================================
-  # Audit Generator
-  # ============================================================
-  audit_generator_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: applications/audit_generator/handler/Dockerfile
-      build_context: .
-      service_name: audit-generator
+#   # ============================================================
+#   # Audit Generator
+#   # ============================================================
+#   audit_generator_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: applications/audit_generator/handler/Dockerfile
+#       build_context: .
+#       service_name: audit-generator
 
-  # ============================================================
-  # HubSpot Scraper
-  # ============================================================
-  hubspot_scraper_smoke_test:
-    uses: ./.github/workflows/_smoke_test_lambda.yml
-    with:
-      dockerfile_path: etl/hubspot/scripts/scraper/handler/Dockerfile
-      build_context: .
-      service_name: hubspot-scraper
+#   # ============================================================
+#   # HubSpot Scraper
+#   # ============================================================
+#   hubspot_scraper_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: etl/hubspot/scripts/scraper/handler/Dockerfile
+#       build_context: .
+#       service_name: hubspot-scraper
+
+#   # ============================================================
+#   # Modelling E2E
+#   # ============================================================
+#   hubspot_scraper_smoke_test:
+#     uses: ./.github/workflows/_smoke_test_lambda.yml
+#     with:
+#       dockerfile_path: applications/modelling_e2e/Dockerfile
+#       build_context: .
+#       service_name: modelling_e2e
\ No newline at end of file
diff --git a/.github/workflows/protect_releases.yml b/.github/workflows/protect_releases.yml
index cbd08e2f4..7c8c72585 100644
--- a/.github/workflows/protect_releases.yml
+++ b/.github/workflows/protect_releases.yml
@@ -1,17 +1,20 @@
-name: Restrict PR source
-
-on:
-  pull_request:
-    branches:
-      - dev
-
-jobs:
-  check-source-branch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fail if PR is not from main
-        run: |
-          if [[ "${{ github.head_ref }}" != "main" ]]; then
-            echo "Only PRs from main are allowed into dev"
-            exit 1
-          fi
\ No newline at end of file
+# Temporarily disabled — the main→dev PR-source guardrail.
+# Commented out to cut GitHub Actions minutes; uncomment to re-enable.
+#
+# name: Restrict PR source
+#
+# on:
+#   pull_request:
+#     branches:
+#       - dev
+#
+# jobs:
+#   check-source-branch:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Fail if PR is not from main
+#         run: |
+#           if [[ "${{ github.head_ref }}" != "main" ]]; then
+#             echo "Only PRs from main are allowed into dev"
+#             exit 1
+#           fi
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 12d836d0c..bd022a2af 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -1,67 +1,70 @@
-name: Run unit tests
-
-on:
-  pull_request:
-    branches:
-      - "**"
-
-
-jobs:
-  test-docker:
-    name: Tests (Docker)
-    runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        image: postgres:15
-        env:
-          POSTGRES_USER: test
-          POSTGRES_PASSWORD: test
-          POSTGRES_DB: test
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Build test image
-        run: docker build -f Dockerfile.test -t model-test .
-
-      - name: Initialise database schema
-        run: |
-          docker run --rm \
-            --network host \
-            -e DB_HOST=localhost \
-            -e DB_NAME=test \
-            -e DB_USERNAME=test \
-            -e DB_PASSWORD=test \
-            -e DB_PORT=5432 \
-            model-test python scripts/init_db.py
-
-      - name: Run tests
-        run: |
-          docker run --rm \
-            --network host \
-            -e EPC_AUTH_TOKEN=${{ secrets.DEV_EPC_AUTH_TOKEN }} \
-            -e OPEN_EPC_API_TOKEN=${{ secrets.DEV_OPEN_EPC_API_TOKEN }} \
-            -e HUBSPOT_API_KEY=${{ secrets.HUBSPOT_API_KEY }} \
-            -e AWS_ACCESS_KEY_ID=${{ secrets.DEV_AWS_ACCESS_KEY_ID }} \
-            -e AWS_SECRET_ACCESS_KEY=${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }} \
-            -e AWS_DEFAULT_REGION=${{ secrets.DEV_AWS_REGION }} \
-            -e DB_HOST=localhost \
-            -e DB_NAME=test \
-            -e DB_USERNAME=test \
-            -e DB_PASSWORD=test \
-            -e DB_PORT=5432 \
-            model-test pytest -vv -m 'not integration'
-
-      # The DDD rewrite (tests/) runs in its own workflow (ddd_tests.yml): its
-      # SQLModel table classes map to the same physical tables as the legacy
-      # backend models and share the one global SQLModel.metadata, so the two
-      # suites cannot be imported into the same pytest process.
+# Temporarily disabled — this Docker-based suite was consuming too many GitHub
+# Actions minutes. Uncomment to re-enable.
+#
+# name: Run unit tests
+#
+# on:
+#   pull_request:
+#     branches:
+#       - "**"
+#
+#
+# jobs:
+#   test-docker:
+#     name: Tests (Docker)
+#     runs-on: ubuntu-latest
+#
+#     services:
+#       postgres:
+#         image: postgres:15
+#         env:
+#           POSTGRES_USER: test
+#           POSTGRES_PASSWORD: test
+#           POSTGRES_DB: test
+#         ports:
+#           - 5432:5432
+#         options: >-
+#           --health-cmd pg_isready
+#           --health-interval 10s
+#           --health-timeout 5s
+#           --health-retries 5
+#
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v4
+#
+#       - name: Build test image
+#         run: docker build -f Dockerfile.test -t model-test .
+#
+#       - name: Initialise database schema
+#         run: |
+#           docker run --rm \
+#             --network host \
+#             -e DB_HOST=localhost \
+#             -e DB_NAME=test \
+#             -e DB_USERNAME=test \
+#             -e DB_PASSWORD=test \
+#             -e DB_PORT=5432 \
+#             model-test python scripts/init_db.py
+#
+#       - name: Run tests
+#         run: |
+#           docker run --rm \
+#             --network host \
+#             -e EPC_AUTH_TOKEN=${{ secrets.DEV_EPC_AUTH_TOKEN }} \
+#             -e OPEN_EPC_API_TOKEN=${{ secrets.DEV_OPEN_EPC_API_TOKEN }} \
+#             -e HUBSPOT_API_KEY=${{ secrets.HUBSPOT_API_KEY }} \
+#             -e AWS_ACCESS_KEY_ID=${{ secrets.DEV_AWS_ACCESS_KEY_ID }} \
+#             -e AWS_SECRET_ACCESS_KEY=${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }} \
+#             -e AWS_DEFAULT_REGION=${{ secrets.DEV_AWS_REGION }} \
+#             -e DB_HOST=localhost \
+#             -e DB_NAME=test \
+#             -e DB_USERNAME=test \
+#             -e DB_PASSWORD=test \
+#             -e DB_PORT=5432 \
+#             model-test pytest -vv -m 'not integration'
+#
+#       # The DDD rewrite (tests/) runs in its own workflow (ddd_tests.yml): its
+#       # SQLModel table classes map to the same physical tables as the legacy
+#       # backend models and share the one global SQLModel.metadata, so the two
+#       # suites cannot be imported into the same pytest process.
diff --git a/.gitignore b/.gitignore
index 9cb34cb3d..0bf9e0e90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -304,6 +304,7 @@ backlog/*
 # Local Claude config files
 .claude/*modelling_cohort.csv
 .claude/settings.local.json
+.claude/settings.json
 
 # Local EPC debug cache (scripts/eon)
 scripts/eon/epc_cache.pkl
@@ -312,3 +313,8 @@ scripts/eon/epc_cache.pkl
 scripts/hyde/.elmhurst-session/
 scripts/hyde/elmhurst_downloads/
 scripts/hyde/.elmhurst-creds.json
+
+# Hyde property-overrides script artifacts
+overrides_cache.json
+overrides_unknowns.csv
+overrides_edits.csv
diff --git a/CONTEXT.md b/CONTEXT.md
index ff71c2b26..fe6493ee4 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -35,10 +35,22 @@ _Avoid_: energy rating, EPC grade, EPC score
 The versioned RdSAP or SAP schema that describes the structure of an EPC's raw data (e.g. `RdSAP-Schema-21.0.1`).
 _Avoid_: schema version, EPC format
 
+**Full-SAP Assessment**:
+A cert produced by a **full SAP** calculation rather than the reduced **RdSAP** procedure — lodged with `assessment_type = "SAP"` and a measured-openings structure (`sap_opening_types`, per-opening U-values), typically on an older spec (`SAP-Schema-16.x/17.x`, `sap_version` ~9.9x = SAP 2012). Structurally distinct from an **RdSAP Assessment** (reduced categorical fabric, no measured openings), so it has its own mapper (`from_sap_schema_17_1`), routed to by **structure not label** (a structurally full-SAP cert is mapped here regardless of a mislabelled `schema_type`). Because full-SAP certs lodge pre-10.2 figures they are **rebaselined** to SAP 10.2 like any pre-SAP10 cert (Rebaselining trigger (a)); a mapper that drops their `sap_version` silently suppresses that rebaseline and leaves **Effective Performance** stuck on the lodged value (ADR-0037).
+_Avoid_: SAP cert (ambiguous — every EPC is a SAP-derived cert), on-construction EPC (overlaps but not synonymous)
+
 **Domestic Certificate**:
 An EPC issued for a residential dwelling, as opposed to a commercial one.
 _Avoid_: residential EPC, home EPC
 
+**Non-Separated Conservatory**:
+A conservatory joined to the dwelling without an external-quality thermal separation (open archway or only an internal-quality door). RdSAP treats it as **part of the dwelling** (§6.1): the assessor measures its glazed perimeter, floor area, glazing type and storey height, and its floor area, glazed walls (as a window), glazed roof (as a rooflight) and ground-loss all fold into the dwelling's score. On the gov register this is `conservatory_type = 4`, lodged as a glazed "building part" carrying only those four measurements — never fabric or floor dimensions. It is the only conservatory kind that affects the score, so it must be **carried as a distinct part of the dwelling picture**, not treated as a generic fabric building part (which mis-scores it and lacks the construction fields the register requires).
+_Avoid_: "floor-only building part" / "degenerate part" (it is a fully-measured glazed conservatory — it only *looks* empty when a schema drops its four fields); "heated conservatory" (heating is the question asked of a **Separated Conservatory**, not this one)
+
+**Separated Conservatory**:
+A conservatory partitioned from the dwelling by an external-quality door (substantial, draught-sealed). RdSAP **disregards** it entirely (§6.2) — no measurements are taken and it contributes nothing to the score; the register records only whether it has fixed heaters (`conservatory_type = 2` unheated / `3` heated) and lodges no glazed building part. `conservatory_type = 1` means no conservatory at all.
+_Avoid_: conflating with a **Non-Separated Conservatory** (the separated one is scored as if absent); "thermally separated" as a synonym for "heated" (separation is about the door, heating is a further question asked only once separated)
+
 ### Properties and addresses
 
 **Property**:
@@ -116,7 +128,7 @@ The SAP / EPC Band / carbon emissions / Primary Energy Intensity the modelling p
 _Avoid_: modelled performance, rebaselined performance (only correct when rebaselining ran), scored values
 
 **Calculated SAP10 Performance**:
-The SAP score, EPC Band, CO2 emissions, Primary Energy Intensity, space heating kWh, and hot water kWh produced by **SAP10 Calculation** from a Property's EpcPropertyData. It is **not** a separately-persisted third value-set beside Lodged and Effective: in every baselining scenario the calculator's output *is* the **Effective Performance** (real lodged SAP10 EPC with no overrides ⇒ Calculated = Lodged = Effective; overrides or an estimated / pre-SAP10 EPC ⇒ Calculated = Effective, there being no lodged SAP10 figure to compare against). The calculator is therefore the mechanism that produces Effective Performance, having superseded the old ML-API rebaseliner. The calculator is **load-bearing**: for `sap_version < 10.2` (lodged under a superseded methodology) its output *is* the Effective Performance; for `≥ 10.2` the API's lodged figures are kept and the calculator runs **alongside, logging any divergence** (SAP > 0.5, PEUI/CO2 beyond tolerance) as a validation signal (see [[sap-spec-version]]). It is load-bearing for **Bill Derivation regardless of version** (the EPC lodges no per-end-use kWh), so a calculator strict-raise **aborts the batch** and the un-mapped cert is fixed immediately. ADR-0009 introduced the term, amended by ADR-0010, realized by ADR-0013 (whose shadow stepping-stone is superseded) and ADR-0014.
+The SAP score, EPC Band, CO2 emissions, Primary Energy Intensity, space heating kWh, and hot water kWh produced by **SAP10 Calculation** from a Property's EpcPropertyData. It is **not** a separately-persisted third value-set beside Lodged and Effective: in every baselining scenario the calculator's output *is* the **Effective Performance** (real lodged SAP10 EPC with no overrides ⇒ Calculated = Lodged = Effective; overrides or an estimated / pre-SAP10 EPC ⇒ Calculated = Effective, there being no lodged SAP10 figure to compare against). The calculator is therefore the mechanism that produces Effective Performance, having superseded the old ML-API rebaseliner. The calculator is **load-bearing**: for `sap_version < 10.2` (lodged under a superseded methodology) its output *is* the Effective Performance; for `≥ 10.2` the API's lodged figures are kept **only when the picture is a pristine lodged cert** — when Landlord Overrides or EPC Prediction changed the physical state (Rebaselining trigger (b)/(c)), the calculator's output *is* the Effective Performance even at ≥ 10.2 (ADR-0039), because the accredited lodged figure no longer describes the dwelling. Divergence (SAP > 0.5, PEUI/CO2 beyond tolerance) is logged **only in that pristine-lodged case** — the one case where lodged-vs-calc is a meaningful validation signal (see [[sap-spec-version]]); when the calculator's output is adopted there is nothing to validate against. It is load-bearing for **Bill Derivation regardless of version** (the EPC lodges no per-end-use kWh), so a calculator strict-raise **aborts the batch** and the un-mapped cert is fixed immediately. ADR-0009 introduced the term, amended by ADR-0010, realized by ADR-0013 (whose shadow stepping-stone is superseded) and ADR-0014.
 _Avoid_: calculator output, computed performance, worksheet performance, SAP10 output, calculated value-set (it is not a stored third set)
 
 **SAP10 Calculation**:
@@ -140,9 +152,17 @@ The process that translates an Optimised Package into cert-field changes and pro
 _Avoid_: measure overrides (rejected during ADR-0009 grill — phantom mid-layer), package applier, retrofit simulator
 
 **Bill Derivation**:
-The deterministic process that derives a Property's annual energy **bill**, composed into per-end-use sections (heating, hot water, lighting, appliances, cooking, pumps/fans, …) plus a **total**, by pricing **SAP10 Calculation**'s delivered kWh per end use at **current Fuel Rates** — each end use billed at its fuel's rate, rolled up per fuel for **standing charges** (metered fuels only — gas/electricity; oil/LPG/solid have none) minus **SEG** export credit on PV. Implemented by `BillDerivation` in `domain/billing/` (a cross-stage concern — the Baseline stage derives the current bill, the Modelling stage re-runs it on the post-package end-state for post-retrofit bills; deterministic, ADR-0006). Reads Fuel Rates from a committed static snapshot via `FuelRatesRepository` (no live ETL yet). **Distinct from the calculator's `total_fuel_cost_gbp`**, which is the SAP-rating notional cost at RdSAP Table 32 standardised prices (~half the real electricity price) — not what the household pays. Raises on a fuel it has no rate for (e.g. house coal, heat network). ADR-0014.
+The deterministic process that derives a Property's annual energy **bill**, composed into per-end-use sections (heating, hot water, lighting, appliances, cooking, pumps/fans, …) plus a **total**, by pricing **SAP10 Calculation**'s delivered kWh per end use at **current Fuel Rates** — each end use billed at its fuel's rate, rolled up per fuel for **standing charges** (metered fuels only — gas/electricity; oil/LPG/solid have none) minus **SEG** export credit on PV. Implemented by `BillDerivation` in `domain/billing/` (a cross-stage concern — the Baseline stage derives the current bill, the Modelling stage re-runs it on the post-package end-state for post-retrofit bills; deterministic, ADR-0006). Reads Fuel Rates from a committed static snapshot via `FuelRatesRepository` (no live ETL yet). **Distinct from the calculator's `total_fuel_cost_gbp`**, which is the SAP-rating notional cost at RdSAP Table 32 standardised prices (~half the real electricity price) — not what the household pays. Electricity on an **Off-Peak Meter** is billed day/night, each end use split by its own **High-Rate Fraction**. Raises on a fuel it has no rate for (e.g. house coal, heat network). ADR-0014.
 _Avoid_: EPC Energy Derivation (renamed), EpcEnergyDerivationService (no "service" suffix), kWh prediction, baseline kWh, energy estimation
 
+**Off-Peak Meter**:
+A dwelling's dual-rate electricity meter (Economy-7-style) charging a cheaper **night** rate and a dearer **day** rate. It is a property of the **meter, not of any one end use**: *every* electric end use — heating, hot water, lighting, appliances, cooking — is billed on it, each split day/night by its own **High-Rate Fraction**. Derived from the RdSAP `meter_type` (or, in synthesis, from the heating SAP code per the heating-system cluster). The calculator already prices the whole meter this way; **Bill Derivation** mirrors it. Pricing an off-peak dwelling's electricity at the single standard rate is wrong in *both* directions — it over-bills night-shifted storage heat and under-bills daytime appliances.
+_Avoid_: Economy 7 (the common brand, but the model is tariff-agnostic — 7/10/18/24-hour all map here), off-peak fuel (it is a meter arrangement, not a distinct fuel carrier)
+
+**High-Rate Fraction**:
+The fraction of one electric end use's annual kWh billed at the **day** (high) rate on an **Off-Peak Meter**; the remainder bills at the **night** (low) rate. A **calculator output** per end use (SAP 10.2 Table 12a — storage heating ≈ 0 / all-night, lighting & appliances ≈ 0.8–0.9 / mostly-day), reused by **Bill Derivation** rather than re-derived, so the bill's day/night split never diverges from the rating's. Unregulated loads SAP does not rate (appliances, cooking) inherit the Table-12a `ALL_OTHER_USES` fraction.
+_Avoid_: day/night ratio, peak fraction, split factor
+
 **UCL Correction**:
 The per-band linear correction (Few et al. 2023, _Energy & Buildings_ 288 113024) that aligns EPC-modelled Primary Energy Intensity with metered consumption. Folded into ML training labels at fit time (per ADR-0007) rather than applied at runtime — the trained model emits metered-equivalent PEUI directly, avoiding the discontinuities at EPC band boundaries that arose when the per-band linear correction was applied post-prediction. Calibrated against gas-heated, non-PV homes in England and Wales rated under SAP 2012; the current implementation extrapolates it to all properties (open question §15.14).
 _Avoid_: UCL adjustment, energy correction, metered correction
@@ -261,11 +281,19 @@ The catalogue classification of a retrofit measure (e.g. `solar_pv`, `loft_insul
 _Avoid_: measure (ambiguous), category
 
 **Solar Potential**:
-The typed domain projection over a Property's Google Solar `buildingInsights` response (fetched by **Ingestion**, persisted whole as JSONB, read by Modelling — never re-fetched). It carries the per-**roof-segment** geometry the PV simulation needs — `azimuthDegrees` (→ SAP orientation octant), `pitchDegrees` (→ SAP pitch), per-segment panel counts, panel capacity, and `sunshineQuantiles` (→ overshading) — plus the candidate panel layouts (`solarPanelConfigs`). It is the source of the **PV Overlay**: the solar Recommendation Generator reads the Solar Potential (NOT the EPC's `photovoltaic_arrays`, which is the dwelling's *existing* PV) and builds competing PV Options from it. Distinct from existing/installed PV.
+The typed domain projection over a Property's Google Solar `buildingInsights` response (fetched by **Ingestion**, persisted whole as JSONB, read by Modelling — never re-fetched). It carries the per-**roof-segment** geometry the PV simulation needs — `azimuthDegrees` (→ SAP orientation octant), `pitchDegrees` (→ SAP pitch), per-segment panel counts, **per-segment centre + area** (for the **Dwelling-Roof Cap**), panel capacity, and `sunshineQuantiles` (→ overshading) — plus the candidate panel layouts (`solarPanelConfigs`). It is the source of the **PV Overlay**: the solar Recommendation Generator reads the Solar Potential (NOT the EPC's `photovoltaic_arrays`, which is the dwelling's *existing* PV) and builds competing PV Options from it. Distinct from existing/installed PV.
 _Avoid_: solar config (ambiguous — the API response vs the chosen array set), Google insights (the raw JSON, not the typed projection)
 
+**Footprint Conflation**:
+When Google Solar (typically on medium-quality imagery, and most often for **semi-detached / terraced** homes) reports the **whole building's** roof for a single dwelling — merging the target with its attached neighbour — so the **Solar Potential** describes more roof than the dwelling owns. The failure mode the **Dwelling-Roof Cap** corrects; without it the array is sized to two or more homes.
+_Avoid_: duplicate surfaces (the legacy heuristic's name, not the concept)
+
+**Dwelling-Roof Cap**:
+The bound that limits a **Solar PV Recommendation**'s array to the dwelling's *own* usable roof, defeating **Footprint Conflation** (ADR-0038). A surface-area budget — the EPC's RdSAP §3.8 roof plan area (`roof_area`) ÷ cos(pitch) × a usable fraction (~0.5, one non-north plane) — caps the panel count via `min(budget, 0.70 × maxArrayPanelsCount)`, so it is a **no-op on correctly-matched homes** and only bites under conflation. Segments are ranked by proximity to the **dwelling's** own lat/long (not Google's building centre) to keep the home's roof and drop the neighbour's. Used only for **sizing** — distinct from **Solar PV Eligibility**, which still uses the real Solar Potential, never a roof-area-from-floor-area estimate.
+_Avoid_: roof-area haircut (overloads the MCS coverage haircut), double-property halving (the legacy semi-detached-only mechanism this replaces)
+
 **Solar PV Recommendation**:
-The single "Solar PV" **Recommendation** for a Property, carrying competing whole-array **Measure Options** built from the **Solar Potential** (ADR-0026). Up to **five conservatively-sized array configs** (capped, ranked by energy generation as the size-suitability proxy; deliberately *not* full-roof — imagery can miss obstructions, so a coverage/edge-setback haircut applies per MCS), each offered **with and without a battery** (≤ 10 Options). Each Option is priced at a **single price point** from the rate sheet (kWp band + scaffolding-by-elevation + optional battery/diverter) — no multi-product price variants. The PV Overlay sets `photovoltaic_arrays` (one per segment: peak_power, orientation, pitch, overshading) plus `pv_diverter_present`, `pv_connection`, and **`is_dwelling_export_capable=True`** (an export meter is ensured post-install); the battery variant adds `pv_batteries`.
+The single "Solar PV" **Recommendation** for a Property, carrying competing whole-array **Measure Options** built from the **Solar Potential** (ADR-0026). Up to **five conservatively-sized array configs** (capped, ranked by energy generation as the size-suitability proxy; deliberately *not* full-roof — imagery can miss obstructions, so a coverage/edge-setback haircut applies per MCS, and the **Dwelling-Roof Cap** bounds the array to the dwelling's own roof under **Footprint Conflation**), each offered **with and without a battery** (≤ 10 Options). Each Option is priced at a **single price point** from the rate sheet (kWp band + scaffolding-by-elevation + optional battery/diverter) — no multi-product price variants. The PV Overlay sets `photovoltaic_arrays` (one per segment: peak_power, orientation, pitch, overshading) plus `pv_diverter_present`, `pv_connection`, and **`is_dwelling_export_capable=True`** (an export meter is ensured post-install); the battery variant adds `pv_batteries`.
 _Avoid_: solar bundle (PV is competing sized Options, not one fixed bundle like ASHP)
 
 **Solar PV Eligibility**:
@@ -292,6 +320,10 @@ _Avoid_: "windows" as a Measure (name **double glazing** / **secondary glazing**
 The rule fixing the single lighting Measure the **Lighting** Recommendation offers. We convert **all non-LED bulbs** (incandescent + CFL + low-energy-unknown) to **LED** — all the way to LED, not the legacy "fill to low energy", because SAP rates LED efficacy above CFL (ADR-0023). One Measure, no planning gate (lighting isn't planning-restricted). Offered only when the dwelling lodges at least one non-LED bulb; a dwelling already all-LED, or one that lodged **no** bulb counts (nothing to size against), gets no Recommendation. Unlike the fabric measures it is a **whole-dwelling** Measure — its **Simulation Overlay** writes the four top-level bulb counts directly (`led = total`, others 0), the first overlay surface that isn't a building part / window / system sub-object. Priced at a flat **average price per bulb** × the count of non-LED bulbs replaced. A free Optimiser candidate (it *improves* SAP), contrast the forced ventilation **Measure Dependency**.
 _Avoid_: "low energy lighting" as the upgrade target (we go to **LED**); treating it as a forced dependency (it is a free candidate); pricing by floor area (it's per-bulb count × average)
 
+**Coherent Heating System**:
+The set of fields that together describe a dwelling's heating and must move **as a unit** whenever a heating system is *synthesised* — never a subset. It spans the main heating cluster (fuel, system, emitter, **controls**), the **hot water** it implies, the **off-peak meter** an electric-storage or CPSU system runs on, and the hot-water cylinder / solar flags. The fields are physically scattered across the `EpcPropertyData` (a gov-API schema mirror — the cluster, a loose meter on the energy source, loose top-level flags), but the *concept* is one system. Three places synthesise a heating system and each must cover the whole set with its own **fill policy**: a **Measure Option** sets a designed end-state (HHRSH / ASHP), a **Landlord Override** *completes* the partial system the landlord named with conservative assumptions for the fields they couldn't tell us (the off-peak meter is *derived* from the SAP code; an unobserved storage charge control defaults to the conservative manual one), and **EPC Prediction**'s heating donor *carries* a real neighbour's whole coherent set. Setting only a subset mis-scores: an electric-storage system left on a single-rate meter bills its overnight heat at the peak rate and collapses the SAP. **Coherence is owned by the synthesiser, never by the calculator** — a real lodged cert is scored exactly as lodged (ADR-0035).
+_Avoid_: heating overlay (that is one *mechanism*, not the field set); meter as a separate concern (it is part of the system); normalising a lodged EPC (coherence is a synthesis-time obligation only)
+
 **Heating Eligibility**:
 The rule fixing which **Measure Options** the single **Heating & Hot Water** Recommendation offers (ADR-0024, expanded). The competing Options are **mutually-exclusive** (the Optimiser picks at most one) and fall in two families: **whole-system replacements** — `high_heat_retention_storage_heaters`, `air_source_heat_pump` — which change main heating + **controls + fuel + meter + the implied hot water** at once (never a separate HW measure; the legacy heating-vs-HW split double-counted); and, for a dwelling keeping a serviceable wet boiler, **partial upgrades** — `gas_boiler_upgrade` (a like-for-like condensing **gas** boiler: gas→gas, or non-gas→gas only where mains gas is present; combi or regular-plus-cylinder, shaped by the dwelling) and the **system tune-up** (keep the boiler; install better **controls** + fix the **cylinder**), the tune-up offered at two competing control levels: `system_tune_up` (standard, SAP code 2106) and `system_tune_up_zoned` (time-and-temperature zone control, 2110 — more SAP uplift, more cost). Each Option is a **fixed, real, contractor-installable end-state** (ASHP via a fixed PCDB heat-pump index; HHR storage via `sap_main_heating_code=409`; the gas boiler via Table 4b code 102/104; controls via 2106/2110), not a derived ideal; **Product** stays cost-only, but a partial/bundle cost is **composed per dwelling** from the components the overlay installs (ADR-0025/0027), not a flat scalar. Eligibility encodes **only physical/planning installability** — the **Optimiser owns the economics**, so it must not re-gate on cost proxies: **ASHP** → houses/bungalows that are not **listed**/**heritage** and not already a heat pump (flats excluded — individual siting needs a survey; a **conservation area** still gets the offer, unlike glazing); **HHR storage** → off-gas or currently-electric dwellings, not community-heated or already HHR; **boiler upgrade / tune-up** → an existing (non-electric) wet boiler, the gas end-state gated on a mains-gas connection, a partial control upgrade offered only when it genuinely improves the existing control (never a downgrade or no-op). Floor area, fabric, fuel, and built form are **not** gates (the legacy ASHP built-form / 120 m² rule is dropped — no authoritative basis). A free Optimiser candidate, not a forced **Measure Dependency**.
 _Avoid_: separate "heating" and "hot water" recommendations (HW folds into each Option); gating ASHP on floor area / built form / fabric (eligibility is physical/planning only — the Optimiser decides cost-effectiveness); treating the whole-system replacements and the partial boiler/tune-up upgrades as **separate** Recommendations (they are mutually-exclusive Options within the one heating rec — separate recs would let the Optimiser co-select and double-charge); a standalone hot-water-only or controls-only Recommendation (controls + cylinder fold into the boiler/tune-up Option)
diff --git a/applications/landlord_description_overrides/handler.py b/applications/landlord_description_overrides/handler.py
index 5e689a45d..4020bc512 100644
--- a/applications/landlord_description_overrides/handler.py
+++ b/applications/landlord_description_overrides/handler.py
@@ -7,11 +7,16 @@ import boto3
 from applications.landlord_description_overrides.landlord_description_overrides_trigger_body import (
     LandlordDescriptionOverridesTriggerBody,
 )
-from domain.epc.built_form_type import BuiltFormType
-from domain.epc.property_type import PropertyType
-from domain.epc.roof_type import RoofType
-from domain.epc.wall_type import WallType
-from domain.epc.wall_type_construction_dates import (
+from domain.epc.property_overrides.built_form_type import BuiltFormType
+from domain.epc.property_overrides.construction_age_band import ConstructionAgeBand
+from domain.epc.property_overrides.glazing_type import GlazingType
+from domain.epc.property_overrides.main_fuel_type import MainFuelType
+from domain.epc.property_overrides.main_heating_system_type import MainHeatingSystemType
+from domain.epc.property_overrides.property_type import PropertyType
+from domain.epc.property_overrides.roof_type import RoofType
+from domain.epc.property_overrides.water_heating_type import WaterHeatingType
+from domain.epc.property_overrides.wall_type import WallType
+from domain.epc.property_overrides.wall_type_construction_dates import (
     wall_type_construction_date_prompt_hint,
 )
 from infrastructure.chatgpt.chatgpt import ChatGPT
@@ -24,6 +29,21 @@ from infrastructure.postgres.engine import commit_scope, make_engine, make_sessi
 from infrastructure.postgres.landlord_built_form_type_override_table import (
     LandlordBuiltFormTypeOverrideRow,
 )
+from infrastructure.postgres.landlord_construction_age_band_override_table import (
+    LandlordConstructionAgeBandOverrideRow,
+)
+from infrastructure.postgres.landlord_glazing_override_table import (
+    LandlordGlazingOverrideRow,
+)
+from infrastructure.postgres.landlord_main_fuel_override_table import (
+    LandlordMainFuelOverrideRow,
+)
+from infrastructure.postgres.landlord_main_heating_system_override_table import (
+    LandlordMainHeatingSystemOverrideRow,
+)
+from infrastructure.postgres.landlord_water_heating_override_table import (
+    LandlordWaterHeatingOverrideRow,
+)
 from infrastructure.postgres.landlord_property_type_override_table import (
     LandlordPropertyTypeOverrideRow,
 )
@@ -102,6 +122,56 @@ def _build_columns(
                 session, LandlordRoofTypeOverrideRow
             ),
         ),
+        "main_fuel": lambda src: ClassifiableColumn(
+            name="main_fuel",
+            source_column=src,
+            classifier=ChatGptColumnClassifier(
+                chat_gpt, MainFuelType, MainFuelType.UNKNOWN
+            ),
+            repo=LandlordOverridesRepository[MainFuelType](
+                session, LandlordMainFuelOverrideRow
+            ),
+        ),
+        "glazing": lambda src: ClassifiableColumn(
+            name="glazing",
+            source_column=src,
+            classifier=ChatGptColumnClassifier(
+                chat_gpt, GlazingType, GlazingType.UNKNOWN
+            ),
+            repo=LandlordOverridesRepository[GlazingType](
+                session, LandlordGlazingOverrideRow
+            ),
+        ),
+        "construction_age_band": lambda src: ClassifiableColumn(
+            name="construction_age_band",
+            source_column=src,
+            classifier=ChatGptColumnClassifier(
+                chat_gpt, ConstructionAgeBand, ConstructionAgeBand.UNKNOWN
+            ),
+            repo=LandlordOverridesRepository[ConstructionAgeBand](
+                session, LandlordConstructionAgeBandOverrideRow
+            ),
+        ),
+        "water_heating": lambda src: ClassifiableColumn(
+            name="water_heating",
+            source_column=src,
+            classifier=ChatGptColumnClassifier(
+                chat_gpt, WaterHeatingType, WaterHeatingType.UNKNOWN
+            ),
+            repo=LandlordOverridesRepository[WaterHeatingType](
+                session, LandlordWaterHeatingOverrideRow
+            ),
+        ),
+        "main_heating_system": lambda src: ClassifiableColumn(
+            name="main_heating_system",
+            source_column=src,
+            classifier=ChatGptColumnClassifier(
+                chat_gpt, MainHeatingSystemType, MainHeatingSystemType.UNKNOWN
+            ),
+            repo=LandlordOverridesRepository[MainHeatingSystemType](
+                session, LandlordMainHeatingSystemOverrideRow
+            ),
+        ),
     }
 
     columns: list[ClassifiableColumn[Any]] = []
diff --git a/applications/modelling_e2e/Dockerfile b/applications/modelling_e2e/Dockerfile
new file mode 100644
index 000000000..fa13f8efa
--- /dev/null
+++ b/applications/modelling_e2e/Dockerfile
@@ -0,0 +1,24 @@
+FROM public.ecr.aws/lambda/python:3.11
+
+WORKDIR /var/task
+
+COPY applications/modelling_e2e/requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY datatypes/ datatypes/
+COPY domain/ domain/
+COPY infrastructure/ infrastructure/
+COPY orchestration/ orchestration/
+COPY repositories/ repositories/
+COPY utilities/ utilities/
+COPY harness/ harness/
+
+# harness/console.py imports in-memory fakes from tests/orchestration/ at module
+# load time; the fakes have no pytest dependency and are safe to ship.
+COPY tests/__init__.py tests/__init__.py
+COPY tests/orchestration/__init__.py tests/orchestration/__init__.py
+COPY tests/orchestration/fakes.py tests/orchestration/fakes.py
+
+COPY applications/ applications/
+
+CMD ["applications.modelling_e2e.handler.handler"]
diff --git a/applications/modelling_e2e/errors.py b/applications/modelling_e2e/errors.py
new file mode 100644
index 000000000..dbd47b2ea
--- /dev/null
+++ b/applications/modelling_e2e/errors.py
@@ -0,0 +1,144 @@
+"""Specific, debuggable failures for the modelling_e2e prediction path.
+
+When an EPC-less Property cannot be modelled the per-property failure handler
+records ``str(exc)`` in the child SubTask's outputs (see ``handler.run_subtask``).
+A single generic "not predictable" string conflated three unrelated causes —
+unresolved property_type, an empty same-type cohort, and a degenerate
+prediction — so the output could not tell an operator *which* one fired or which
+data to fix. Each cause is its own exception carrying the Property's identity
+plus the cause-specific context needed to debug it from the output alone.
+
+All subclass ``ValueError`` so the existing ``except Exception`` per-property
+boundary (and any ``except ValueError`` callers) keep catching them.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+
+class PropertyNotModellableError(ValueError):
+    """Base: an EPC-less Property could not be predicted. Subclasses name the
+    specific cause. Carries the Property's identity so the failed SubTask output
+    identifies exactly which Property (and portfolio) to investigate."""
+
+    def __init__(
+        self,
+        *,
+        property_id: int,
+        uprn: int,
+        postcode: str,
+        portfolio_id: int,
+        cause: str,
+    ) -> None:
+        self.property_id = property_id
+        self.uprn = uprn
+        self.postcode = postcode
+        self.portfolio_id = portfolio_id
+        self.cause = cause
+        super().__init__(
+            f"cannot model property_id={property_id} uprn={uprn} "
+            f"postcode={postcode!r} portfolio_id={portfolio_id}: {cause}"
+        )
+
+
+class UnresolvedPropertyTypeError(PropertyNotModellableError):
+    """No lodged EPC and the Property's ``property_type`` could not be resolved,
+    so the hard same-type cohort filter cannot fire. Almost always a missing or
+    contradictory Landlord Override (e.g. a House/Bungalow lodged with an
+    "another dwelling above" roof is skipped by the override build), or a
+    ``property_type`` value with no gov-EPC code."""
+
+    def __init__(
+        self,
+        *,
+        property_id: int,
+        uprn: int,
+        postcode: str,
+        portfolio_id: int,
+        property_type: Optional[str],
+        built_form: Optional[str],
+    ) -> None:
+        self.property_type = property_type
+        self.built_form = built_form
+        super().__init__(
+            property_id=property_id,
+            uprn=uprn,
+            postcode=postcode,
+            portfolio_id=portfolio_id,
+            cause=(
+                "no lodged EPC and property_type could not be resolved "
+                f"(property_type={property_type!r}, built_form={built_form!r}), "
+                "so no same-type cohort can be selected. Usually a missing or "
+                "contradictory Landlord Override (e.g. a House/Bungalow with an "
+                "'another dwelling above' roof is skipped by the override build). "
+                "Resolve this Property's property_type override to model it."
+            ),
+        )
+
+
+class NoSameTypeComparablesError(PropertyNotModellableError):
+    """``property_type`` resolved, but no same-type comparable was found in the
+    Property's own postcode or — after broadening — the nearby-postcode cohort,
+    so it cannot be sized from a mixed-type cohort (ADR-0031)."""
+
+    def __init__(
+        self,
+        *,
+        property_id: int,
+        uprn: int,
+        postcode: str,
+        portfolio_id: int,
+        property_type: str,
+        broadened: bool,
+    ) -> None:
+        self.property_type = property_type
+        self.broadened = broadened
+        scope = (
+            "its own postcode or the broadened nearby-postcode cohort"
+            if broadened
+            else "its own postcode"
+        )
+        super().__init__(
+            property_id=property_id,
+            uprn=uprn,
+            postcode=postcode,
+            portfolio_id=portfolio_id,
+            cause=(
+                f"no lodged EPC; property_type={property_type!r} resolved but no "
+                f"same-type comparable was found in {scope}. Cannot size the "
+                "Property from a mixed-type cohort."
+            ),
+        )
+
+
+class DegeneratePredictionError(PropertyNotModellableError):
+    """A same-type cohort was found, but the synthesised EPC carried no MAIN
+    building part — every comparable seeding the structure was lodged with a
+    null/unrecognised part identifier — so the SAP calculation has no main
+    dwelling to anchor on."""
+
+    def __init__(
+        self,
+        *,
+        property_id: int,
+        uprn: int,
+        postcode: str,
+        portfolio_id: int,
+        property_type: str,
+        cohort_size: int,
+    ) -> None:
+        self.property_type = property_type
+        self.cohort_size = cohort_size
+        super().__init__(
+            property_id=property_id,
+            uprn=uprn,
+            postcode=postcode,
+            portfolio_id=portfolio_id,
+            cause=(
+                f"no lodged EPC; predicted from a {cohort_size}-member "
+                f"property_type={property_type!r} cohort, but the synthesised EPC "
+                "had no MAIN building part (the structural template was lodged "
+                "with a null part identifier). Cannot anchor the SAP calculation."
+            ),
+        )
diff --git a/applications/modelling_e2e/handler.py b/applications/modelling_e2e/handler.py
new file mode 100644
index 000000000..916c2c247
--- /dev/null
+++ b/applications/modelling_e2e/handler.py
@@ -0,0 +1,722 @@
+"""SQS-triggered Lambda: fetch EPC (or predict) → run modelling → persist plan.
+
+One SQS message = one batch of properties sharing a portfolio, scenario, and
+(by caller convention) postcode. The handler reads ``property_ids``,
+``portfolio_id``, ``scenario_id``, ``no_solar``, and ``dry_run`` from the
+message body, fetches or predicts each property's EPC, runs the full modelling
+pipeline (SAP10 → optimiser) via ``harness.console.run_modelling``, buffers each
+resulting Plan in memory, and persists the whole batch via ``PostgresUnitOfWork``
+in one atomic transaction at the end.
+
+When no lodged EPC is found, EPC Prediction (Path 3, ADR-0031) synthesises one
+from the postcode cohort. ``_cohort_cache`` is module-level so warm Lambda
+containers re-processing the same postcode avoid redundant fetches.
+
+All Measure Types are considered: pricing goes through
+``catalogue_snapshot_with_off_catalogue_overrides`` so the measures the live
+``material`` catalogue cannot supply (``secondary_heating_removal``, the glazing
+and heating gaps) are priced from the committed off-catalogue overlay instead of
+crashing.
+
+The DB engine is module-scoped (ADR-0012). Architecturally each invocation uses
+one DB connection at a time: the handler reads everything up front — overrides,
+Scenario, a catalogue snapshot, and stored Solar — through one short-lived read
+Session, closes it, models the batch (buffering each Plan in memory), then
+persists the whole batch in one end-of-batch Unit of Work whose overrides resolve
+on its own session, so no two Sessions ever overlap. The engine uses ``NullPool``
+rather than a fixed pool so that target is a graceful ceiling, not a hard one: a
+fresh connection is opened per checkout and closed on return, so there is no pool
+slot to exhaust — any future accidental overlap opens a transient second
+connection instead of dead-locking the Lambda.
+"""
+
+from __future__ import annotations
+
+import dataclasses
+import io
+import os
+from collections.abc import Callable, Generator
+from contextlib import contextmanager
+from typing import Any, Optional, cast
+
+import boto3
+import pandas as pd  # pyright: ignore[reportMissingTypeStubs]
+from sqlalchemy import Engine, text
+from sqlalchemy.pool import NullPool
+from sqlmodel import Session
+
+from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
+    EpcPropertyData,
+)
+from domain.epc_prediction.comparable_properties import (
+    ComparableProperty,
+    select_comparables,
+)
+from domain.epc_prediction.epc_prediction import EpcPrediction
+from domain.epc_prediction.prediction_target import (
+    PredictionTarget,
+    build_prediction_target,
+)
+from domain.geospatial.coordinates import Coordinates
+from domain.geospatial.planning_restrictions import PlanningRestrictions
+from domain.geospatial.spatial_reference import SpatialReference
+from domain.modelling.plan import Plan
+from domain.property.property import Property, PropertyIdentity
+from domain.property_baseline.calculator_rebaseliner import CalculatorRebaseliner
+from domain.sap10_calculator.calculator import Sap10Calculator
+from domain.tasks.subtasks import SubTask
+from domain.tasks.tasks import Source
+from harness.console import run_modelling
+from orchestration.task_orchestrator import TaskOrchestrator
+from orchestration.property_baseline_orchestrator import (
+    PropertyBaselineOrchestrator,
+)
+from infrastructure.epc_client.epc_client_service import EpcClientService
+from infrastructure.postcodes_io.postcodes_io_client import PostcodesIoClient
+from infrastructure.postgres.config import PostgresConfig
+from infrastructure.postgres.engine import make_engine
+from infrastructure.solar.google_solar_api_client import (
+    BuildingInsightsNotFoundError,
+    GoogleSolarApiClient,
+)
+from applications.modelling_e2e.errors import (
+    DegeneratePredictionError,
+    NoSameTypeComparablesError,
+    UnresolvedPropertyTypeError,
+)
+from applications.modelling_e2e.modelling_e2e_trigger_body import (
+    ModellingE2ETriggerBody,
+)
+from repositories.comparable_properties.epc_comparable_properties_repository import (
+    EpcComparablePropertiesRepository,
+    SkippedCohortCert,
+)
+from repositories.epc.epc_postgres_repository import EpcPostgresRepository, EpcSaveRequest
+from repositories.plan.plan_repository import PlanSaveRequest
+from repositories.geospatial.geospatial_s3_repository import (
+    GeospatialS3Repository,
+    ParquetReader,
+)
+from repositories.fuel_rates.fuel_rates_static_file_repository import (
+    FuelRatesStaticFileRepository,
+)
+from repositories.postgres_unit_of_work import PostgresUnitOfWork
+from repositories.product.composite_product_repository import (
+    catalogue_snapshot_with_off_catalogue_overrides,
+)
+from repositories.property.in_memory_property_overrides_reader import (
+    InMemoryPropertyOverridesReader,
+)
+from repositories.property.landlord_override_overlays import overlays_from
+from repositories.property.override_backed_prediction_attributes_reader import (
+    OverrideBackedPredictionAttributesReader,
+)
+from repositories.property.property_overrides_postgres_reader import (
+    PropertyOverridesPostgresReader,
+)
+from repositories.property.property_overrides_reader import (
+    ResolvedPropertyOverrides,
+)
+from repositories.scenario.scenario_postgres_repository import (
+    ScenarioPostgresRepository,
+)
+from repositories.solar.solar_postgres_repository import SolarPostgresRepository
+from repositories.tasks.subtask_postgres_repository import (
+    SubTaskPostgresRepository,
+)
+from repositories.tasks.task_postgres_repository import TaskPostgresRepository
+from utilities.aws_lambda.task_handler import task_handler
+from uuid import UUID
+from utilities.logger import setup_logger
+
+_engine: Optional[Engine] = None
+_cohort_cache: dict[str, list[ComparableProperty]] = {}
+# Broadened (nearby-postcode) cohorts, keyed by (seed postcode, target property
+# type): the early-stop walk depends on the type it is filling for, so two types
+# in the same postcode must not share a cached result.
+_nearby_cohort_cache: dict[tuple[str, str], list[ComparableProperty]] = {}
+
+logger = setup_logger()
+
+
+@dataclasses.dataclass(frozen=True)
+class _SolarWrite:
+    """A freshly-fetched Solar insight queued for persistence. Only set when the
+    insight was fetched this run — stored insights are never re-written."""
+
+    uprn: int
+    longitude: float
+    latitude: float
+    insights: dict[str, Any]
+
+
+@dataclasses.dataclass(frozen=True)
+class _PropertyWrite:
+    """One modelled Property's full persistence intent, accumulated in memory
+    during the compute loop and replayed in a single end-of-batch Unit of Work.
+
+    Buffering the writes (rather than committing per property) keeps the single
+    pooled connection idle through the CPU-bound modelling loop, then collapses
+    the whole batch into one transaction — far fewer statements for RDS to parse,
+    plan, and commit, which is the RDS-CPU bottleneck this targets (ADR-0012)."""
+
+    property_id: int
+    uprn: int
+    portfolio_id: int
+    scenario_id: int
+    is_default: bool
+    lodged_epc: Optional[EpcPropertyData]
+    lodged_epc_is_new: bool
+    predicted_epc: Optional[EpcPropertyData]
+    predicted_epc_is_new: bool
+    spatial: Optional[SpatialReference]
+    solar: Optional[_SolarWrite]
+    plan: Plan
+    has_recommendations: bool
+
+
+def _flush_writes(engine: Engine, writes: list[_PropertyWrite]) -> None:
+    """Persist a whole batch of modelled Properties in one Unit of Work.
+
+    EPC writes are batched by source (lodged group first, predicted group second)
+    so each source emits one DELETE pass + one INSERT pass regardless of batch
+    size, rather than N×per-property round-trips (ADR-0012). All other writes
+    (spatial, solar, plan, mark-modelled) remain per-property inside the same
+    transaction. All-or-nothing per batch: a failed save rolls the whole
+    transaction back so the SQS message is retried — every save is an idempotent
+    upsert. Per-property failures are isolated earlier, in the modelling loop,
+    before a write is ever queued."""
+    lodged_requests = [
+        EpcSaveRequest(w.lodged_epc, property_id=w.property_id, portfolio_id=w.portfolio_id, source="lodged")
+        for w in writes
+        if w.lodged_epc is not None and w.lodged_epc_is_new
+    ]
+    predicted_requests = [
+        EpcSaveRequest(w.predicted_epc, property_id=w.property_id, portfolio_id=w.portfolio_id, source="predicted")
+        for w in writes
+        if w.predicted_epc is not None and w.predicted_epc_is_new
+    ]
+    with PostgresUnitOfWork(lambda: Session(engine)) as uow:
+        if lodged_requests:
+            uow.epc.save_batch(lodged_requests)
+        if predicted_requests:
+            uow.epc.save_batch(predicted_requests)
+        plan_requests = [
+            PlanSaveRequest(
+                w.plan,
+                property_id=w.property_id,
+                scenario_id=w.scenario_id,
+                portfolio_id=w.portfolio_id,
+                is_default=w.is_default,
+            )
+            for w in writes
+        ]
+        uow.plan.save_batch(plan_requests)
+        for w in writes:
+            if w.spatial is not None:
+                uow.spatial.save(w.uprn, w.spatial)
+            if w.solar is not None:
+                uow.solar.save(
+                    w.solar.uprn,
+                    longitude=w.solar.longitude,
+                    latitude=w.solar.latitude,
+                    insights=w.solar.insights,
+                )
+            uow.property.mark_modelled(
+                w.property_id, has_recommendations=w.has_recommendations
+            )
+        uow.commit()
+
+
+def _get_engine() -> Engine:
+    global _engine
+    if _engine is None:
+        config = PostgresConfig.from_env(dict(os.environ))
+        # Architecturally one connection per invocation: the handler reads
+        # everything up front through one short-lived read Session, closes it,
+        # then writes each Property in a sequential Unit of Work — and the Unit of
+        # Work resolves overrides on its own session — so no two Sessions overlap
+        # and a single connection suffices. 12 concurrent containers × 1 = 12
+        # against RDS.
+        #
+        # NullPool, not a fixed pool, enforces that as a *graceful* ceiling rather
+        # than a hard one: each checkout opens a fresh connection and closes it on
+        # return, so there is no pool slot to exhaust. If a future code path ever
+        # holds two Sessions at once it opens a second connection for that instant
+        # instead of dead-locking on a 1-slot pool and failing the whole
+        # invocation (the "QueuePool limit of size 1 overflow 0 reached" timeout).
+        # The design target stays one connection; NullPool just keeps the Lambda
+        # running if we ever regress it.
+        _engine = make_engine(config, poolclass=NullPool)
+    return _engine
+
+
+@contextmanager
+def _shared_engine_orchestrator() -> Generator[TaskOrchestrator, None, None]:
+    """A ``TaskOrchestrator`` on the same module-scoped engine as the modelling
+    work, not a separate one.
+
+    Its repositories commit on every ``save``/``create``, releasing the
+    connection between bookkeeping calls, so it holds none while the wrapped
+    handler body runs. Combined with the read-then-write handler structure, the
+    whole invocation uses one DB connection at a time."""
+    engine = _get_engine()
+    with Session(engine) as session:
+        yield TaskOrchestrator(
+            task_repo=TaskPostgresRepository(session=session),
+            subtask_repo=SubTaskPostgresRepository(session=session),
+        )
+
+
+def _s3_parquet_reader() -> ParquetReader:
+    bucket = os.environ["DATA_BUCKET"]
+
+    def read(key: str) -> pd.DataFrame:
+        s3: Any = cast(
+            Any, boto3.client("s3")
+        )  # pyright: ignore[reportUnknownMemberType]
+        raw = cast(bytes, s3.get_object(Bucket=bucket, Key=key)["Body"].read())
+        return pd.read_parquet(io.BytesIO(raw))  # type: ignore[return-value]
+
+    return read
+
+
+def _spatial_for(
+    geospatial: GeospatialS3Repository, uprn: int
+) -> Optional[SpatialReference]:
+    try:
+        return geospatial.spatial_for(uprn)
+    except Exception:  # noqa: BLE001
+        return None
+
+
+# The 32-wide fallback gap between this container's Solar calls: 0.8 (safety
+# headroom) × 600 QPM ÷ 60 ÷ 32 containers ≈ one call every 4s. Used when the
+# env var is unset so the Lambda self-protects even if terraform wiring is missed.
+_DEFAULT_SOLAR_MIN_REQUEST_INTERVAL_SECONDS: float = 4.0
+
+
+def _solar_min_request_interval_seconds() -> float:
+    """Per-container minimum gap (seconds) between Google Solar API calls, read
+    from ``SOLAR_MIN_REQUEST_INTERVAL_SECONDS``. Terraform derives the value from
+    the queue's ``maximum_concurrency`` (0.8 × 10 QPS ÷ N) so the up-to-32-wide
+    fleet stays under the hard 600 QPM Solar ceiling. Falls back to the 32-wide
+    default when unset or unparseable."""
+    raw = os.environ.get("SOLAR_MIN_REQUEST_INTERVAL_SECONDS")
+    if raw is None:
+        return _DEFAULT_SOLAR_MIN_REQUEST_INTERVAL_SECONDS
+    try:
+        return float(raw)
+    except ValueError:
+        return _DEFAULT_SOLAR_MIN_REQUEST_INTERVAL_SECONDS
+
+
+def _solar_insights_for(
+    solar_client: GoogleSolarApiClient, spatial: Optional[SpatialReference]
+) -> Optional[dict[str, Any]]:
+    if spatial is None or spatial.coordinates is None:
+        return None
+    try:
+        return solar_client.get_building_insights(
+            spatial.coordinates.longitude, spatial.coordinates.latitude
+        )
+    except BuildingInsightsNotFoundError:
+        return None
+
+
+def _dedupe_skipped(
+    skipped: list[SkippedCohortCert],
+) -> list[SkippedCohortCert]:
+    """First occurrence of each skipped cert number (the same cert can appear in
+    more than one postcode cohort across a batch)."""
+    seen: set[str] = set()
+    unique: list[SkippedCohortCert] = []
+    for cert in skipped:
+        if cert.certificate_number not in seen:
+            seen.add(cert.certificate_number)
+            unique.append(cert)
+    return unique
+
+
+def _predict_epc(
+    *,
+    property_id: int,
+    uprn: int,
+    postcode: str,
+    portfolio_id: int,
+    attributes_reader: OverrideBackedPredictionAttributesReader,
+    coordinates: Optional[Coordinates],
+    cohort_for: Callable[[str], list[ComparableProperty]],
+    broaden: Callable[[PredictionTarget], list[ComparableProperty]],
+    predictor: EpcPrediction,
+) -> EpcPropertyData:
+    """Synthesise an EpcPropertyData for an EPC-less property from its postcode
+    cohort (EPC Prediction Path 3, ADR-0031).
+
+    When the property's own postcode holds no same-type comparables (a sparse
+    postcode — e.g. the only flat among houses), the cohort is broadened to the
+    real unit postcodes physically nearest it (``broaden``) before giving up.
+
+    Raises a specific ``PropertyNotModellableError`` subclass — naming the cause
+    and carrying the property's identity — when it cannot predict: property_type
+    unresolved, an empty same-type cohort, or a degenerate (no MAIN part)
+    prediction. The per-property handler records ``str(exc)`` in the SubTask
+    output, so the cause is debuggable from the output alone.
+    """
+    attributes = attributes_reader.attributes_for(property_id)
+    identity = PropertyIdentity(
+        portfolio_id=portfolio_id, postcode=postcode, address="", uprn=uprn
+    )
+    target = build_prediction_target(identity, coordinates, attributes)
+    if target is None:
+        raise UnresolvedPropertyTypeError(
+            property_id=property_id,
+            uprn=uprn,
+            postcode=postcode,
+            portfolio_id=portfolio_id,
+            property_type=attributes.property_type,
+            built_form=attributes.built_form,
+        )
+    comparables = select_comparables(target, cohort_for(target.postcode))
+    broadened = False
+    if not comparables.members:
+        broadened = True
+        comparables = select_comparables(target, broaden(target))
+    if not comparables.members:
+        raise NoSameTypeComparablesError(
+            property_id=property_id,
+            uprn=uprn,
+            postcode=postcode,
+            portfolio_id=portfolio_id,
+            property_type=target.property_type,
+            broadened=broadened,
+        )
+    predicted = predictor.predict(target, comparables)
+    if not any(
+        part.identifier is BuildingPartIdentifier.MAIN
+        for part in predicted.sap_building_parts
+    ):
+        raise DegeneratePredictionError(
+            property_id=property_id,
+            uprn=uprn,
+            postcode=postcode,
+            portfolio_id=portfolio_id,
+            property_type=target.property_type,
+            cohort_size=len(comparables.members),
+        )
+    return predicted
+
+
+@task_handler(
+    task_source="modelling_e2e",
+    source=Source.PROPERTY,
+    orchestrator_cm=_shared_engine_orchestrator,
+    pass_task_orchestrator=True,
+)
+def handler(
+    body: dict[str, Any], context: Any, orchestrator: TaskOrchestrator, task_id: UUID
+) -> None:
+    trigger = ModellingE2ETriggerBody.model_validate(body)
+    property_ids = trigger.property_ids
+    portfolio_id = trigger.portfolio_id
+    scenario_id = trigger.scenario_id
+    refetch_solar = trigger.refetch_solar
+    refetch_epc = trigger.refetch_epc
+    repredict_epc = trigger.repredict_epc
+    dry_run = trigger.dry_run
+
+    logger.info(
+        f"start property_ids={property_ids} portfolio={portfolio_id} "
+        f"scenario={scenario_id} refetch_solar={refetch_solar} "
+        f"refetch_epc={refetch_epc} repredict_epc={repredict_epc} dry_run={dry_run}"
+    )
+
+    engine = _get_engine()
+    epc_client = EpcClientService(os.environ["OPEN_EPC_API_TOKEN"])
+    geospatial = GeospatialS3Repository(_s3_parquet_reader())
+    solar_client = GoogleSolarApiClient(
+        os.environ["GOOGLE_SOLAR_API_KEY"],
+        min_request_interval_seconds=_solar_min_request_interval_seconds(),
+    )
+
+    with engine.connect() as conn:
+        property_rows = conn.execute(
+            text("SELECT id, uprn, postcode FROM property WHERE id = ANY(:ids)"),
+            {"ids": property_ids},
+        ).fetchall()
+
+    uprns: dict[int, int] = {int(row[0]): int(row[1]) for row in property_rows}
+    postcodes: dict[int, str] = {int(row[0]): (row[2] or "") for row in property_rows}
+
+    # Pre-fetch every Property's overrides up front in one query (one short read
+    # Session, opened and closed before the write loop) and serve them from memory
+    # through the loop, so no override read Session is held open alongside a write
+    # Unit of Work.
+    overrides_postgres_reader = PropertyOverridesPostgresReader(lambda: Session(engine))
+    overrides_by_pid: dict[int, ResolvedPropertyOverrides] = (
+        overrides_postgres_reader.overrides_for_many(property_ids)
+    )
+    overrides_reader = InMemoryPropertyOverridesReader(overrides_by_pid)
+    prediction_attrs_reader = OverrideBackedPredictionAttributesReader(overrides_reader)
+    comparables_repo = EpcComparablePropertiesRepository(
+        epc_client, geospatial, nearby_postcodes=PostcodesIoClient()
+    )
+    predictor = EpcPrediction()
+
+    def _get_cohort(postcode: str) -> list[ComparableProperty]:
+        if postcode not in _cohort_cache:
+            _cohort_cache[postcode] = (
+                comparables_repo.candidates_for(postcode) if postcode else []
+            )
+        return _cohort_cache[postcode]
+
+    def _broaden(target: PredictionTarget) -> list[ComparableProperty]:
+        """The nearby-postcode cohort for a gated-out target — the real unit
+        postcodes nearest it, walked until enough same-type comparables surface
+        (ADR-0034). Memoised per (postcode, property_type) so co-located
+        same-type misses share one walk."""
+        key = (target.postcode, target.property_type)
+        if key not in _nearby_cohort_cache:
+            _nearby_cohort_cache[key] = (
+                comparables_repo.candidates_near(
+                    target.postcode,
+                    target.coordinates,
+                    enough=lambda c: c.epc.property_type == target.property_type,
+                )
+                if target.postcode
+                else []
+            )
+        return _nearby_cohort_cache[key]
+
+    # Re-establishes every written Property's Baseline Performance from the just-
+    # persisted EPCs. Run once for the whole batch after the write flush — the
+    # orchestrator already does the batch in one UoW (ADR-0012) — rather than once
+    # per property, so the batch costs one baseline transaction, not N.
+    baseline_orchestrator = PropertyBaselineOrchestrator(
+        unit_of_work=lambda: PostgresUnitOfWork(lambda: Session(engine)),
+        rebaseliner=CalculatorRebaseliner(Sap10Calculator()),
+        fuel_rates=FuelRatesStaticFileRepository(),
+    )
+
+    read_session = Session(engine)
+    try:
+        # Read everything the modelling loop needs up front: the Scenario, an
+        # in-memory snapshot of the catalogue (priced after the Session closes),
+        # and each UPRN's stored Solar insights. Then close the read Session
+        # immediately so its pooled connection is free for the single end-of-batch
+        # write Unit of Work — no write ever opens a second connection alongside a
+        # held-open read Session. (The ``finally`` is the safety net.)
+        scenario = ScenarioPostgresRepository(read_session).get_many([scenario_id])[0]
+        products = catalogue_snapshot_with_off_catalogue_overrides(read_session)
+        stored_solar: dict[int, Optional[dict[str, Any]]] = (
+            {}
+            if not refetch_solar
+            else SolarPostgresRepository(read_session).get_many(
+                list(set(uprns.values()))
+            )
+        )
+        epc_repo = EpcPostgresRepository(read_session)
+        stored_lodged_epcs: dict[int, EpcPropertyData] = (
+            epc_repo.get_for_properties(property_ids) if not refetch_epc else {}
+        )
+        stored_predicted_epcs: dict[int, EpcPropertyData] = (
+            epc_repo.get_predicted_for_properties(property_ids)
+            if not repredict_epc
+            else {}
+        )
+        read_session.close()
+
+        # Each Property models in its own child SubTask (failures isolated here),
+        # appending its persistence intent to this buffer instead of writing — the
+        # whole batch is flushed in one transaction after the loop.
+        accumulated: list[_PropertyWrite] = []
+
+        def _work(subtask: SubTask) -> None:
+            inputs = subtask.inputs or {}
+            pid = int(inputs["property_id"])
+            uprn = uprns[pid]
+            postcode = postcodes.get(pid, "")
+            logger.info(f"property={pid} uprn={uprn} postcode={postcode!r}")
+
+            spatial = _spatial_for(geospatial, uprn)
+            restrictions = (
+                spatial.restrictions if spatial is not None else PlanningRestrictions()
+            )
+            coordinates: Optional[Coordinates] = (
+                spatial.coordinates if spatial is not None else None
+            )
+
+            stored_lodged = stored_lodged_epcs.get(pid)
+            lodged_epc_is_new = False
+            if refetch_epc:
+                epc: Optional[EpcPropertyData] = epc_client.get_by_uprn(uprn)
+                lodged_epc_is_new = epc is not None
+            elif stored_lodged is not None:
+                logger.info(
+                    f"property={pid} using stored lodged EPC (refetch_epc=False)"
+                )
+                epc = stored_lodged
+            else:
+                epc = (
+                    None  # no stored lodged EPC; prediction path handles this property
+                )
+            overrides = overlays_from(overrides_reader.overrides_for(pid))
+            predicted_epc: Optional[EpcPropertyData] = None
+            predicted_epc_is_new = False
+
+            if epc is not None:
+                logger.info(f"property={pid} lodged EPC found")
+                effective_epc = Property(
+                    identity=PropertyIdentity(
+                        portfolio_id=portfolio_id,
+                        postcode=postcode,
+                        address="",
+                        uprn=uprn,
+                    ),
+                    epc=epc,
+                    landlord_overrides=overrides,
+                ).effective_epc
+            else:
+                logger.info(f"property={pid} no lodged EPC — attempting prediction")
+                stored_predicted = stored_predicted_epcs.get(pid)
+                if not repredict_epc and stored_predicted is not None:
+                    logger.info(
+                        f"property={pid} using stored predicted EPC (repredict_epc=False)"
+                    )
+                    predicted_epc = stored_predicted
+                else:
+                    predicted_epc = _predict_epc(
+                        property_id=pid,
+                        uprn=uprn,
+                        postcode=postcode,
+                        portfolio_id=portfolio_id,
+                        attributes_reader=prediction_attrs_reader,
+                        coordinates=coordinates,
+                        cohort_for=_get_cohort,
+                        broaden=_broaden,
+                        predictor=predictor,
+                    )
+                    predicted_epc_is_new = True
+                effective_epc = Property(
+                    identity=PropertyIdentity(
+                        portfolio_id=portfolio_id,
+                        postcode=postcode,
+                        address="",
+                        uprn=uprn,
+                    ),
+                    epc=None,
+                    predicted_epc=predicted_epc,
+                    landlord_overrides=overrides,
+                ).effective_epc
+
+            solar_insights: Optional[dict[str, Any]]
+            solar_was_fetched = False
+            if not refetch_solar:
+                solar_insights = None
+            else:
+                solar_insights = stored_solar.get(uprn)
+                if solar_insights is None:
+                    solar_insights = _solar_insights_for(solar_client, spatial)
+                    solar_was_fetched = solar_insights is not None
+
+            plan = run_modelling(
+                effective_epc,
+                planning_restrictions=restrictions,
+                solar_insights=solar_insights,
+                considered_measures=None,
+                products=products,
+                scenario=scenario,
+                print_table=False,
+            )
+            logger.info(
+                f"property={pid} modelling complete " f"measures={len(plan.measures)}"
+            )
+
+            if dry_run:
+                measure_types = (
+                    ", ".join(m.measure_type for m in plan.measures) or "none"
+                )
+                logger.info(
+                    f"[dry_run] property={pid} "
+                    f"measures=[{measure_types}] — skipping DB write"
+                )
+                return
+
+            solar_write: Optional[_SolarWrite] = None
+            if (
+                solar_was_fetched
+                and solar_insights is not None
+                and spatial is not None
+                and spatial.coordinates is not None
+            ):
+                solar_write = _SolarWrite(
+                    uprn=uprn,
+                    longitude=spatial.coordinates.longitude,
+                    latitude=spatial.coordinates.latitude,
+                    insights=solar_insights,
+                )
+
+            # Queue this Property's writes rather than committing now — the
+            # whole batch is persisted in one Unit of Work after the loop
+            # (see _flush_writes). The *_is_new flags gate EPC saves so that
+            # EPCs read from DB unchanged are not re-written.
+            accumulated.append(
+                _PropertyWrite(
+                    property_id=pid,
+                    uprn=uprn,
+                    portfolio_id=portfolio_id,
+                    scenario_id=scenario_id,
+                    is_default=scenario.is_default,
+                    lodged_epc=epc,
+                    lodged_epc_is_new=lodged_epc_is_new,
+                    predicted_epc=predicted_epc,
+                    predicted_epc_is_new=predicted_epc_is_new,
+                    spatial=spatial,
+                    solar=solar_write,
+                    plan=plan,
+                    has_recommendations=bool(plan.measures),
+                )
+            )
+            logger.info(f"property={pid} queued for write")
+
+        # Fan the batch out into one child SubTask per property and run them in
+        # a single batched pass: create all children, model each (failures
+        # isolated per child), then persist all their statuses in two writes +
+        # one cascade — not ~5 writes and a full parent re-roll-up per property
+        # (see TaskOrchestrator.run_subtasks).
+        orchestrator.run_subtasks(
+            task_id,
+            [{"property_id": pid} for pid in property_ids],
+            work=_work,
+        )
+
+        # Persist the whole batch in one transaction, then re-establish every
+        # written Property's Baseline (the orchestrator batches its own UoW). The
+        # N per-property write transactions plus N baseline transactions collapse
+        # to two — the RDS-CPU win. Skipped entirely on a dry run or an all-failed
+        # batch, where nothing was queued.
+        if accumulated:
+            _flush_writes(engine, accumulated)
+            baseline_orchestrator.run([w.property_id for w in accumulated])
+            logger.info(
+                f"persisted {len(accumulated)} "
+                f"{'property' if len(accumulated) == 1 else 'properties'} "
+                f"and baselines"
+            )
+
+        # Cohort certs the mapper could not consume were skipped (not aborted on)
+        # so prediction could proceed; surface them — with cert numbers — in the
+        # subtask outputs so the mapper gaps can be closed later.
+        skipped_certs: list[dict[str, str]] = [
+            {"certificate_number": s.certificate_number, "error": s.error}
+            for s in _dedupe_skipped(comparables_repo.skipped)
+        ]
+        if skipped_certs:
+            logger.info(
+                f"skipped {len(skipped_certs)} unmappable cohort cert(s): "
+                f"{[s['certificate_number'] for s in skipped_certs]}"
+            )
+
+    finally:
+        read_session.close()
diff --git a/applications/modelling_e2e/local_handler/.env.local.example b/applications/modelling_e2e/local_handler/.env.local.example
new file mode 100644
index 000000000..8054ecd8b
--- /dev/null
+++ b/applications/modelling_e2e/local_handler/.env.local.example
@@ -0,0 +1,36 @@
+# Local-test environment for the modelling_e2e Lambda.
+#
+#   cp .env.local.example .env.local   then fill in the values below.
+#
+# .env.local is gitignored. The container hits REAL AWS and a REAL Postgres,
+# so every value here points at infrastructure that exists.
+#
+# Set dry_run=true in invoke_local_lambda.py to run the full pipeline without
+# writing anything to the DB — safe for local testing.
+#
+# Keep comments on their own lines — docker-compose's env_file parser folds a
+# trailing "# ..." into the value.
+
+# --- Postgres (infrastructure/postgres/config.py -> PostgresConfig.from_env) ---
+# POSTGRES_HOST <- DB_HOST, PORT <- DB_PORT, USERNAME <- DB_USERNAME,
+# PASSWORD <- DB_PASSWORD, DATABASE <- DB_NAME.
+POSTGRES_HOST=
+POSTGRES_PORT=5432
+POSTGRES_USERNAME=
+POSTGRES_PASSWORD=
+POSTGRES_DATABASE=
+# POSTGRES_DRIVER=psycopg2   (optional; defaults to psycopg2)
+
+# --- Handler config (applications/modelling_e2e/handler.py) ---
+# OPEN_EPC_API_TOKEN: gov.uk EPC API token (root .env: OPEN_EPC_API_TOKEN).
+# GOOGLE_SOLAR_API_KEY: Google Solar API key (root .env: GOOGLE_SOLAR_API_KEY).
+# DATA_BUCKET: S3 bucket holding geospatial parquet files (root .env: DATA_BUCKET).
+OPEN_EPC_API_TOKEN=
+GOOGLE_SOLAR_API_KEY=
+DATA_BUCKET=
+
+# --- AWS credentials for boto3 (S3 + EPC client) ---
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=eu-west-2
+# AWS_SESSION_TOKEN=   (only if using temporary/SSO credentials)
diff --git a/applications/modelling_e2e/local_handler/docker-compose.yml b/applications/modelling_e2e/local_handler/docker-compose.yml
new file mode 100644
index 000000000..09e41d654
--- /dev/null
+++ b/applications/modelling_e2e/local_handler/docker-compose.yml
@@ -0,0 +1,9 @@
+services:
+  modelling-e2e:
+    build:
+      context: ../../../
+      dockerfile: applications/modelling_e2e/Dockerfile
+    ports:
+      - "9004:8080"
+    env_file:
+      - ../../../.env
diff --git a/applications/modelling_e2e/local_handler/invoke_local_lambda.py b/applications/modelling_e2e/local_handler/invoke_local_lambda.py
new file mode 100644
index 000000000..991d181dc
--- /dev/null
+++ b/applications/modelling_e2e/local_handler/invoke_local_lambda.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+import json
+import requests
+
+HOST = "localhost"
+PORT = "9004"
+
+LAMBDA_URL = f"http://{HOST}:{PORT}/2015-03-31/functions/function/invocations"
+
+payload = {
+    "Records": [
+        {
+            "body": json.dumps(
+                {
+                    "property_ids": [727220, 727229],
+                    "portfolio_id": 796,
+                    "scenario_id": 1268,
+                    "refetch_solar": True,
+                    "dry_run": True,
+                }
+            )
+        }
+    ]
+}
+
+response = requests.post(LAMBDA_URL, json=payload)
+
+print("Status code:", response.status_code)
+print("Response:")
+print(response.text)
diff --git a/applications/modelling_e2e/modelling_e2e_trigger_body.py b/applications/modelling_e2e/modelling_e2e_trigger_body.py
new file mode 100644
index 000000000..f9c92513d
--- /dev/null
+++ b/applications/modelling_e2e/modelling_e2e_trigger_body.py
@@ -0,0 +1,13 @@
+from pydantic import BaseModel, ConfigDict
+
+
+class ModellingE2ETriggerBody(BaseModel):
+    model_config = ConfigDict(extra="allow")
+
+    property_ids: list[int]
+    portfolio_id: int
+    scenario_id: int
+    refetch_solar: bool = True
+    refetch_epc: bool = True
+    repredict_epc: bool = True
+    dry_run: bool = False
diff --git a/applications/modelling_e2e/requirements.txt b/applications/modelling_e2e/requirements.txt
new file mode 100644
index 000000000..bac381847
--- /dev/null
+++ b/applications/modelling_e2e/requirements.txt
@@ -0,0 +1,11 @@
+awslambdaric
+boto3
+numpy==2.1.2
+pandas==2.2.2
+pyarrow==17.0.0
+httpx
+requests
+pydantic
+sqlalchemy==2.0.36
+sqlmodel
+psycopg2-binary==2.9.10
diff --git a/backend/documents_parser/tests/fixtures/Summary_000565_case50.pdf b/backend/documents_parser/tests/fixtures/Summary_000565_case50.pdf
new file mode 100644
index 000000000..ab23b9983
Binary files /dev/null and b/backend/documents_parser/tests/fixtures/Summary_000565_case50.pdf differ
diff --git a/backend/documents_parser/tests/fixtures/Summary_000565_case52.pdf b/backend/documents_parser/tests/fixtures/Summary_000565_case52.pdf
new file mode 100644
index 000000000..82d1891f8
Binary files /dev/null and b/backend/documents_parser/tests/fixtures/Summary_000565_case52.pdf differ
diff --git a/backend/documents_parser/tests/fixtures/Summary_001431_case45.pdf b/backend/documents_parser/tests/fixtures/Summary_001431_case45.pdf
new file mode 100644
index 000000000..48a5273e2
Binary files /dev/null and b/backend/documents_parser/tests/fixtures/Summary_001431_case45.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.0/uprn_68151071/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.0/uprn_68151071/elmhurst_summary.pdf
new file mode 100644
index 000000000..f30539c7f
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.0/uprn_68151071/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.0/uprn_68151071/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.0/uprn_68151071/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..ed80445d8
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.0/uprn_68151071/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.1/uprn_10010215568/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.1/uprn_10010215568/elmhurst_summary.pdf
new file mode 100644
index 000000000..0f61a1498
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.1/uprn_10010215568/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.1/uprn_10010215568/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.1/uprn_10010215568/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..d3c0c8f80
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-17.1/uprn_10010215568/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-18.0/uprn_10022893721/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-18.0/uprn_10022893721/elmhurst_summary.pdf
new file mode 100644
index 000000000..8b4bdb29d
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-18.0/uprn_10022893721/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-18.0/uprn_10022893721/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-18.0/uprn_10022893721/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..2a7cab925
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-18.0/uprn_10022893721/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_100020665611/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_100020665611/elmhurst_summary.pdf
new file mode 100644
index 000000000..9a8b300bc
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_100020665611/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_100020665611/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_100020665611/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..4926b8a4b
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_100020665611/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_10090844932/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_10090844932/elmhurst_summary.pdf
new file mode 100644
index 000000000..e6335fd0f
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_10090844932/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_10090844932/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_10090844932/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..0effc7b72
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_10090844932/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/elmhurst_summary.pdf
new file mode 100644
index 000000000..56569fde6
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..eb7b60b6f
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/epc.json b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/epc.json
new file mode 100644
index 000000000..343215d15
--- /dev/null
+++ b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-20.0.0/uprn_22086693/epc.json
@@ -0,0 +1,438 @@
+{
+  "uprn": 22086693,
+  "roofs": [
+    {
+      "description": {
+        "value": "Pitched, 200 mm loft insulation",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    },
+    {
+      "description": {
+        "value": "Flat, insulated (assumed)",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 3,
+      "environmental_efficiency_rating": 3
+    }
+  ],
+  "walls": [
+    {
+      "description": {
+        "value": "Cavity wall, as built, no insulation (assumed)",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 2,
+      "environmental_efficiency_rating": 2
+    },
+    {
+      "description": {
+        "value": "Cavity wall, as built, insulated (assumed)",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "floors": [
+    {
+      "description": {
+        "value": "Suspended, no insulation (assumed)",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 0,
+      "environmental_efficiency_rating": 0
+    },
+    {
+      "description": {
+        "value": "Solid, no insulation (assumed)",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 0,
+      "environmental_efficiency_rating": 0
+    }
+  ],
+  "status": "entered",
+  "tenure": 2,
+  "window": {
+    "description": {
+      "value": "Fully double glazed",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 3,
+    "environmental_efficiency_rating": 3
+  },
+  "addendum": {
+    "addendum_numbers": [
+      8
+    ],
+    "cavity_fill_recommended": "true"
+  },
+  "lighting": {
+    "description": {
+      "value": "Low energy lighting in all fixed outlets",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 5,
+    "environmental_efficiency_rating": 5
+  },
+  "postcode": "BN2 9ZN",
+  "hot_water": {
+    "description": {
+      "value": "From main system",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 4,
+    "environmental_efficiency_rating": 4
+  },
+  "post_town": "BRIGHTON",
+  "built_form": 2,
+  "created_at": "2022-03-22 14:09:56",
+  "door_count": 1,
+  "glazed_area": 1,
+  "glazing_gap": "16+",
+  "region_code": 14,
+  "report_type": 2,
+  "sap_heating": {
+    "cylinder_size": 1,
+    "water_heating_code": 901,
+    "water_heating_fuel": 26,
+    "instantaneous_wwhrs": {
+      "rooms_with_bath_and_or_shower": 1,
+      "rooms_with_mixer_shower_no_bath": 0,
+      "rooms_with_bath_and_mixer_shower": 0
+    },
+    "secondary_fuel_type": 29,
+    "main_heating_details": [
+      {
+        "has_fghrs": "N",
+        "main_fuel_type": 26,
+        "boiler_flue_type": 2,
+        "fan_flue_present": "Y",
+        "heat_emitter_type": 1,
+        "emitter_temperature": 0,
+        "main_heating_number": 1,
+        "main_heating_control": 2106,
+        "main_heating_category": 2,
+        "main_heating_fraction": 1,
+        "sap_main_heating_code": 113,
+        "central_heating_pump_age": 0,
+        "main_heating_data_source": 2
+      }
+    ],
+    "immersion_heating_type": "NA",
+    "secondary_heating_type": 691,
+    "has_fixed_air_conditioning": "false"
+  },
+  "sap_version": 9.94,
+  "schema_type": "RdSAP-Schema-20.0.0",
+  "uprn_source": "Energy Assessor",
+  "country_code": "EAW",
+  "main_heating": [
+    {
+      "description": {
+        "value": "Boiler and radiators, mains gas",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "dwelling_type": {
+    "value": "Semi-detached house",
+    "language": "1"
+  },
+  "language_code": 1,
+  "property_type": 0,
+  "address_line_1": "30 Hallett Road",
+  "assessment_type": "RdSAP",
+  "completion_date": "2022-03-22",
+  "inspection_date": "2022-03-17",
+  "extensions_count": 1,
+  "measurement_type": 1,
+  "total_floor_area": 80,
+  "transaction_type": 8,
+  "conservatory_type": 1,
+  "heated_room_count": 4,
+  "pvc_window_frames": "true",
+  "registration_date": "2022-03-22",
+  "sap_energy_source": {
+    "mains_gas": "Y",
+    "meter_type": 1,
+    "photovoltaic_supply": [
+      [
+        {
+          "pitch": 2,
+          "peak_power": {
+            "value": 1.14,
+            "quantity": "kW"
+          },
+          "orientation": 5,
+          "overshading": 1,
+          "pv_connection": 2
+        }
+      ],
+      [
+        {
+          "pitch": 2,
+          "peak_power": {
+            "value": 1.14,
+            "quantity": "kW"
+          },
+          "orientation": 7,
+          "overshading": 1,
+          "pv_connection": 2
+        }
+      ]
+    ],
+    "wind_turbines_count": 0,
+    "wind_turbines_terrain_type": 2
+  },
+  "secondary_heating": {
+    "description": {
+      "value": "Room heaters, electric",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 0,
+    "environmental_efficiency_rating": 0
+  },
+  "lzc_energy_sources": [
+    11
+  ],
+  "sap_building_parts": [
+    {
+      "identifier": "Main Dwelling",
+      "wall_dry_lined": "N",
+      "wall_thickness": 280,
+      "floor_heat_loss": 7,
+      "roof_construction": 4,
+      "wall_construction": 4,
+      "building_part_number": 1,
+      "sap_floor_dimensions": [
+        {
+          "floor": 0,
+          "room_height": {
+            "value": 2.3,
+            "quantity": "metres"
+          },
+          "floor_insulation": 1,
+          "total_floor_area": {
+            "value": 36.86,
+            "quantity": "square metres"
+          },
+          "party_wall_length": {
+            "value": 6.8,
+            "quantity": "metres"
+          },
+          "floor_construction": 2,
+          "heat_loss_perimeter": {
+            "value": 13.4,
+            "quantity": "metres"
+          }
+        },
+        {
+          "floor": 1,
+          "room_height": {
+            "value": 2.3,
+            "quantity": "metres"
+          },
+          "total_floor_area": {
+            "value": 36.86,
+            "quantity": "square metres"
+          },
+          "party_wall_length": {
+            "value": 6.8,
+            "quantity": "metres"
+          },
+          "heat_loss_perimeter": {
+            "value": 17.4,
+            "quantity": "metres"
+          }
+        }
+      ],
+      "wall_insulation_type": 4,
+      "construction_age_band": "C",
+      "party_wall_construction": 0,
+      "wall_thickness_measured": "Y",
+      "roof_insulation_location": 2,
+      "roof_insulation_thickness": "200mm",
+      "wall_insulation_thickness": "NI",
+      "floor_insulation_thickness": "NI"
+    },
+    {
+      "identifier": "Extension",
+      "wall_dry_lined": "N",
+      "floor_heat_loss": 7,
+      "roof_construction": 1,
+      "wall_construction": 4,
+      "building_part_number": 2,
+      "sap_floor_dimensions": [
+        {
+          "floor": 0,
+          "room_height": {
+            "value": 2.3,
+            "quantity": "metres"
+          },
+          "floor_insulation": 1,
+          "total_floor_area": {
+            "value": 6,
+            "quantity": "square metres"
+          },
+          "party_wall_length": 0,
+          "floor_construction": 1,
+          "heat_loss_perimeter": {
+            "value": 7,
+            "quantity": "metres"
+          }
+        }
+      ],
+      "wall_insulation_type": 4,
+      "construction_age_band": "H",
+      "party_wall_construction": 0,
+      "wall_thickness_measured": "N",
+      "roof_insulation_location": 6,
+      "wall_insulation_thickness": "NI",
+      "floor_insulation_thickness": "NI",
+      "flat_roof_insulation_thickness": "AB"
+    }
+  ],
+  "low_energy_lighting": 100,
+  "solar_water_heating": "N",
+  "habitable_room_count": 4,
+  "heating_cost_current": {
+    "value": 710,
+    "currency": "GBP"
+  },
+  "insulated_door_count": 0,
+  "co2_emissions_current": 2.4,
+  "energy_rating_average": 60,
+  "energy_rating_current": 72,
+  "lighting_cost_current": {
+    "value": 74,
+    "currency": "GBP"
+  },
+  "main_heating_controls": [
+    {
+      "description": {
+        "value": "Programmer, room thermostat and TRVs",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "multiple_glazing_type": 3,
+  "open_fireplaces_count": 0,
+  "has_hot_water_cylinder": "false",
+  "heating_cost_potential": {
+    "value": 548,
+    "currency": "GBP"
+  },
+  "hot_water_cost_current": {
+    "value": 95,
+    "currency": "GBP"
+  },
+  "mechanical_ventilation": 0,
+  "percent_draughtproofed": 100,
+  "suggested_improvements": [
+    {
+      "sequence": 1,
+      "typical_saving": {
+        "value": 112,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00a3500 - \u00a31,500",
+      "improvement_type": "B",
+      "improvement_details": {
+        "improvement_number": 6
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 77,
+      "environmental_impact_rating": 75
+    },
+    {
+      "sequence": 2,
+      "typical_saving": {
+        "value": 49,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00a3800 - \u00a31,200",
+      "improvement_type": "W1",
+      "improvement_details": {
+        "improvement_number": 57
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 79,
+      "environmental_impact_rating": 78
+    },
+    {
+      "sequence": 3,
+      "typical_saving": {
+        "value": 30,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00a34,000 - \u00a36,000",
+      "improvement_type": "N",
+      "improvement_details": {
+        "improvement_number": 19
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 81,
+      "environmental_impact_rating": 80
+    }
+  ],
+  "co2_emissions_potential": 1.5,
+  "energy_rating_potential": 81,
+  "lighting_cost_potential": {
+    "value": 74,
+    "currency": "GBP"
+  },
+  "schema_version_original": "LIG-19.0",
+  "alternative_improvements": [
+    {
+      "improvement": {
+        "sequence": 1,
+        "typical_saving": {
+          "value": 59,
+          "currency": "GBP"
+        },
+        "improvement_type": "Q2",
+        "improvement_details": {
+          "improvement_number": 55
+        },
+        "improvement_category": 6,
+        "energy_performance_rating": 80,
+        "environmental_impact_rating": 78
+      }
+    }
+  ],
+  "hot_water_cost_potential": {
+    "value": 66,
+    "currency": "GBP"
+  },
+  "renewable_heat_incentive": {
+    "water_heating": 2107,
+    "impact_of_cavity_insulation": -1824,
+    "space_heating_existing_dwelling": 9574
+  },
+  "energy_consumption_current": 171,
+  "has_fixed_air_conditioning": "false",
+  "multiple_glazed_proportion": 100,
+  "calculation_software_version": "2.1.0.1",
+  "energy_consumption_potential": 103,
+  "environmental_impact_current": 69,
+  "fixed_lighting_outlets_count": 10,
+  "windows_transmission_details": {
+    "u_value": 2.6,
+    "data_source": 2,
+    "solar_transmittance": 0.76
+  },
+  "current_energy_efficiency_band": "C",
+  "environmental_impact_potential": 80,
+  "has_heated_separate_conservatory": "false",
+  "potential_energy_efficiency_band": "B",
+  "co2_emissions_current_per_floor_area": 30,
+  "low_energy_fixed_lighting_outlets_count": 10
+}
\ No newline at end of file
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-21.0.1/uprn_10023443426/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-21.0.1/uprn_10023443426/elmhurst_summary.pdf
new file mode 100644
index 000000000..5989896d7
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-21.0.1/uprn_10023443426/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-21.0.1/uprn_10023443426/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-21.0.1/uprn_10023443426/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..89d573246
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/RdSAP-Schema-21.0.1/uprn_10023443426/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/elmhurst_summary.pdf
new file mode 100644
index 000000000..eddc43149
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..b71391c8b
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/epc.json b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/epc.json
new file mode 100644
index 000000000..63dbcfab4
--- /dev/null
+++ b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.0/uprn_10070004512/epc.json
@@ -0,0 +1,281 @@
+{
+  "uprn": 10070004512,
+  "roofs": [
+    {
+      "description": "(another dwelling above)",
+      "energy_efficiency_rating": 0,
+      "environmental_efficiency_rating": 0
+    }
+  ],
+  "walls": [
+    {
+      "description": "Cavity wall, filled cavity",
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "floors": [
+    {
+      "description": "To external air, no insulation (assumed)",
+      "energy_efficiency_rating": 0,
+      "environmental_efficiency_rating": 0
+    }
+  ],
+  "status": "entered",
+  "windows": [
+    {
+      "description": "Fully double glazed",
+      "energy_efficiency_rating": 3,
+      "environmental_efficiency_rating": 3
+    }
+  ],
+  "lighting": {
+    "description": "Low energy lighting in all fixed outlets",
+    "energy_efficiency_rating": 5,
+    "environmental_efficiency_rating": 5
+  },
+  "postcode": "BR1 4QF",
+  "hot_water": {
+    "description": "Electric immersion, off-peak",
+    "energy_efficiency_rating": 3,
+    "environmental_efficiency_rating": 1
+  },
+  "post_town": "BROMLEY",
+  "created_at": "2012-04-20 10:59:22.000000",
+  "door_count": 1,
+  "glazed_area": 1,
+  "region_code": 14,
+  "report_type": 2,
+  "sap_heating": {
+    "wwhrs": {
+      "rooms_with_bath_and_or_shower": 1,
+      "rooms_with_mixer_shower_no_bath": 0,
+      "rooms_with_bath_and_mixer_shower": 0
+    },
+    "cylinder_size": 1,
+    "water_heating_code": 903,
+    "water_heating_fuel": 29,
+    "main_heating_details": [
+      {
+        "has_fghrs": "N",
+        "main_fuel_type": 29,
+        "heat_emitter_type": 0,
+        "main_heating_number": 1,
+        "main_heating_control": 2401,
+        "main_heating_category": 7,
+        "main_heating_fraction": 1,
+        "sap_main_heating_code": 402,
+        "main_heating_data_source": 2
+      }
+    ],
+    "immersion_heating_type": 1,
+    "has_fixed_air_conditioning": "false"
+  },
+  "sap_version": 9.91,
+  "schema_type": "SAP-Schema-16.0",
+  "uprn_source": "Energy Assessor",
+  "country_code": "EAW",
+  "main_heating": [
+    {
+      "description": "Electric storage heaters",
+      "energy_efficiency_rating": 3,
+      "environmental_efficiency_rating": 1
+    }
+  ],
+  "dwelling_type": "Ground-floor flat",
+  "language_code": 1,
+  "property_type": 2,
+  "address_line_1": "54a, Boyland Road",
+  "schema_version": "LIG-16.0",
+  "assessment_type": "RdSAP",
+  "completion_date": "2012-04-20",
+  "inspection_date": "2012-04-20",
+  "extensions_count": 0,
+  "measurement_type": 1,
+  "sap_flat_details": {
+    "level": 1,
+    "top_storey": "N",
+    "flat_location": 0,
+    "heat_loss_corridor": 0
+  },
+  "total_floor_area": 33,
+  "transaction_type": 3,
+  "conservatory_type": 1,
+  "heated_room_count": 2,
+  "registration_date": "2012-04-20",
+  "restricted_access": 1,
+  "sap_energy_source": {
+    "main_gas": "N",
+    "meter_type": 1,
+    "photovoltaic_supply": {
+      "percent_roof_area": 0
+    },
+    "wind_turbines_count": 0,
+    "wind_turbines_terrain_type": 1
+  },
+  "secondary_heating": {
+    "description": "Portable electric heaters (assumed)",
+    "energy_efficiency_rating": 0,
+    "environmental_efficiency_rating": 0
+  },
+  "sap_building_parts": [
+    {
+      "identifier": "Main Dwelling",
+      "wall_dry_lined": "N",
+      "floor_heat_loss": 1,
+      "roof_construction": 3,
+      "wall_construction": 4,
+      "building_part_number": 1,
+      "sap_floor_dimensions": [
+        {
+          "floor": 0,
+          "room_height": 2.42,
+          "floor_insulation": 1,
+          "total_floor_area": 33.24,
+          "floor_construction": 0,
+          "heat_loss_perimeter": 10.39
+        }
+      ],
+      "wall_insulation_type": 2,
+      "construction_age_band": "B",
+      "wall_thickness_measured": "N",
+      "roof_insulation_location": "ND",
+      "roof_insulation_thickness": "ND"
+    }
+  ],
+  "low_energy_lighting": 100,
+  "solar_water_heating": "N",
+  "bedf_revision_number": 321,
+  "habitable_room_count": 2,
+  "heating_cost_current": {
+    "value": 303,
+    "currency": "GBP"
+  },
+  "insulated_door_count": 0,
+  "co2_emissions_current": {
+    "value": 2.9,
+    "quantity": "tonnes per year"
+  },
+  "energy_rating_average": 60,
+  "energy_rating_current": 66,
+  "lighting_cost_current": {
+    "value": 23,
+    "currency": "GBP"
+  },
+  "main_heating_controls": [
+    {
+      "description": "Manual charge control",
+      "energy_efficiency_rating": 2,
+      "environmental_efficiency_rating": 2
+    }
+  ],
+  "multiple_glazing_type": 3,
+  "open_fireplaces_count": 0,
+  "has_hot_water_cylinder": "false",
+  "heating_cost_potential": {
+    "value": 190,
+    "currency": "GBP"
+  },
+  "hot_water_cost_current": {
+    "value": 106,
+    "currency": "GBP"
+  },
+  "mechanical_ventilation": 0,
+  "percent_draughtproofed": 100,
+  "suggested_improvements": [
+    {
+      "sequence": 1,
+      "typical_saving": {
+        "value": 86,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00a3800 - \u00a31,200",
+      "improvement_type": "W",
+      "improvement_details": {
+        "improvement_number": 47
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 73,
+      "environmental_impact_rating": 58
+    },
+    {
+      "sequence": 2,
+      "typical_saving": {
+        "value": 27,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00a3600 - \u00a3800",
+      "improvement_type": "L",
+      "improvement_details": {
+        "improvement_number": 25
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 75,
+      "environmental_impact_rating": 60
+    }
+  ],
+  "co2_emissions_potential": {
+    "value": 2.1,
+    "quantity": "tonnes per year"
+  },
+  "energy_rating_potential": 75,
+  "lighting_cost_potential": {
+    "value": 23,
+    "currency": "GBP"
+  },
+  "alternative_improvements": [
+    {
+      "sequence": 1,
+      "typical_saving": {
+        "value": 24,
+        "currency": "GBP"
+      },
+      "improvement_type": "J2",
+      "improvement_details": {
+        "improvement_number": 54
+      },
+      "improvement_category": 6,
+      "energy_performance_rating": 76,
+      "environmental_impact_rating": 93
+    },
+    {
+      "sequence": 2,
+      "typical_saving": {
+        "value": 84,
+        "currency": "GBP"
+      },
+      "improvement_type": "Z1",
+      "improvement_details": {
+        "improvement_number": 51
+      },
+      "improvement_category": 6,
+      "energy_performance_rating": 80,
+      "environmental_impact_rating": 81
+    }
+  ],
+  "hot_water_cost_potential": {
+    "value": 106,
+    "currency": "GBP"
+  },
+  "renewable_heat_incentive": {
+    "water_heating": 1434,
+    "space_heating_existing_dwelling": 4064
+  },
+  "seller_commission_report": "Y",
+  "energy_consumption_current": 497,
+  "has_fixed_air_conditioning": "false",
+  "multiple_glazed_proportion": 100,
+  "calculation_software_version": 4.1,
+  "energy_consumption_potential": 365,
+  "environmental_impact_current": 47,
+  "fixed_lighting_outlets_count": 5,
+  "current_energy_efficiency_band": "D",
+  "environmental_impact_potential": 60,
+  "has_heated_separate_conservatory": "false",
+  "potential_energy_efficiency_band": "C",
+  "co2_emissions_current_per_floor_area": {
+    "value": 88,
+    "quantity": "kg/m2 per year"
+  },
+  "low_energy_fixed_lighting_outlets_count": 5
+}
\ No newline at end of file
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_inputs.md b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_inputs.md
new file mode 100644
index 000000000..0cac0ccac
--- /dev/null
+++ b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_inputs.md
@@ -0,0 +1,98 @@
+# Elmhurst RdSAP inputs — UPRN 100021943298 (cert 0498-6963-7270-0822-1980, SAP-Schema-16.1)
+
+**Lodged SAP:** 72   **Our engine:** 76 (continuous ~75.x)   ← compare Elmhurst against the engine
+**Property:** Ground-floor FLAT, age band B (1900–1929), mains-gas combi + radiators, TFA 78 m²
+
+**Schema note:** SAP-Schema-16.1 is reduced-field (RdSAP-shaped) — mapped via the
+new `from_sap_schema_16_1` → `_normalize_sap_schema_16_x` → `from_rdsap_schema_17_1`.
+Descriptions + glazed-area band, no measured U-values, so engine and Elmhurst should
+both use RdSAP age-band/description U-values — expect TIGHTER agreement (the +4 over
+lodged is the reconciliation target).
+
+**Known divergences / gaps to watch:**
+- **Party wall:** 16.1 lodges no `party_wall_length`; normalizer defaults 0 → engine
+  models no party wall. For a ground-floor flat the side/party walls to other dwellings
+  are handled by Elmhurst's Flat position + corridor — keep party-wall length 0 and check
+  the worksheet party-wall line.
+- Age band B → Elmhurst on-screen band **B 1900-1929**.
+
+## Property Description
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Property Type | **Flat** | property_type 2 |
+| Built form | **End-Terrace** | built_form 3 |
+| Age band | **B 1900-1929** | construction_age_band B |
+| Storeys | 1 | ground-floor flat, single storey |
+| Habitable rooms | 3 | habitable_room_count 3 |
+
+## Flats
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Position of flat | **Ground Floor** | dwelling_type "Ground-floor flat" |
+| Floor | 0 | ground = storey 0 |
+| Corridor | None | all-exposed (no unheated corridor lodged) |
+
+## Dimensions
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Floor area (lowest) | 77.69 m² | floor 0 |
+| Room height | 2.65 m | room_height |
+| Heat-loss perimeter | 28.9 m | heat_loss_perimeter |
+| Party-wall length | **0** | 16.1 lodges none |
+
+## Walls
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Construction | **Solid Brick** | wall_construction 3 |
+| Insulation | **Internal** | wall_insulation_type 3 = internal insulation ("Solid brick, with internal insulation") |
+| Thickness | (as built) | wall_thickness_measured True |
+
+## Roofs
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Type | **Another dwelling above** | roof "(another dwelling above)" → no roof heat loss |
+
+## Floors
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Location / type | Ground floor / **Suspended** | "Suspended, no insulation (assumed)" |
+| Insulation | **As built** (none) | no insulation |
+
+## Openings
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Windows | **Double glazed**, total 11.544 m² (4 × 2.886, N/E/S/W) | glazed_area band 1, multiple_glazing_type 2 (double). Enter ONE combined "Double …" row of 11.544 m². |
+| Doors | **2, uninsulated** | door_count 2, insulated_door_count 0 |
+
+## Ventilation & Lighting
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Ventilation | Natural | no MV |
+| Extract fans / flues | 0 / 0 | none lodged |
+| Sheltered sides | 1 | sheltered_sides 1 |
+| Air Pressure Test | **Not available** (no test lodged) | clear any Blower Door |
+| Lighting | **100% low-energy** (6 of 6 outlets) | low_energy 6 / total 6 |
+
+## Space Heating
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Main heating | Mains gas **combi** + radiators | fuel 26, emitter 1, control 2106, fan flue, PCDB 10328, category 2, NO cylinder → BGW condensing combi cascade |
+| Secondary | None | secondary "None" |
+
+## Water Heating
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Water heating | From main (901), gas | water_heating from combi |
+| Hot water cylinder | **None** | has_hot_water_cylinder False (combi/instantaneous) |
+| Solar / WWHRS / FGHRS | None | — |
+
+## Fields to clear in Elmhurst (do NOT map)
+| Elmhurst field | Set to | Why absent |
+|---|---|---|
+| Conservatory | none | not lodged |
+| Air Pressure Test method | **Not available** | no test lodged (clear any prior Blower Door) |
+| Mechanical ventilation | off | natural ventilation |
+| Cylinder size/insulation | (gone — combi) | no cylinder |
+| Main Heating 2 / Secondary | none | single combi system |
+| PV / Wind / Hydro | none | none lodged |
+| Room-in-roof / extensions | blank | single building part, no RiR |
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_summary.pdf
new file mode 100644
index 000000000..5a9f33a00
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..3859e26c1
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/epc.json b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/epc.json
new file mode 100644
index 000000000..73fae830b
--- /dev/null
+++ b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.1/uprn_100021943298/epc.json
@@ -0,0 +1,232 @@
+{
+  "uprn": 100021943298,
+  "roofs": [
+    {
+      "description": "(another dwelling above)",
+      "energy_efficiency_rating": 0,
+      "environmental_efficiency_rating": 0
+    }
+  ],
+  "walls": [
+    {
+      "description": "Solid brick, with internal insulation",
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "floors": [
+    {
+      "description": "Suspended, no insulation (assumed)",
+      "energy_efficiency_rating": 0,
+      "environmental_efficiency_rating": 0
+    }
+  ],
+  "status": "entered",
+  "tenure": 2,
+  "windows": [
+    {
+      "description": "Fully double glazed",
+      "energy_efficiency_rating": 3,
+      "environmental_efficiency_rating": 3
+    }
+  ],
+  "lighting": {
+    "description": "Low energy lighting in all fixed outlets",
+    "energy_efficiency_rating": 5,
+    "environmental_efficiency_rating": 5
+  },
+  "postcode": "SE4 1YN",
+  "hot_water": {
+    "description": "From main system",
+    "energy_efficiency_rating": 4,
+    "environmental_efficiency_rating": 4
+  },
+  "post_town": "LONDON",
+  "built_form": 3,
+  "created_at": "2012-10-02 23:16:59.000000",
+  "door_count": 2,
+  "glazed_area": 1,
+  "region_code": 17,
+  "report_type": 2,
+  "sap_heating": {
+    "wwhrs": {
+      "rooms_with_bath_and_or_shower": 1,
+      "rooms_with_mixer_shower_no_bath": 0,
+      "rooms_with_bath_and_mixer_shower": 0
+    },
+    "cylinder_size": 1,
+    "water_heating_code": 901,
+    "water_heating_fuel": 26,
+    "main_heating_details": [
+      {
+        "has_fghrs": "N",
+        "main_fuel_type": 26,
+        "boiler_flue_type": 2,
+        "fan_flue_present": "Y",
+        "heat_emitter_type": 1,
+        "boiler_index_number": 10328,
+        "main_heating_number": 1,
+        "main_heating_control": 2106,
+        "main_heating_category": 2,
+        "main_heating_fraction": 1,
+        "main_heating_data_source": 1
+      }
+    ],
+    "has_fixed_air_conditioning": "false"
+  },
+  "sap_version": 9.91,
+  "schema_type": "SAP-Schema-16.1",
+  "uprn_source": "Energy Assessor",
+  "country_code": "EAW",
+  "main_heating": [
+    {
+      "description": "Boiler and radiators, mains gas",
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "dwelling_type": "Ground-floor flat",
+  "language_code": 1,
+  "property_type": 2,
+  "address_line_1": "11a, Chalsey Road",
+  "schema_version": "LIG-16.1",
+  "assessment_type": "RdSAP",
+  "completion_date": "2012-10-02",
+  "inspection_date": "2012-10-01",
+  "extensions_count": 0,
+  "measurement_type": 1,
+  "sap_flat_details": {
+    "level": 1,
+    "top_storey": "N",
+    "flat_location": 0,
+    "heat_loss_corridor": 0
+  },
+  "total_floor_area": 78,
+  "transaction_type": 8,
+  "conservatory_type": 1,
+  "heated_room_count": 3,
+  "registration_date": "2012-10-02",
+  "restricted_access": 0,
+  "sap_energy_source": {
+    "main_gas": "Y",
+    "meter_type": 2,
+    "photovoltaic_supply": {
+      "percent_roof_area": 0
+    },
+    "wind_turbines_count": 0,
+    "wind_turbines_terrain_type": 2
+  },
+  "secondary_heating": {
+    "description": "None",
+    "energy_efficiency_rating": 0,
+    "environmental_efficiency_rating": 0
+  },
+  "sap_building_parts": [
+    {
+      "identifier": "Main Dwelling",
+      "wall_dry_lined": "N",
+      "wall_thickness": 300,
+      "floor_heat_loss": 7,
+      "roof_construction": 3,
+      "wall_construction": 3,
+      "building_part_number": 1,
+      "sap_floor_dimensions": [
+        {
+          "floor": 0,
+          "room_height": 2.65,
+          "floor_insulation": 1,
+          "total_floor_area": 77.69,
+          "floor_construction": 2,
+          "heat_loss_perimeter": 28.9
+        }
+      ],
+      "wall_insulation_type": 3,
+      "construction_age_band": "B",
+      "wall_thickness_measured": "Y",
+      "roof_insulation_location": "ND",
+      "roof_insulation_thickness": "ND",
+      "wall_insulation_thickness": "50mm"
+    }
+  ],
+  "low_energy_lighting": 100,
+  "solar_water_heating": "N",
+  "bedf_revision_number": 329,
+  "habitable_room_count": 3,
+  "heating_cost_current": {
+    "value": 421,
+    "currency": "GBP"
+  },
+  "insulated_door_count": 0,
+  "co2_emissions_current": 2.4,
+  "energy_rating_average": 60,
+  "energy_rating_current": 72,
+  "lighting_cost_current": {
+    "value": 46,
+    "currency": "GBP"
+  },
+  "main_heating_controls": [
+    {
+      "description": "Programmer, room thermostat and TRVs",
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "multiple_glazing_type": 1,
+  "open_fireplaces_count": 0,
+  "has_hot_water_cylinder": "false",
+  "heating_cost_potential": {
+    "value": 360,
+    "currency": "GBP"
+  },
+  "hot_water_cost_current": {
+    "value": 85,
+    "currency": "GBP"
+  },
+  "mechanical_ventilation": 0,
+  "percent_draughtproofed": 100,
+  "suggested_improvements": [
+    {
+      "sequence": 1,
+      "typical_saving": {
+        "value": 61,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00a3800 - \u00a31,200",
+      "improvement_type": "W",
+      "improvement_details": {
+        "improvement_number": 47
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 75,
+      "environmental_impact_rating": 77
+    }
+  ],
+  "co2_emissions_potential": 2.0,
+  "energy_rating_potential": 75,
+  "lighting_cost_potential": {
+    "value": 46,
+    "currency": "GBP"
+  },
+  "hot_water_cost_potential": {
+    "value": 85,
+    "currency": "GBP"
+  },
+  "renewable_heat_incentive": {
+    "water_heating": 2121,
+    "space_heating_existing_dwelling": 7355
+  },
+  "seller_commission_report": "Y",
+  "energy_consumption_current": 160,
+  "has_fixed_air_conditioning": "false",
+  "multiple_glazed_proportion": 100,
+  "calculation_software_version": 8.0,
+  "energy_consumption_potential": 137,
+  "environmental_impact_current": 72,
+  "fixed_lighting_outlets_count": 6,
+  "current_energy_efficiency_band": "C",
+  "environmental_impact_potential": 77,
+  "has_heated_separate_conservatory": "false",
+  "potential_energy_efficiency_band": "C",
+  "co2_emissions_current_per_floor_area": 31,
+  "low_energy_fixed_lighting_outlets_count": 6
+}
\ No newline at end of file
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100020933699/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100020933699/elmhurst_summary.pdf
new file mode 100644
index 000000000..3b462c950
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100020933699/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100020933699/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100020933699/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..5a9132dd4
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100020933699/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100021985993/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100021985993/elmhurst_summary.pdf
new file mode 100644
index 000000000..b9f25bb40
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100021985993/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100021985993/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100021985993/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..53e01bf96
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100021985993/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100090182288/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100090182288/elmhurst_summary.pdf
new file mode 100644
index 000000000..4e192c05c
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100090182288/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100090182288/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100090182288/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..65951fc43
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.2/uprn_100090182288/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/elmhurst_summary.pdf
new file mode 100644
index 000000000..805c6c253
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..63e07aca5
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/epc.json b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/epc.json
new file mode 100644
index 000000000..1cd635363
--- /dev/null
+++ b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_100061905751/epc.json
@@ -0,0 +1,335 @@
+{
+  "uprn": 100061905751,
+  "roofs": [
+    {
+      "description": "Pitched, 100 mm loft insulation",
+      "energy_efficiency_rating": 3,
+      "environmental_efficiency_rating": 3
+    }
+  ],
+  "walls": [
+    {
+      "description": "Cavity wall, as built, no insulation (assumed)",
+      "energy_efficiency_rating": 1,
+      "environmental_efficiency_rating": 1
+    }
+  ],
+  "floors": [
+    {
+      "description": "Suspended, no insulation (assumed)",
+      "energy_efficiency_rating": 0,
+      "environmental_efficiency_rating": 0
+    }
+  ],
+  "status": "entered",
+  "tenure": 1,
+  "windows": [
+    {
+      "description": "Fully double glazed",
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "addendum": {
+    "cavity_fill_recommended": "true"
+  },
+  "lighting": {
+    "description": "Low energy lighting in 17% of fixed outlets",
+    "energy_efficiency_rating": 2,
+    "environmental_efficiency_rating": 2
+  },
+  "postcode": "BN11 4EP",
+  "hot_water": {
+    "description": "From main system",
+    "energy_efficiency_rating": 4,
+    "environmental_efficiency_rating": 4
+  },
+  "post_town": "WORTHING",
+  "built_form": 3,
+  "created_at": "2014-07-24 12:49:23",
+  "door_count": 2,
+  "glazed_area": 1,
+  "region_code": 14,
+  "report_type": 2,
+  "sap_heating": {
+    "wwhrs": {
+      "rooms_with_bath_and_or_shower": 1,
+      "rooms_with_mixer_shower_no_bath": 0,
+      "rooms_with_bath_and_mixer_shower": 1
+    },
+    "cylinder_size": 1,
+    "water_heating_code": 901,
+    "water_heating_fuel": 26,
+    "secondary_fuel_type": 15,
+    "main_heating_details": [
+      {
+        "has_fghrs": "N",
+        "main_fuel_type": 26,
+        "boiler_flue_type": 2,
+        "fan_flue_present": "Y",
+        "heat_emitter_type": 1,
+        "boiler_index_number": 16366,
+        "main_heating_number": 1,
+        "main_heating_control": 2106,
+        "main_heating_category": 2,
+        "main_heating_fraction": 1,
+        "main_heating_data_source": 1
+      }
+    ],
+    "secondary_heating_type": 631,
+    "has_fixed_air_conditioning": "false"
+  },
+  "sap_version": 9.91,
+  "schema_type": "SAP-Schema-16.3",
+  "uprn_source": "Energy Assessor",
+  "country_code": "EAW",
+  "main_heating": [
+    {
+      "description": "Boiler and radiators, mains gas",
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "dwelling_type": "End-terrace house",
+  "language_code": 1,
+  "property_type": 0,
+  "address_line_1": "77, Tarring Road",
+  "schema_version": "LIG-16.1",
+  "assessment_type": "RdSAP",
+  "completion_date": "2014-07-24",
+  "inspection_date": "2014-07-22",
+  "extensions_count": 1,
+  "measurement_type": 1,
+  "total_floor_area": 139,
+  "transaction_type": 5,
+  "conservatory_type": 1,
+  "heated_room_count": 5,
+  "registration_date": "2014-04-25",
+  "restricted_access": 0,
+  "sap_energy_source": {
+    "main_gas": "Y",
+    "meter_type": 2,
+    "photovoltaic_supply": [
+      [
+        {
+          "pitch": 3,
+          "peak_power": 1.25,
+          "orientation": 5,
+          "overshading": 1
+        }
+      ],
+      [
+        {
+          "pitch": 3,
+          "peak_power": 0.5,
+          "orientation": 3,
+          "overshading": 1
+        }
+      ],
+      [
+        {
+          "pitch": 3,
+          "peak_power": 0.5,
+          "orientation": 7,
+          "overshading": 2
+        }
+      ]
+    ],
+    "wind_turbines_count": 0,
+    "wind_turbines_terrain_type": 2
+  },
+  "secondary_heating": {
+    "description": "Room heaters, smokeless fuel",
+    "energy_efficiency_rating": 0,
+    "environmental_efficiency_rating": 0
+  },
+  "lzc_energy_sources": [
+    11
+  ],
+  "sap_building_parts": [
+    {
+      "identifier": "Main Dwelling",
+      "wall_dry_lined": "N",
+      "wall_thickness": 300,
+      "floor_heat_loss": 7,
+      "roof_construction": 4,
+      "wall_construction": 4,
+      "building_part_number": 1,
+      "sap_floor_dimensions": [
+        {
+          "floor": 0,
+          "room_height": 2.7,
+          "floor_insulation": 1,
+          "total_floor_area": 67.49,
+          "floor_construction": 2,
+          "heat_loss_perimeter": 27.69
+        },
+        {
+          "floor": 1,
+          "room_height": 2.47,
+          "total_floor_area": 67.49,
+          "heat_loss_perimeter": 31.38
+        }
+      ],
+      "wall_insulation_type": 4,
+      "construction_age_band": "A",
+      "wall_thickness_measured": "Y",
+      "roof_insulation_location": 2,
+      "roof_insulation_thickness": "100mm"
+    },
+    {
+      "identifier": "Extension",
+      "wall_dry_lined": "N",
+      "wall_thickness": 280,
+      "floor_heat_loss": 7,
+      "roof_construction": 5,
+      "wall_construction": 4,
+      "building_part_number": 2,
+      "sap_floor_dimensions": [
+        {
+          "floor": 0,
+          "room_height": 2.45,
+          "floor_insulation": 1,
+          "total_floor_area": 3.84,
+          "floor_construction": 1,
+          "heat_loss_perimeter": 5.77
+        }
+      ],
+      "wall_insulation_type": 4,
+      "construction_age_band": "B",
+      "wall_thickness_measured": "Y",
+      "roof_insulation_location": 4,
+      "roof_insulation_thickness": "NI"
+    }
+  ],
+  "low_energy_lighting": 17,
+  "solar_water_heating": "N",
+  "bedf_revision_number": 361,
+  "habitable_room_count": 5,
+  "heating_cost_current": {
+    "value": 1430,
+    "currency": "GBP"
+  },
+  "co2_emissions_current": 7.2,
+  "energy_rating_average": 60,
+  "energy_rating_current": 57,
+  "lighting_cost_current": {
+    "value": 132,
+    "currency": "GBP"
+  },
+  "main_heating_controls": [
+    {
+      "description": "Programmer, room thermostat and TRVs",
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "multiple_glazing_type": 2,
+  "open_fireplaces_count": 2,
+  "has_hot_water_cylinder": "false",
+  "heating_cost_potential": {
+    "value": 881,
+    "currency": "GBP"
+  },
+  "hot_water_cost_current": {
+    "value": 105,
+    "currency": "GBP"
+  },
+  "mechanical_ventilation": 0,
+  "percent_draughtproofed": 100,
+  "suggested_improvements": [
+    {
+      "sequence": 1,
+      "typical_saving": {
+        "value": 308,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00c2\u00a3500 - \u00c2\u00a31,500",
+      "improvement_type": "B",
+      "improvement_details": {
+        "improvement_number": 6
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 71,
+      "environmental_impact_rating": 63
+    },
+    {
+      "sequence": 2,
+      "typical_saving": {
+        "value": 73,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00c2\u00a3800 - \u00c2\u00a31,200",
+      "improvement_type": "W",
+      "improvement_details": {
+        "improvement_number": 47
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 74,
+      "environmental_impact_rating": 66
+    },
+    {
+      "sequence": 3,
+      "typical_saving": {
+        "value": 49,
+        "currency": "GBP"
+      },
+      "indicative_cost": "\u00c2\u00a375",
+      "improvement_type": "E",
+      "improvement_details": {
+        "improvement_number": 35
+      },
+      "improvement_category": 5,
+      "energy_performance_rating": 75,
+      "environmental_impact_rating": 67
+    }
+  ],
+  "co2_emissions_potential": 4.0,
+  "energy_rating_potential": 75,
+  "lighting_cost_potential": {
+    "value": 72,
+    "currency": "GBP"
+  },
+  "alternative_improvements": [
+    {
+      "improvement": {
+        "sequence": 1,
+        "typical_saving": {
+          "value": 67,
+          "currency": "GBP"
+        },
+        "improvement_type": "Q2",
+        "improvement_details": {
+          "improvement_number": 55
+        },
+        "improvement_category": 6,
+        "energy_performance_rating": 73,
+        "environmental_impact_rating": 65
+      }
+    }
+  ],
+  "hot_water_cost_potential": {
+    "value": 105,
+    "currency": "GBP"
+  },
+  "renewable_heat_incentive": {
+    "water_heating": 2315,
+    "impact_of_loft_insulation": -869,
+    "impact_of_cavity_insulation": -8658,
+    "space_heating_existing_dwelling": 23216
+  },
+  "seller_commission_report": "Y",
+  "energy_consumption_current": 230,
+  "has_fixed_air_conditioning": "false",
+  "multiple_glazed_proportion": 100,
+  "calculation_software_version": "9.1.2",
+  "energy_consumption_potential": 125,
+  "environmental_impact_current": 45,
+  "fixed_lighting_outlets_count": 18,
+  "current_energy_efficiency_band": "D",
+  "environmental_impact_potential": 67,
+  "has_heated_separate_conservatory": "false",
+  "potential_energy_efficiency_band": "C",
+  "co2_emissions_current_per_floor_area": 52,
+  "low_energy_fixed_lighting_outlets_count": 3
+}
\ No newline at end of file
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_44012843/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_44012843/elmhurst_summary.pdf
new file mode 100644
index 000000000..ef058fe39
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_44012843/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_44012843/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_44012843/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..2569c7760
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-16.3/uprn_44012843/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444320/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444320/elmhurst_summary.pdf
new file mode 100644
index 000000000..c9d9ef3bc
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444320/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444320/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444320/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..1eedd35e8
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444320/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444324/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444324/elmhurst_summary.pdf
new file mode 100644
index 000000000..f774bcc95
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444324/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444324/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444324/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..6c77d4421
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10023444324/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10090944225/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10090944225/elmhurst_summary.pdf
new file mode 100644
index 000000000..19b0640a4
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10090944225/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10090944225/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10090944225/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..dc155a2de
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.0/uprn_10090944225/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10091568921/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10091568921/elmhurst_summary.pdf
new file mode 100644
index 000000000..29011dd1e
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10091568921/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10091568921/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10091568921/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..fb3d7f9ec
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10091568921/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093115480/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093115480/elmhurst_summary.pdf
new file mode 100644
index 000000000..f1e387551
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093115480/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093115480/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093115480/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..dd214b03c
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093115480/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093116330/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093116330/elmhurst_summary.pdf
new file mode 100644
index 000000000..c830b3f9d
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093116330/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093116330/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093116330/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..b1bbad345
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093116330/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093412452/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093412452/elmhurst_summary.pdf
new file mode 100644
index 000000000..0cdfe5af5
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093412452/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093412452/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093412452/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..818e3b507
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093412452/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093718424/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093718424/elmhurst_summary.pdf
new file mode 100644
index 000000000..01f488b6a
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093718424/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093718424/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093718424/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..9e212df0a
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-17.1/uprn_10093718424/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_inputs.md b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_inputs.md
new file mode 100644
index 000000000..277618f65
--- /dev/null
+++ b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_inputs.md
@@ -0,0 +1,96 @@
+# Elmhurst RdSAP inputs — UPRN 10096028301 (cert 0390-3321-6060-2405-7985, SAP-Schema-19.1.0)
+
+**Lodged SAP:** 85   **Our engine:** 82   ← compare Elmhurst against the engine
+**Property:** Ground-floor FLAT, age band M (2023 onwards), mains-gas combi + radiators, decentralised MEV, TFA 73 m²
+
+**Schema note:** SAP-Schema-19.1.0 is FULL SAP (measured U-values, measured air
+permeability) — mapped via the new `from_sap_schema_19_1_0` (parses with the 17.1
+dataclass, delegates to `from_sap_schema_17_1`). Near-twin of the worked-ref flat
+10092973954 (same PCDB combi 17929, MEV, AP50). Expect the documented full-SAP→RdSAP
+residual: the engine uses the cert's MEASURED U (wall 0.24 / floor 0.13 — WORSE than
+RdSAP band-M defaults), so here the engine *under*-rates vs RdSAP (eng 82 < lodged 85).
+
+**Known divergences / gaps to watch:**
+- **MEV (decentralised, EXTRACT_OR_PIV_OUTSIDE):** engine prices it as extract loss,
+  not heat recovery — the documented MVHR gap. Omit/parallel on both sides.
+- **Measured vs RdSAP U:** Elmhurst can't set the U-value-known override → it uses band-M
+  age defaults (better than the cert's measured 0.24 wall). Note the divergence; don't tune.
+- Age band M → Elmhurst on-screen band **M 2023 onwards**.
+
+## Property Description
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Property Type | **Flat** | ground-floor flat |
+| Built form | **Detached** (block) | built_form not lodged (full SAP) — use Detached as for worked-ref flat |
+| Age band | **M 2023 onwards** | construction_age_band M |
+| Storeys | 1 | ground-floor flat |
+| Habitable rooms | 3 | habitable_room_count 3 |
+
+## Flats
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Position of flat | **Ground Floor** | dwelling_type ground-floor flat |
+| Floor | 0 | ground = storey 0 |
+| Corridor | None | all-exposed |
+
+## Dimensions
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Floor area (lowest) | 72.99 m² | floor 0 |
+| Room height | 2.36 m | room_height |
+| Heat-loss perimeter | 36.04 m | heat_loss_perimeter |
+| Party-wall length | **0** | not lodged |
+
+## Walls
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Construction | **Cavity** | wall_construction 4 |
+| Insulation | **As Built** | measured U 0.24 W/m²K (U-known override not settable → accept band-M default; note divergence) |
+
+## Roofs
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Type | **Another dwelling above** | roof "(other premises above)" → no roof heat loss |
+
+## Floors
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Location / type | Ground floor / Solid | measured U 0.13 (accept band-M default) |
+| Insulation | As built | — |
+
+## Openings
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Windows | total ~11.37 m² (4 windows), U 1.3, g 0.46 | glazing_type 7. Enter ONE combined band row ("Double … 2022" ≈ U1.4/g0.72) of 11.37 m² — `…known data` demands per-row frame-factor/source and fails validation. |
+| Doors | **1, solid (uninsulated)** U 1.2 | sap_opening_types: 1 Solid Door, U 1.2 |
+
+## Ventilation & Lighting
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Ventilation | **Mechanical — decentralised MEV** (extract) | ventilation EXTRACT_OR_PIV_OUTSIDE. 🚩 engine models as extract loss not heat recovery. |
+| Air Pressure Test | **Blower Door**, result **3.5** (AP50) | air_tightness "AP50 = 3.5 as tested"; Elmhurst (18)=AP50/20. Needs a certificate number to pass Recommendations validation. |
+| Sheltered sides | (from built form) | — |
+| Lighting | per cert low-energy % | sap_lighting |
+
+## Space Heating
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Main heating | Mains gas **combi** + radiators | fuel mains gas, PCDB 17929 (Vaillant combi), control 2110, category 2, NO cylinder → BGW condensing combi cascade |
+| Flue | Balanced (room-sealed) | fan_flue_present; balanced flue |
+| Secondary | None | — |
+
+## Water Heating
+| Elmhurst field | Value | Notes |
+|---|---|---|
+| Water heating | From main (901), gas | combi |
+| Hot water cylinder | **None** | has_hot_water_cylinder False (combi) |
+| Solar / WWHRS / FGHRS | None | — |
+
+## Fields to clear in Elmhurst (do NOT map)
+| Elmhurst field | Set to | Why absent |
+|---|---|---|
+| Conservatory | none | not lodged |
+| Cylinder size/insulation | (gone — combi) | no cylinder |
+| Main Heating 2 / Secondary | none | single combi system |
+| PV / Wind / Hydro / WWHRS / FGHRS | none | none lodged |
+| Room-in-roof / extensions | blank | single building part |
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_summary.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_summary.pdf
new file mode 100644
index 000000000..859d336e7
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_summary.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_worksheet.pdf b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_worksheet.pdf
new file mode 100644
index 000000000..c8cb18dc0
Binary files /dev/null and b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/elmhurst_worksheet.pdf differ
diff --git a/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/epc.json b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/epc.json
new file mode 100644
index 000000000..447a578ab
--- /dev/null
+++ b/backend/epc_api/json_samples/real_life_examples/SAP-Schema-19.1.0/uprn_10096028301/epc.json
@@ -0,0 +1,456 @@
+{
+  "der": 12.66,
+  "ter": 13.84,
+  "dfee": 36.3,
+  "dper": 69.44,
+  "tfee": 38.6,
+  "tper": 72.99,
+  "uprn": 10096028301,
+  "roofs": [
+    {
+      "description": {
+        "value": "(other premises above)",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 0,
+      "environmental_efficiency_rating": 0
+    }
+  ],
+  "walls": [
+    {
+      "description": {
+        "value": "Average thermal transmittance 0.24 W/m\u00b2K",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 5,
+      "environmental_efficiency_rating": 5
+    }
+  ],
+  "floors": [
+    {
+      "description": {
+        "value": "Average thermal transmittance 0.13 W/m\u00b2K",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 5,
+      "environmental_efficiency_rating": 5
+    }
+  ],
+  "status": "entered",
+  "tenure": "ND",
+  "windows": {
+    "description": {
+      "value": "High performance glazing",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 4,
+    "environmental_efficiency_rating": 4
+  },
+  "lighting": {
+    "description": {
+      "value": "Good lighting efficiency",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 4,
+    "environmental_efficiency_rating": 4
+  },
+  "postcode": "CT5 1TN",
+  "data_type": 2,
+  "hot_water": {
+    "description": {
+      "value": "From main system, waste water heat recovery",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 5,
+    "environmental_efficiency_rating": 5
+  },
+  "post_town": "Whitstable",
+  "built_form": 1,
+  "created_at": "2025-06-09 10:49:27",
+  "living_area": 26.89,
+  "orientation": 3,
+  "region_code": 14,
+  "report_type": 3,
+  "sap_heating": {
+    "number_baths": 1,
+    "thermal_store": 1,
+    "shower_outlets": [
+      {
+        "shower_wwhrs": 2,
+        "shower_flow_rate": 9,
+        "shower_outlet_type": 3
+      }
+    ],
+    "water_fuel_type": 1,
+    "water_heating_code": 901,
+    "instantaneous_wwhrs": {
+      "wwhrs_index_number1": 80137
+    },
+    "main_heating_details": [
+      {
+        "has_fghrs": "false",
+        "main_fuel_type": 1,
+        "heat_emitter_type": 1,
+        "is_flue_fan_present": "true",
+        "main_heating_number": 1,
+        "is_condensing_boiler": "true",
+        "main_heating_control": 2110,
+        "is_interlocked_system": "true",
+        "main_heating_category": 2,
+        "main_heating_fraction": 1,
+        "gas_or_oil_boiler_type": 2,
+        "main_heating_flue_type": 2,
+        "central_heating_pump_age": 2,
+        "main_heating_data_source": 1,
+        "main_heating_index_number": 17929,
+        "has_separate_delayed_start": "true",
+        "is_oil_pump_in_heated_space": "false",
+        "is_main_heating_hetas_approved": "false",
+        "is_central_heating_pump_in_heated_space": "true"
+      }
+    ],
+    "has_hot_water_cylinder": "false",
+    "has_cylinder_thermostat": "false",
+    "has_fixed_air_conditioning": "false",
+    "secondary_heating_category": 1,
+    "is_immersion_for_summer_use": "false",
+    "is_hot_water_separately_timed": "false",
+    "is_heat_pump_assisted_by_immersion": "false"
+  },
+  "sap_version": 10.2,
+  "schema_type": "SAP-Schema-19.1.0",
+  "uprn_source": "Address Matched",
+  "country_code": "ENG",
+  "main_heating": [
+    {
+      "description": {
+        "value": "Boiler and radiators, mains gas",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 5,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "sap_lighting": [
+    [
+      {
+        "lighting_power": 9,
+        "lighting_outlets": 6,
+        "lighting_efficacy": 80
+      }
+    ]
+  ],
+  "terrain_type": 2,
+  "air_tightness": {
+    "description": {
+      "value": "Air permeability [AP50] = 3.5 m\u00b3/h.m\u00b2 (as tested)",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 4,
+    "environmental_efficiency_rating": 4
+  },
+  "dwelling_type": "Ground-floor flat",
+  "language_code": 1,
+  "property_type": 2,
+  "pv_connection": 1,
+  "address_line_1": "1 Ransome Way",
+  "assessment_date": "2025-06-09",
+  "assessment_type": "SAP",
+  "completion_date": "2025-06-09",
+  "inspection_date": "2025-06-09",
+  "sap_ventilation": {
+    "psv_count": 0,
+    "wall_type": 2,
+    "pressure_test": 1,
+    "wet_rooms_count": 2,
+    "air_permeability": 3.52,
+    "open_flues_count": 0,
+    "ventilation_type": 6,
+    "has_draught_lobby": "true",
+    "other_flues_count": 0,
+    "closed_flues_count": 0,
+    "extract_fans_count": 0,
+    "boilers_flues_count": 0,
+    "open_chimneys_count": 0,
+    "sheltered_sides_count": 2,
+    "blocked_chimneys_count": 0,
+    "kitchen_duct_fans_count": 0,
+    "kitchen_room_fans_count": 0,
+    "kitchen_wall_fans_count": 1,
+    "flueless_gas_fires_count": 0,
+    "mechanical_vent_duct_type": 1,
+    "non_kitchen_duct_fans_count": 0,
+    "non_kitchen_room_fans_count": 0,
+    "non_kitchen_wall_fans_count": 1,
+    "mechanical_ventilation_data_source": 1,
+    "mechanical_vent_system_index_number": 500769,
+    "is_mechanical_vent_approved_installer_scheme": "false"
+  },
+  "design_water_use": 1,
+  "sap_data_version": 10.2,
+  "sap_flat_details": {
+    "level": 1,
+    "storeys": 3
+  },
+  "total_floor_area": 73,
+  "transaction_type": 6,
+  "cold_water_source": 1,
+  "conservatory_type": 1,
+  "registration_date": "2025-06-09",
+  "sap_energy_source": {
+    "pv_arrays": [
+      {
+        "pitch": 3,
+        "peak_power": 0.38,
+        "orientation": 5,
+        "overshading": 1
+      }
+    ],
+    "electricity_tariff": 1
+  },
+  "sap_opening_types": [
+    {
+      "name": "Solid Door",
+      "type": 1,
+      "u_value": 1.2,
+      "data_source": 2,
+      "glazing_type": 1,
+      "isargonfilled": "false"
+    },
+    {
+      "name": "Windows",
+      "type": 4,
+      "u_value": 1.3,
+      "data_source": 4,
+      "frame_factor": 1.0,
+      "glazing_type": 7,
+      "isargonfilled": "false",
+      "solar_transmittance": 0.46
+    }
+  ],
+  "secondary_heating": {
+    "description": {
+      "value": "None",
+      "language": "1"
+    },
+    "energy_efficiency_rating": 0,
+    "environmental_efficiency_rating": 0
+  },
+  "lowest_storey_area": 72.99,
+  "lzc_energy_sources": [
+    11
+  ],
+  "sap_building_parts": [
+    {
+      "sap_roofs": [
+        {
+          "name": "Party roof 1",
+          "u_value": 0,
+          "roof_type": 4,
+          "kappa_value": 30,
+          "total_roof_area": 72.99
+        }
+      ],
+      "sap_walls": [
+        {
+          "name": "Walls (1)",
+          "u_value": 0.24,
+          "wall_type": 2,
+          "kappa_value": 60,
+          "total_wall_area": 68.76,
+          "is_curtain_walling": "false"
+        },
+        {
+          "name": "Walls (2)",
+          "u_value": 0.26,
+          "wall_type": 3,
+          "kappa_value": 110,
+          "total_wall_area": 16.3,
+          "is_curtain_walling": "false"
+        },
+        {
+          "name": "Internal Wall (1)",
+          "u_value": 0,
+          "wall_type": 5,
+          "kappa_value": 9,
+          "total_wall_area": 114.18,
+          "is_curtain_walling": "false"
+        }
+      ],
+      "sap_openings": [
+        {
+          "name": "Front Door",
+          "type": "Solid Door",
+          "width": 2.15,
+          "height": 1,
+          "location": "Walls (1)",
+          "orientation": 3
+        },
+        {
+          "name": "Front Windows",
+          "type": "Windows",
+          "width": 4.77,
+          "height": 1,
+          "location": "Walls (1)",
+          "orientation": 3
+        },
+        {
+          "name": "RH Windows",
+          "type": "Windows",
+          "width": 4.39,
+          "height": 1,
+          "location": "Walls (1)",
+          "orientation": 1
+        },
+        {
+          "name": "Rear Window",
+          "type": "Windows",
+          "width": 0.62,
+          "height": 1,
+          "location": "Walls (1)",
+          "orientation": 7
+        },
+        {
+          "name": "LH Window",
+          "type": "Windows",
+          "width": 1.59,
+          "height": 1,
+          "location": "Walls (1)",
+          "orientation": 5
+        }
+      ],
+      "construction_year": 2025,
+      "sap_thermal_bridges": {
+        "thermal_bridges": [
+          {
+            "length": 9.65,
+            "psi_value": 0.021,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E2"
+          },
+          {
+            "length": 8.16,
+            "psi_value": 0.017,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E3"
+          },
+          {
+            "length": 16.95,
+            "psi_value": 0.013,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E4"
+          },
+          {
+            "length": 29.14,
+            "psi_value": 0.054,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E5"
+          },
+          {
+            "length": 29.14,
+            "psi_value": 0.052,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E7"
+          },
+          {
+            "length": 11.61,
+            "psi_value": 0.046,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E16"
+          },
+          {
+            "length": 6.91,
+            "psi_value": 0.111,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E5"
+          },
+          {
+            "length": 6.91,
+            "psi_value": 0.056,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E7"
+          },
+          {
+            "length": 4.72,
+            "psi_value": -0.1,
+            "psi_value_source": 1,
+            "thermal_bridge_type": "E17"
+          }
+        ],
+        "thermal_bridge_code": 5
+      },
+      "building_part_number": 1,
+      "sap_floor_dimensions": [
+        {
+          "storey": 0,
+          "u_value": 0.13,
+          "floor_type": 2,
+          "kappa_value": 75,
+          "storey_height": 2.36,
+          "heat_loss_area": 72.99,
+          "total_floor_area": 72.99
+        }
+      ]
+    }
+  ],
+  "user_interface_name": "Design SAP 10",
+  "windows_overshading": 2,
+  "heating_cost_current": {
+    "value": 218,
+    "currency": "GBP"
+  },
+  "co2_emissions_current": 0.8,
+  "energy_rating_average": 60,
+  "energy_rating_current": 85,
+  "lighting_cost_current": {
+    "value": 57,
+    "currency": "GBP"
+  },
+  "main_heating_controls": [
+    {
+      "description": {
+        "value": "Time and temperature zone control",
+        "language": "1"
+      },
+      "energy_efficiency_rating": 5,
+      "environmental_efficiency_rating": 5
+    }
+  ],
+  "has_hot_water_cylinder": "false",
+  "heating_cost_potential": {
+    "value": 218,
+    "currency": "GBP"
+  },
+  "hot_water_cost_current": {
+    "value": 118,
+    "currency": "GBP"
+  },
+  "user_interface_version": "2.22.1",
+  "co2_emissions_potential": 0.8,
+  "energy_rating_potential": 85,
+  "gas_smart_meter_present": "false",
+  "lighting_cost_potential": {
+    "value": 57,
+    "currency": "GBP"
+  },
+  "schema_version_original": "SAP-Schema-19.1.0",
+  "hot_water_cost_potential": {
+    "value": 118,
+    "currency": "GBP"
+  },
+  "is_in_smoke_control_area": "unknown",
+  "seller_commission_report": "Y",
+  "energy_consumption_current": 59,
+  "has_fixed_air_conditioning": "false",
+  "is_dwelling_export_capable": "true",
+  "multiple_glazed_percentage": 100,
+  "calculation_software_version": "2.22.1",
+  "energy_consumption_potential": 59,
+  "environmental_impact_current": 90,
+  "current_energy_efficiency_band": "B",
+  "environmental_impact_potential": 90,
+  "electricity_smart_meter_present": "false",
+  "has_heated_separate_conservatory": "false",
+  "potential_energy_efficiency_band": "B",
+  "co2_emissions_current_per_floor_area": 10.7
+}
\ No newline at end of file
diff --git a/datatypes/epc/domain/epc_property_data.py b/datatypes/epc/domain/epc_property_data.py
index a49010d3a..895e4ab30 100644
--- a/datatypes/epc/domain/epc_property_data.py
+++ b/datatypes/epc/domain/epc_property_data.py
@@ -35,15 +35,18 @@ class BuildingPartIdentifier(Enum):
     OTHER = "other"
 
     @classmethod
-    def from_api_string(cls, api_identifier: Optional[str]) -> "BuildingPartIdentifier":
+    def from_api_string(
+        cls, api_identifier: Optional[object]
+    ) -> "BuildingPartIdentifier":
         """Map a gov-EPC API `BuildingPart.identifier` to its canonical
         member. "Main Dwelling" → MAIN; "Extension N" → EXTENSION_N
-        (for N in 1..4). `None` (permitted by the 21_0_1 schema) and
-        anything unrecognised fall to OTHER.
+        (for N in 1..4). `None` (permitted by the 21_0_1 schema), a non-string
+        identifier (some SAP-16.x certs lodge a bare int), and anything else
+        unrecognised fall to OTHER.
         """
         if api_identifier == "Main Dwelling":
             return cls.MAIN
-        if api_identifier is not None:
+        if isinstance(api_identifier, str):
             match = _API_EXTENSION.match(api_identifier)
             if match is not None:
                 return cls.extension(int(match.group(1)))
@@ -367,7 +370,12 @@ class SapEnergySource:
     wind_turbines_terrain_type: str  # int in API, str (e.g. "Suburban") in site notes
     electricity_smart_meter_present: bool
 
-    pv_connection: Optional[Union[int, str]] = None  # int from API; str from site notes
+    # gov-API enum (int): 0 = no PV, 1 = PV present but NOT connected to the
+    # dwelling's own electricity meter (communal / separately metered), 2 = PV
+    # connected to the dwelling's meter. Per RdSAP 10 §11.1 / SAP 10.2 Appendix M,
+    # PV is credited to the dwelling's SAP only when connected (== 2); see
+    # `_pv_connected_to_dwelling_meter` in cert_to_inputs. str from site notes.
+    pv_connection: Optional[Union[int, str]] = None
     photovoltaic_supply: Optional[PhotovoltaicSupply] = None
     photovoltaic_arrays: Optional[List[PhotovoltaicArray]] = None
     wind_turbine_details: Optional[WindTurbineDetails] = None
diff --git a/datatypes/epc/domain/mapper.py b/datatypes/epc/domain/mapper.py
index a699be4e0..e0758e3db 100644
--- a/datatypes/epc/domain/mapper.py
+++ b/datatypes/epc/domain/mapper.py
@@ -1,4 +1,5 @@
 import copy
+import logging
 import re
 from dataclasses import replace
 from datetime import date
@@ -56,8 +57,12 @@ from datatypes.epc.schema.sap_schema_17_1 import (
 # full-SAP opening-type codes: 1/2/3 = door, 4 = window, 5 = roof window.
 _SAP_OPENING_TYPE_WINDOW: Final[int] = 4
 _SAP_OPENING_TYPE_ROOF_WINDOW: Final[int] = 5
+# 6 = "Ext Rooflight" (seen on full-SAP 19.1.0 certs) — SAP 10.2 treats roof
+# windows and rooflights as the same inclined-glazing family, so model it on the
+# roof-window path alongside code 5.
+_SAP_ROOF_WINDOW_TYPES: Final[frozenset[int]] = frozenset({5, 6})
 _SAP_OPENING_TYPE_DOORS: Final[frozenset[int]] = frozenset({1, 2, 3})
-_SAP_KNOWN_OPENING_TYPES: Final[frozenset[int]] = frozenset({1, 2, 3, 4, 5})
+_SAP_KNOWN_OPENING_TYPES: Final[frozenset[int]] = frozenset({1, 2, 3, 4, 5, 6})
 # full-SAP wall_type codes: 1/2/3 = external (exposed), 4 = party, 5 = internal.
 _SAP_WALL_TYPES_EXPOSED: Final[frozenset[int]] = frozenset({1, 2, 3})
 _SAP_WALL_TYPE_PARTY: Final[int] = 4
@@ -68,10 +73,9 @@ _SAP_KNOWN_WALL_TYPES: Final[frozenset[int]] = frozenset({1, 2, 3, 4, 5})
 # RdSAP age band M. Used only for that fallback + secondary age-band logic.
 _SAP_DEFAULT_AGE_BAND: Final[str] = "M"
 # full-SAP standard `ventilation_type` code → MechanicalVentilationKind name
-# (None = natural). MVHR (7) is deferred to natural — like the RdSAP API path
-# (_API_MECHANICAL_VENTILATION_TO_KIND code 4), its (24a) formula needs the
-# PCDB heat-recovery efficiency, not yet plumbed; mapping to MVHR with a null
-# efficiency would mis-model it as MV. None of the corpus lodges 7.
+# (None = natural). MVHR (code 8) uses the same PCDB Table 4g fallback
+# (66% × 0.70 in-use factor) as the RdSAP-21 API path when no PCDF index is
+# lodged — the cascade handles a null index gracefully.
 _SAP_VENTILATION_TYPE_TO_MV_KIND: Final[Dict[int, Optional[str]]] = {
     1: None,                       # natural (with intermittent extract fans)
     2: None,                       # passive stack — treated as natural
@@ -79,8 +83,10 @@ _SAP_VENTILATION_TYPE_TO_MV_KIND: Final[Dict[int, Optional[str]]] = {
     4: "EXTRACT_OR_PIV_OUTSIDE",   # positive input from outside
     5: "EXTRACT_OR_PIV_OUTSIDE",   # mechanical extract, centralised (MEV c)
     6: "EXTRACT_OR_PIV_OUTSIDE",   # mechanical extract, decentralised (MEV dc)
-    7: None,                       # MVHR — deferred (efficiency not plumbed)
-    8: "MV",                       # balanced mechanical, no heat recovery
+    7: "MV",                       # balanced without heat recovery (MV)
+    8: "MVHR",                     # balanced with heat recovery (MVHR)
+    9: None,                       # natural with extract fans and/or passive vents (legacy)
+    10: None,                      # natural with extract fans and passive vents
 }
 # rdsap_uvalues WALL_CAVITY = 4 (D7 fallback; U comes from the description).
 _SAP_DEFAULT_WALL_CONSTRUCTION: Final[int] = 4
@@ -189,6 +195,15 @@ def _sap_opening_area_m2(width: Any, height: Any) -> float:
     )
 
 
+def _pv_array_field(array: Any, name: str) -> Any:
+    """Read a PV-array field from either a `PhotovoltaicArray` dataclass (21.0.x,
+    where the schema Union parsed the nested list) or a raw dict (older schemas
+    that leave the list unparsed)."""
+    if isinstance(array, dict):
+        return cast(Dict[str, Any], array).get(name)
+    return getattr(array, name)
+
+
 def _map_schema_21_pv(
     es_pv_supply: Any,
 ) -> tuple[Optional[PhotovoltaicSupply], Optional[List[PhotovoltaicArray]]]:
@@ -206,12 +221,18 @@ def _map_schema_21_pv(
     None. With no PV data at all, both are None.
     """
     if isinstance(es_pv_supply, list):
+        # The nested list's leaves are `PhotovoltaicArray` dataclasses when the
+        # schema's Union type parsed them (21.0.x), or raw dicts when an older
+        # schema (17.0–20.0.0) types the field as the wrapper only and leaves the
+        # list unparsed — `_pv_array_field` reads either shape.
         flattened = [
             PhotovoltaicArray(
-                peak_power=_measurement_value(array.peak_power),
-                pitch=int(_measurement_value(array.pitch)),
-                orientation=_pv_orientation(array.orientation),
-                overshading=int(_measurement_value(array.overshading)),
+                peak_power=_measurement_value(_pv_array_field(array, "peak_power")),
+                pitch=int(_measurement_value(_pv_array_field(array, "pitch"))),
+                orientation=_pv_orientation(_pv_array_field(array, "orientation")),
+                overshading=int(
+                    _measurement_value(_pv_array_field(array, "overshading"))
+                ),
             )
             for inner_list in es_pv_supply
             for array in inner_list
@@ -538,6 +559,7 @@ class EpcPropertyDataMapper:
     @staticmethod
     def from_rdsap_schema_17_0(schema: RdSapSchema17_0) -> EpcPropertyData:
         es = schema.sap_energy_source
+        pv_supply, pv_arrays = _map_schema_21_pv(es.photovoltaic_supply)
         return EpcPropertyData(
             uprn=schema.uprn,
             assessment_type=schema.assessment_type,
@@ -656,17 +678,8 @@ class EpcPropertyDataMapper:
                 is_dwelling_export_capable=False,
                 wind_turbines_terrain_type=str(es.wind_turbines_terrain_type),
                 electricity_smart_meter_present=False,
-                photovoltaic_supply=(
-                    PhotovoltaicSupply(
-                        none_or_no_details=PhotovoltaicSupplyNoneOrNoDetails(
-                            percent_roof_area=es.photovoltaic_supply.none_or_no_details.percent_roof_area,
-                        )
-                    )
-                    # ADR-0028: photovoltaic_supply can be absent, None, or a
-                    # sparse shape without none_or_no_details — guard the read.
-                    if getattr(es.photovoltaic_supply, "none_or_no_details", None)
-                    else None
-                ),
+                photovoltaic_supply=pv_supply,
+                photovoltaic_arrays=pv_arrays,
             ),
             sap_building_parts=[
                 SapBuildingPart(
@@ -699,8 +712,13 @@ class EpcPropertyDataMapper:
                     roof_insulation_thickness=bp.roof_insulation_thickness,
                     sap_room_in_roof=None,
                 )
+                # RdSAP 10 §6.1 — exclude the glazed conservatory BP from the
+                # fabric loop; carried as `sap_conservatory` below. Mirrors the
+                # 19.0 / 21.0.1 path.
                 for bp in schema.sap_building_parts
+                if getattr(bp, "glazed_perimeter", None) is None
             ],
+            sap_conservatory=_api_sap_conservatory(schema.sap_building_parts),
         )
 
     @staticmethod
@@ -716,6 +734,26 @@ class EpcPropertyDataMapper:
         door_count, insulated_door_u = _sap_door_aggregates(schema)
         return EpcPropertyData(
             uprn=schema.uprn,
+            assessment_type=schema.assessment_type,
+            # SAP 2012 (~9.92) for this family — carried so CalculatorRebaseliner
+            # fires trigger (a) (sap_version < 10.2 → Effective = the SAP-10.2
+            # calc) instead of keeping the lodged SAP-2012 score (ADR-0037).
+            sap_version=schema.sap_version,
+            # gov property_type code → str, mirroring from_rdsap_schema_17_1.
+            # Feeds the calculator's house/flat heat-transmission split.
+            property_type=(
+                str(schema.property_type)
+                if schema.property_type is not None
+                else None
+            ),
+            built_form=(
+                str(schema.built_form) if schema.built_form is not None else None
+            ),
+            secondary_heating=(
+                EpcPropertyDataMapper._map_energy_element(schema.secondary_heating)
+                if schema.secondary_heating is not None
+                else None
+            ),
             dwelling_type=(
                 schema.dwelling_type
                 if isinstance(schema.dwelling_type, str)
@@ -728,7 +766,11 @@ class EpcPropertyDataMapper:
             postcode=schema.postcode,
             post_town=schema.post_town,
             total_floor_area_m2=float(schema.total_floor_area),
-            has_hot_water_cylinder=schema.has_hot_water_cylinder == "true",
+            has_hot_water_cylinder=(
+                schema.has_hot_water_cylinder
+                or schema.sap_heating.has_hot_water_cylinder
+            )
+            == "true",
             has_fixed_air_conditioning=schema.has_fixed_air_conditioning == "true",
             solar_water_heating=False,
             extensions_count=0,
@@ -769,7 +811,35 @@ class EpcPropertyDataMapper:
             roofs=EpcPropertyDataMapper._map_energy_elements(schema.roofs),
             walls=EpcPropertyDataMapper._map_energy_elements(schema.walls),
             floors=EpcPropertyDataMapper._map_energy_elements(schema.floors),
-            main_heating=[],
+            # Display elements for the FE property-details panel (the calculator
+            # reads the measured sap_* fields below, not these). Parity with
+            # from_rdsap_schema_17_1; full-SAP lodges windows under plural key.
+            main_heating=EpcPropertyDataMapper._map_energy_elements(
+                schema.main_heating
+            ),
+            # First control system if multiple — mirrors from_rdsap_schema_21_0_1.
+            main_heating_controls=(
+                EpcPropertyDataMapper._map_energy_element(
+                    schema.main_heating_controls[0]
+                )
+                if schema.main_heating_controls
+                else None
+            ),
+            window=(
+                EpcPropertyDataMapper._map_energy_element(schema.windows)
+                if schema.windows is not None
+                else None
+            ),
+            lighting=(
+                EpcPropertyDataMapper._map_energy_element(schema.lighting)
+                if schema.lighting is not None
+                else None
+            ),
+            hot_water=(
+                EpcPropertyDataMapper._map_energy_element(schema.hot_water)
+                if schema.hot_water is not None
+                else None
+            ),
             # D2: vertical-window openings (opening-type 4) → sap_windows;
             # roof-window openings (opening-type 5) → sap_roof_windows.
             sap_windows=EpcPropertyDataMapper._sap_17_1_windows(schema),
@@ -777,7 +847,15 @@ class EpcPropertyDataMapper:
             # D1: derive heat-loss perimeter + party-wall length from the
             # measured wall areas (full SAP lodges neither directly).
             sap_building_parts=[
-                _sap_17_1_building_part(bp, i)
+                _sap_17_1_building_part(
+                    bp,
+                    i,
+                    total_floor_area=float(schema.total_floor_area),
+                    is_single_part=len(schema.sap_building_parts) == 1,
+                    is_flat=schema.sap_flat_details is not None,
+                    address_line_1=schema.address_line_1,
+                    postcode=schema.postcode,
+                )
                 for i, bp in enumerate(schema.sap_building_parts)
             ],
             # D6: full-SAP heating — translate the differing field names onto
@@ -857,7 +935,7 @@ class EpcPropertyDataMapper:
         for bp in schema.sap_building_parts:
             for op in bp.sap_openings:
                 ot = types.get(op.type)
-                if ot is None or ot.type != _SAP_OPENING_TYPE_ROOF_WINDOW:
+                if ot is None or ot.type not in _SAP_ROOF_WINDOW_TYPES:
                     continue
                 roof_windows.append(
                     SapRoofWindow(
@@ -883,9 +961,97 @@ class EpcPropertyDataMapper:
                 )
         return roof_windows
 
+    @staticmethod
+    def from_sap_schema_19_1_0(schema: SapSchema17_1) -> EpcPropertyData:
+        """Map a full-SAP `SAP-Schema-19.1.0` cert.
+
+        19.1.0 is a later full-SAP revision whose load-bearing fabric — measured
+        `sap_opening_types`, construction-code `sap_building_parts`,
+        `sap_heating` / `sap_ventilation` — is structurally identical to
+        `SAP-Schema-17.1`, so it parses with the 17.1 dataclass and reuses the
+        tested `from_sap_schema_17_1` mapper. This thin wrapper gives 19.1.0 its
+        own dispatch entry point: 19.1.0-only fields (e.g. `air_tightness`,
+        `windows_overshading`) are not yet consumed, and when one needs modelling
+        it is handled here rather than by widening the 17.1 mapper.
+        """
+        return EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+    @staticmethod
+    def from_sap_schema_17_0(schema: SapSchema17_1) -> EpcPropertyData:
+        """Map a full-SAP `SAP-Schema-17.0` cert. Structurally identical to the
+        17.1 measured shape, so it parses with the 17.1 dataclass and reuses
+        `from_sap_schema_17_1`. Dedicated entry point per the one-mapper-per-
+        schema convention (note: distinct from RdSAP `from_rdsap_schema_17_0`)."""
+        return EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+    @staticmethod
+    def from_sap_schema_18_0_0(schema: SapSchema17_1) -> EpcPropertyData:
+        """Map a full-SAP `SAP-Schema-18.0.0` cert. Structurally identical to the
+        17.1 measured shape, so it parses with the 17.1 dataclass and reuses
+        `from_sap_schema_17_1`. Dedicated entry point per the one-mapper-per-
+        schema convention."""
+        return EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+    @staticmethod
+    def from_sap_schema_16_0(data: Dict[str, Any]) -> EpcPropertyData:
+        """Map a reduced-field `SAP-Schema-16.0` cert (see `from_sap_schema_16_2`)."""
+        return EpcPropertyDataMapper._from_sap_schema_16_x(data)
+
+    @staticmethod
+    def from_sap_schema_16_1(data: Dict[str, Any]) -> EpcPropertyData:
+        """Map a reduced-field `SAP-Schema-16.1` cert (see `from_sap_schema_16_2`)."""
+        return EpcPropertyDataMapper._from_sap_schema_16_x(data)
+
+    @staticmethod
+    def from_sap_schema_16_2(data: Dict[str, Any]) -> EpcPropertyData:
+        """Map a reduced-field `SAP-Schema-16.2` cert.
+
+        The SAP-Schema-16.x family is structurally RdSAP-17.1 (reduced fields,
+        `glazed_area` band, construction-code building parts) under a different
+        name plus a handful of renamed/omitted fields. Each revision gets a
+        dedicated mapper that normalises onto the RdSAP-17.1 shape via the shared
+        `_normalize_sap_schema_16_x` and reuses the tested `from_rdsap_schema_17_1`.
+        """
+        return EpcPropertyDataMapper._from_sap_schema_16_x(data)
+
+    @staticmethod
+    def from_sap_schema_16_3(data: Dict[str, Any]) -> EpcPropertyData:
+        """Map a reduced-field `SAP-Schema-16.3` cert (see `from_sap_schema_16_2`)."""
+        return EpcPropertyDataMapper._from_sap_schema_16_x(data)
+
+    @staticmethod
+    def _from_sap_schema_16_x(data: Dict[str, Any]) -> EpcPropertyData:
+        """Shared body for the SAP-Schema-16.x dedicated mappers: normalise the
+        reduced-field doc onto the RdSAP-17.1 shape and reuse that mapper.
+
+        Only the reduced-RdSAP shape reaches here. A full-SAP cert mis-lodged
+        under a SAP-Schema-16.x label (the `LIG-*` as-designed new-builds) is a
+        *broken schema type* — `from_api_response` detects the full-SAP shape and
+        routes it to the full-SAP mapper before this label dispatch (see
+        `_is_full_sap_assessment`)."""
+        from datatypes.epc.schema.rdsap_schema_17_1 import RdSapSchema17_1
+
+        return EpcPropertyDataMapper.from_rdsap_schema_17_1(
+            from_dict(RdSapSchema17_1, _normalize_sap_schema_16_x(data))
+        )
+
+    @staticmethod
+    def _from_full_sap(data: Dict[str, Any]) -> EpcPropertyData:
+        """Map a cert whose *structure* is full-SAP (measured `sap_opening_types`)
+        via the full-SAP 17.1 mapper, regardless of its `schema_type` label — the
+        door/window/fabric come from the real measured openings, no reduced-field
+        defaulting. The only `SapSchema17_1` field the broken-label (16.x) full-SAP
+        shape omits is `tenure` (register metadata, no SAP effect), defaulted."""
+        normalised = copy.deepcopy(data)
+        normalised.setdefault("tenure", "unknown")
+        return EpcPropertyDataMapper.from_sap_schema_17_1(
+            from_dict(SapSchema17_1, normalised)
+        )
+
     @staticmethod
     def from_rdsap_schema_17_1(schema: RdSapSchema17_1) -> EpcPropertyData:
         es = schema.sap_energy_source
+        pv_supply, pv_arrays = _map_schema_21_pv(es.photovoltaic_supply)
         # ADR-0028: instantaneous_wwhrs holds bath/shower ROOM counts.
         iw = schema.sap_heating.instantaneous_wwhrs
         return EpcPropertyData(
@@ -928,6 +1094,9 @@ class EpcPropertyDataMapper:
             # ADR-0028: sheltered_sides from built_form, else the calculator
             # assumes mid-terrace (2) for every dwelling.
             sap_ventilation=SapVentilation(
+                mechanical_ventilation_kind=_api_mechanical_ventilation_kind(
+                    schema.mechanical_ventilation
+                ),
                 sheltered_sides=_api_sheltered_sides(schema.built_form),
             ),
             # ADR-0028: total + low-energy OUTLET counts, not a bulb split.
@@ -944,6 +1113,14 @@ class EpcPropertyDataMapper:
             main_heating=EpcPropertyDataMapper._map_energy_elements(
                 schema.main_heating
             ),
+            # First control system if multiple — mirrors from_rdsap_schema_21_0_1.
+            main_heating_controls=(
+                EpcPropertyDataMapper._map_energy_element(
+                    schema.main_heating_controls[0]
+                )
+                if schema.main_heating_controls
+                else None
+            ),
             window=EpcPropertyDataMapper._map_energy_element(schema.window),
             lighting=EpcPropertyDataMapper._map_energy_element(schema.lighting),
             hot_water=EpcPropertyDataMapper._map_energy_element(schema.hot_water),
@@ -1029,15 +1206,8 @@ class EpcPropertyDataMapper:
                 is_dwelling_export_capable=False,
                 wind_turbines_terrain_type=str(es.wind_turbines_terrain_type),
                 electricity_smart_meter_present=False,
-                photovoltaic_supply=(
-                    PhotovoltaicSupply(
-                        none_or_no_details=PhotovoltaicSupplyNoneOrNoDetails(
-                            percent_roof_area=es.photovoltaic_supply.none_or_no_details.percent_roof_area,
-                        )
-                    )
-                    if getattr(es.photovoltaic_supply, "none_or_no_details", None)
-                    else None
-                ),
+                photovoltaic_supply=pv_supply,
+                photovoltaic_arrays=pv_arrays,
             ),
             sap_building_parts=[
                 SapBuildingPart(
@@ -1070,13 +1240,19 @@ class EpcPropertyDataMapper:
                     roof_insulation_thickness=bp.roof_insulation_thickness,
                     sap_room_in_roof=None,
                 )
+                # RdSAP 10 §6.1 — exclude the glazed conservatory BP from the
+                # fabric loop; carried as `sap_conservatory` below. Mirrors the
+                # 19.0 / 21.0.1 path.
                 for bp in schema.sap_building_parts
+                if getattr(bp, "glazed_perimeter", None) is None
             ],
+            sap_conservatory=_api_sap_conservatory(schema.sap_building_parts),
         )
 
     @staticmethod
     def from_rdsap_schema_18_0(schema: RdSapSchema18_0) -> EpcPropertyData:
         es = schema.sap_energy_source
+        pv_supply, pv_arrays = _map_schema_21_pv(es.photovoltaic_supply)
         # ADR-0028: instantaneous_wwhrs holds bath/shower ROOM counts.
         iw = schema.sap_heating.instantaneous_wwhrs
         return EpcPropertyData(
@@ -1119,6 +1295,9 @@ class EpcPropertyDataMapper:
             # ADR-0028: sheltered_sides must come from built_form, else the
             # calculator assumes mid-terrace (2) for every dwelling.
             sap_ventilation=SapVentilation(
+                mechanical_ventilation_kind=_api_mechanical_ventilation_kind(
+                    schema.mechanical_ventilation
+                ),
                 sheltered_sides=_api_sheltered_sides(schema.built_form),
             ),
             # ADR-0028: 18.0 gives total + low-energy OUTLET counts, not an
@@ -1137,6 +1316,14 @@ class EpcPropertyDataMapper:
             main_heating=EpcPropertyDataMapper._map_energy_elements(
                 schema.main_heating
             ),
+            # First control system if multiple — mirrors from_rdsap_schema_21_0_1.
+            main_heating_controls=(
+                EpcPropertyDataMapper._map_energy_element(
+                    schema.main_heating_controls[0]
+                )
+                if schema.main_heating_controls
+                else None
+            ),
             window=EpcPropertyDataMapper._map_energy_element(schema.window),
             lighting=EpcPropertyDataMapper._map_energy_element(schema.lighting),
             hot_water=EpcPropertyDataMapper._map_energy_element(schema.hot_water),
@@ -1227,16 +1414,8 @@ class EpcPropertyDataMapper:
                 is_dwelling_export_capable=False,
                 wind_turbines_terrain_type=str(es.wind_turbines_terrain_type),
                 electricity_smart_meter_present=False,
-                photovoltaic_supply=(
-                    PhotovoltaicSupply(
-                        none_or_no_details=PhotovoltaicSupplyNoneOrNoDetails(
-                            percent_roof_area=es.photovoltaic_supply.none_or_no_details.percent_roof_area,
-                        )
-                    )
-                    if es.photovoltaic_supply
-                    and es.photovoltaic_supply.none_or_no_details
-                    else None
-                ),
+                photovoltaic_supply=pv_supply,
+                photovoltaic_arrays=pv_arrays,
             ),
             sap_building_parts=[
                 SapBuildingPart(
@@ -1300,13 +1479,19 @@ class EpcPropertyDataMapper:
                         else None
                     ),
                 )
+                # RdSAP 10 §6.1 — exclude the glazed conservatory BP from the
+                # fabric loop; carried as `sap_conservatory` below. Mirrors the
+                # 19.0 / 21.0.1 path.
                 for bp in schema.sap_building_parts
+                if getattr(bp, "glazed_perimeter", None) is None
             ],
+            sap_conservatory=_api_sap_conservatory(schema.sap_building_parts),
         )
 
     @staticmethod
     def from_rdsap_schema_19_0(schema: RdSapSchema19_0) -> EpcPropertyData:
         es = schema.sap_energy_source
+        pv_supply, pv_arrays = _map_schema_21_pv(es.photovoltaic_supply)
         return EpcPropertyData(
             uprn=schema.uprn,
             assessment_type=schema.assessment_type,
@@ -1355,6 +1540,14 @@ class EpcPropertyDataMapper:
             main_heating=EpcPropertyDataMapper._map_energy_elements(
                 schema.main_heating
             ),
+            # First control system if multiple — mirrors from_rdsap_schema_21_0_1.
+            main_heating_controls=(
+                EpcPropertyDataMapper._map_energy_element(
+                    schema.main_heating_controls[0]
+                )
+                if schema.main_heating_controls
+                else None
+            ),
             window=EpcPropertyDataMapper._map_energy_element(schema.window),
             lighting=EpcPropertyDataMapper._map_energy_element(schema.lighting),
             hot_water=EpcPropertyDataMapper._map_energy_element(schema.hot_water),
@@ -1428,17 +1621,8 @@ class EpcPropertyDataMapper:
                 is_dwelling_export_capable=False,
                 wind_turbines_terrain_type=str(es.wind_turbines_terrain_type),
                 electricity_smart_meter_present=False,
-                photovoltaic_supply=(
-                    PhotovoltaicSupply(
-                        none_or_no_details=PhotovoltaicSupplyNoneOrNoDetails(
-                            percent_roof_area=es.photovoltaic_supply.none_or_no_details.percent_roof_area,
-                        )
-                    )
-                    # ADR-0028: photovoltaic_supply can be absent, None, or a
-                    # sparse shape without none_or_no_details — guard the read.
-                    if getattr(es.photovoltaic_supply, "none_or_no_details", None)
-                    else None
-                ),
+                photovoltaic_supply=pv_supply,
+                photovoltaic_arrays=pv_arrays,
             ),
             sap_building_parts=[
                 SapBuildingPart(
@@ -1506,13 +1690,38 @@ class EpcPropertyDataMapper:
                         else None
                     ),
                 )
+                # RdSAP 10 §6.1 — exclude the glazed conservatory BP from the
+                # fabric loop; it is carried as `sap_conservatory` below and
+                # billed by the §6.1 cascade (window/rooflight/floor), not as
+                # a dwelling building part. Mirrors the 21.0.1 path.
                 for bp in schema.sap_building_parts
+                if getattr(bp, "glazed_perimeter", None) is None
             ],
+            sap_conservatory=_api_sap_conservatory(schema.sap_building_parts),
+            # ADR-0037 follow-up: 19.0 previously passed no `sap_ventilation=`,
+            # dropping the whole §2 block. The schema only lodges the top-level
+            # `mechanical_ventilation` enum + `built_form` (no fan/flue/vent
+            # counts — RdSAP uses Table-5 age defaults), so mirror just those
+            # two fields from 21.0.1. An MEV/MVHR cert that defaulted to NATURAL
+            # under-stated its ventilation heat loss; `sheltered_sides` (§S5)
+            # avoids the cascade's shelter default of 2.
+            sap_ventilation=SapVentilation(
+                sheltered_sides=_api_sheltered_sides(schema.built_form),
+                mechanical_ventilation_kind=_api_mechanical_ventilation_kind(
+                    schema.mechanical_ventilation
+                ),
+            ),
         )
 
     @staticmethod
     def from_rdsap_schema_20_0_0(schema: RdSapSchema20_0_0) -> EpcPropertyData:
         es = schema.sap_energy_source
+        # `photovoltaic_supply` is polymorphic in 20.0.0 too (None / wrapper dict /
+        # measured-array LIST) — route it through the shared dispatch like 21.0.0 so a
+        # cert lodging measured arrays as a list (e.g. cert 6102-6227-8000-0083-2292,
+        # uprn 22086693) maps instead of raising "'list' object has no attribute
+        # 'none_or_no_details'" and sinking the whole prediction cohort.
+        pv_supply, pv_arrays = _map_schema_21_pv(es.photovoltaic_supply)
         # ADR-0027: instantaneous_wwhrs holds bath/shower ROOM counts.
         iw = schema.sap_heating.instantaneous_wwhrs
         return EpcPropertyData(
@@ -1556,6 +1765,9 @@ class EpcPropertyDataMapper:
             # them via RdSAP Table 5), but sheltered_sides must come from
             # built_form — else the calculator assumes mid-terrace (2) for all.
             sap_ventilation=SapVentilation(
+                mechanical_ventilation_kind=_api_mechanical_ventilation_kind(
+                    schema.mechanical_ventilation
+                ),
                 sheltered_sides=_api_sheltered_sides(schema.built_form),
             ),
             # ADR-0027: 20.0.0 gives total + low-energy OUTLET counts, not an
@@ -1575,6 +1787,14 @@ class EpcPropertyDataMapper:
             main_heating=EpcPropertyDataMapper._map_energy_elements(
                 schema.main_heating
             ),
+            # First control system if multiple — mirrors from_rdsap_schema_21_0_1.
+            main_heating_controls=(
+                EpcPropertyDataMapper._map_energy_element(
+                    schema.main_heating_controls[0]
+                )
+                if schema.main_heating_controls
+                else None
+            ),
             window=EpcPropertyDataMapper._map_energy_element(schema.window),
             lighting=EpcPropertyDataMapper._map_energy_element(schema.lighting),
             hot_water=EpcPropertyDataMapper._map_energy_element(schema.hot_water),
@@ -1669,16 +1889,8 @@ class EpcPropertyDataMapper:
                 is_dwelling_export_capable=False,
                 wind_turbines_terrain_type=str(es.wind_turbines_terrain_type),
                 electricity_smart_meter_present=False,
-                photovoltaic_supply=(
-                    PhotovoltaicSupply(
-                        none_or_no_details=PhotovoltaicSupplyNoneOrNoDetails(
-                            percent_roof_area=es.photovoltaic_supply.none_or_no_details.percent_roof_area,
-                        )
-                    )
-                    if es.photovoltaic_supply
-                    and es.photovoltaic_supply.none_or_no_details
-                    else None
-                ),
+                photovoltaic_supply=pv_supply,
+                photovoltaic_arrays=pv_arrays,
             ),
             sap_building_parts=[
                 SapBuildingPart(
@@ -1759,8 +1971,13 @@ class EpcPropertyDataMapper:
                         else None
                     ),
                 )
+                # RdSAP 10 §6.1 — exclude the glazed conservatory BP from the
+                # fabric loop; carried as `sap_conservatory` below. Mirrors the
+                # 19.0 / 21.0.1 path.
                 for bp in schema.sap_building_parts
+                if getattr(bp, "glazed_perimeter", None) is None
             ],
+            sap_conservatory=_api_sap_conservatory(schema.sap_building_parts),
         )
 
     @staticmethod
@@ -1798,13 +2015,15 @@ class EpcPropertyDataMapper:
             door_count=schema.door_count,
             habitable_rooms_count=schema.habitable_room_count,
             heated_rooms_count=schema.heated_room_count,
-            wet_rooms_count=schema.wet_rooms_count,
+            # Optional in 21.0.0 (real certs omit them); coalesce counts to 0
+            # like every other mapper so None can't reach a NOT-NULL column.
+            wet_rooms_count=schema.wet_rooms_count or 0,
             extensions_count=schema.extensions_count,
-            open_chimneys_count=schema.open_chimneys_count,
+            open_chimneys_count=schema.open_chimneys_count or 0,
             insulated_door_count=schema.insulated_door_count,
             draughtproofed_door_count=schema.draughtproofed_door_count,
-            led_fixed_lighting_bulbs_count=schema.led_fixed_lighting_bulbs_count,
-            cfl_fixed_lighting_bulbs_count=schema.cfl_fixed_lighting_bulbs_count,
+            led_fixed_lighting_bulbs_count=schema.led_fixed_lighting_bulbs_count or 0,
+            cfl_fixed_lighting_bulbs_count=schema.cfl_fixed_lighting_bulbs_count or 0,
             incandescent_fixed_lighting_bulbs_count=schema.incandescent_fixed_lighting_bulbs_count,
             roofs=EpcPropertyDataMapper._map_energy_elements(schema.roofs),
             walls=EpcPropertyDataMapper._map_energy_elements(schema.walls),
@@ -1812,6 +2031,14 @@ class EpcPropertyDataMapper:
             main_heating=EpcPropertyDataMapper._map_energy_elements(
                 schema.main_heating
             ),
+            # First control system if multiple — mirrors from_rdsap_schema_21_0_1.
+            main_heating_controls=(
+                EpcPropertyDataMapper._map_energy_element(
+                    schema.main_heating_controls[0]
+                )
+                if schema.main_heating_controls
+                else None
+            ),
             window=EpcPropertyDataMapper._map_energy_element(schema.window),
             lighting=EpcPropertyDataMapper._map_energy_element(schema.lighting),
             hot_water=EpcPropertyDataMapper._map_energy_element(schema.hot_water),
@@ -1876,7 +2103,7 @@ class EpcPropertyDataMapper:
             sap_windows=[
                 SapWindow(
                     frame_material="PVC" if w.pvc_frame == "true" else None,
-                    glazing_gap=w.glazing_gap,
+                    glazing_gap=w.glazing_gap,  # pyright: ignore[reportArgumentType]
                     orientation=w.orientation,
                     window_type=w.window_type,
                     frame_factor=w.frame_factor,
@@ -1887,10 +2114,17 @@ class EpcPropertyDataMapper:
                     window_location=w.window_location,
                     window_wall_type=w.window_wall_type,
                     permanent_shutters_present=w.permanent_shutters_present == "Y",
-                    window_transmission_details=WindowTransmissionDetails(
-                        u_value=w.window_transmission_details.u_value,
-                        data_source=w.window_transmission_details.data_source,
-                        solar_transmittance=w.window_transmission_details.solar_transmittance,
+                    # Real-API 21.0.0 certs may omit transmission details; the
+                    # calc then synthesises the window U/g from glazing_type +
+                    # glazing_gap (mirrors the 21.0.1 `_api_sap_window` guard).
+                    window_transmission_details=(
+                        WindowTransmissionDetails(
+                            u_value=w.window_transmission_details.u_value,
+                            data_source=w.window_transmission_details.data_source,
+                            solar_transmittance=w.window_transmission_details.solar_transmittance,
+                        )
+                        if w.window_transmission_details is not None
+                        else None
                     ),
                     permanent_shutters_insulated=w.permanent_shutters_insulated,
                 )
@@ -2053,6 +2287,19 @@ class EpcPropertyDataMapper:
                     else None
                 ),
             ),
+            # ADR-0037 follow-up: 21.0.0 previously passed no `sap_ventilation=`,
+            # dropping the whole §2 block. Unlike 21.0.1 it does not lodge the
+            # fan/flue/vent counts, so mirror only the two fields it does carry:
+            # the top-level `mechanical_ventilation` enum (→ §2 MV-kind dispatch;
+            # an MEV/MVHR cert otherwise defaulted to NATURAL and under-stated
+            # ventilation heat loss) and `sheltered_sides` from built_form (§S5,
+            # vs the cascade's shelter default of 2).
+            sap_ventilation=SapVentilation(
+                sheltered_sides=_api_sheltered_sides(schema.built_form),
+                mechanical_ventilation_kind=_api_mechanical_ventilation_kind(
+                    schema.mechanical_ventilation
+                ),
+            ),
         )
 
     @staticmethod
@@ -2098,9 +2345,12 @@ class EpcPropertyDataMapper:
             door_count=schema.door_count,
             habitable_rooms_count=schema.habitable_room_count,
             heated_rooms_count=schema.heated_room_count,
-            wet_rooms_count=schema.wet_rooms_count,
+            # 21.0.1 lodges wet_rooms_count as Optional; None violates the
+            # epc_property NOT-NULL column (and the calc's `> 0` check). Coalesce
+            # to 0 like every other mapper (RdSAP "not lodged" → calc minimum 1).
+            wet_rooms_count=schema.wet_rooms_count or 0,
             extensions_count=schema.extensions_count,
-            open_chimneys_count=schema.open_chimneys_count,
+            open_chimneys_count=schema.open_chimneys_count or 0,
             insulated_door_count=schema.insulated_door_count,
             draughtproofed_door_count=schema.draughtproofed_door_count,
             # Mechanical ventilation PCDB plumbing — feeds the §5 Table 4f
@@ -2116,8 +2366,8 @@ class EpcPropertyDataMapper:
             ),
             mechanical_vent_duct_type=schema.mechanical_vent_duct_type,
             # Lighting
-            led_fixed_lighting_bulbs_count=schema.led_fixed_lighting_bulbs_count,
-            cfl_fixed_lighting_bulbs_count=schema.cfl_fixed_lighting_bulbs_count,
+            led_fixed_lighting_bulbs_count=schema.led_fixed_lighting_bulbs_count or 0,
+            cfl_fixed_lighting_bulbs_count=schema.cfl_fixed_lighting_bulbs_count or 0,
             incandescent_fixed_lighting_bulbs_count=schema.incandescent_fixed_lighting_bulbs_count,
             # Energy elements
             roofs=EpcPropertyDataMapper._map_energy_elements(schema.roofs),
@@ -2430,7 +2680,9 @@ class EpcPropertyDataMapper:
                 SapFlatDetails(
                     level=schema.sap_flat_details.level,
                     top_storey=schema.sap_flat_details.top_storey,
-                    flat_location=schema.sap_flat_details.flat_location,
+                    flat_location=_flat_location_int(
+                        schema.sap_flat_details.flat_location
+                    ),
                     heat_loss_corridor=schema.sap_flat_details.heat_loss_corridor,
                     storey_count=schema.sap_flat_details.storey_count,
                     unheated_corridor_length_m=(
@@ -2536,7 +2788,20 @@ class EpcPropertyDataMapper:
         data = _normalize_shower_outlets(data)
         data = _default_missing_post_town(data)
         schema = data.get("schema_type", "")
-        if schema == "RdSAP-Schema-21.0.1":
+
+        # Shape over label. The `schema_type` is a LABEL that can disagree with the
+        # cert's STRUCTURE. A cert that is structurally full-SAP (measured
+        # `sap_opening_types`) is mapped by the full-SAP mapper whatever its label
+        # claims. When the label is NOT a recognised full-SAP schema it is a
+        # *broken schema type* — e.g. the LIG as-designed certs mis-lodged under
+        # SAP-Schema-16.x — recorded so the unreliable labels stay visible and
+        # coverage grows as new shapes surface. Correctly-labelled full-SAP certs
+        # fall through to their own dedicated branch below, keeping the
+        # one-mapper-per-schema convention.
+        if _is_full_sap_assessment(data) and not _is_full_sap_label(schema):
+            _record_broken_schema_type(schema, data)
+            mapped = EpcPropertyDataMapper._from_full_sap(data)
+        elif schema == "RdSAP-Schema-21.0.1":
             from datatypes.epc.schema.rdsap_schema_21_0_1 import RdSapSchema21_0_1
 
             mapped = EpcPropertyDataMapper.from_rdsap_schema_21_0_1(
@@ -2578,27 +2843,36 @@ class EpcPropertyDataMapper:
             mapped = EpcPropertyDataMapper.from_rdsap_schema_17_0(
                 from_dict(RdSapSchema17_0, data)
             )
-        elif schema in ("SAP-Schema-17.1", "SAP-Schema-17.0", "SAP-Schema-18.0.0"):
-            # Full SAP (not RdSAP). SAP-Schema-17.0 / 18.0.0 are structurally
-            # identical to 17.1 (same measured sap_opening_types / building
-            # parts), so they parse with the 17.1 dataclass and reuse the same
-            # mapper. The common post-processing below (incl.
-            # _clear_basement_flag_when_system_built) is a no-op for full SAP
-            # (explicit wall types — no RdSAP code-6 basement ambiguity).
+        # Full-SAP family: each revision gets a dedicated mapper (see the
+        # per-schema methods) even where it currently delegates to the 17.1
+        # logic — so divergences land in one place rather than a shared tuple.
+        elif schema == "SAP-Schema-17.1":
             mapped = EpcPropertyDataMapper.from_sap_schema_17_1(
                 from_dict(SapSchema17_1, data)
             )
-        elif schema in ("SAP-Schema-16.2", "SAP-Schema-16.3", "SAP-Schema-16.0"):
-            # The SAP-Schema-16.x family is structurally RdSAP-17.1 (reduced
-            # fields, glazed_area band, construction-code building parts) under a
-            # different name + a handful of renamed/omitted fields — normalise
-            # onto the RdSAP-17.1 shape and reuse that tested mapper. See
-            # `_normalize_sap_schema_16_x`.
-            from datatypes.epc.schema.rdsap_schema_17_1 import RdSapSchema17_1
-
-            mapped = EpcPropertyDataMapper.from_rdsap_schema_17_1(
-                from_dict(RdSapSchema17_1, _normalize_sap_schema_16_x(data))
+        elif schema == "SAP-Schema-17.0":
+            mapped = EpcPropertyDataMapper.from_sap_schema_17_0(
+                from_dict(SapSchema17_1, data)
             )
+        elif schema == "SAP-Schema-18.0.0":
+            mapped = EpcPropertyDataMapper.from_sap_schema_18_0_0(
+                from_dict(SapSchema17_1, data)
+            )
+        elif schema == "SAP-Schema-19.1.0":
+            mapped = EpcPropertyDataMapper.from_sap_schema_19_1_0(
+                from_dict(SapSchema17_1, data)
+            )
+        # SAP-Schema-16.x family: reduced-field (RdSAP-shaped) certs. Each gets a
+        # dedicated mapper that normalises onto the RdSAP-17.1 shape via the
+        # shared `_normalize_sap_schema_16_x` and reuses `from_rdsap_schema_17_1`.
+        elif schema == "SAP-Schema-16.0":
+            mapped = EpcPropertyDataMapper.from_sap_schema_16_0(data)
+        elif schema == "SAP-Schema-16.1":
+            mapped = EpcPropertyDataMapper.from_sap_schema_16_1(data)
+        elif schema == "SAP-Schema-16.2":
+            mapped = EpcPropertyDataMapper.from_sap_schema_16_2(data)
+        elif schema == "SAP-Schema-16.3":
+            mapped = EpcPropertyDataMapper.from_sap_schema_16_3(data)
         else:
             raise ValueError(f"Unsupported EPC schema: {schema!r}")
 
@@ -2740,22 +3014,35 @@ def _with_recorded_performance(
         current_energy_efficiency_band=(
             Epc(band) if band is not None else epc.current_energy_efficiency_band
         ),
+        # These scalars are normally plain numbers but some certs (e.g. 16.x cert
+        # 2308-4997-7262-0137-9930) lodge them as a Measurement dict
+        # {'value': 3.5, 'quantity': 'tonnes per year'} — `_measurement_value`
+        # coerces Measurement / dict / plain-number alike, so `float(dict)` no
+        # longer crashes the whole prediction cohort.
         co2_emissions_current=(
-            float(co2) if co2 is not None else epc.co2_emissions_current
+            _measurement_value(co2) if co2 is not None else epc.co2_emissions_current
         ),
         energy_consumption_current=(
-            int(consumption)
+            int(_measurement_value(consumption))
             if consumption is not None
             else epc.energy_consumption_current
         ),
         energy_rating_current=(
-            int(rating) if rating is not None else epc.energy_rating_current
+            int(_measurement_value(rating))
+            if rating is not None
+            else epc.energy_rating_current
         ),
     )
 
 
 def _sap_17_1_building_part(
-    bp: SapBuildingPart_SAP_17_1, index: int
+    bp: SapBuildingPart_SAP_17_1,
+    index: int,
+    total_floor_area: float,
+    is_single_part: bool,
+    is_flat: bool,
+    address_line_1: str,
+    postcode: str,
 ) -> SapBuildingPart:
     """D1: build one `SapBuildingPart`, deriving the heat-loss perimeter and
     party-wall length the engine needs from the measured wall areas full SAP
@@ -2765,6 +3052,12 @@ def _sap_17_1_building_part(
     length, 5 internal → discarded; any other code fails loud. Exposed/party
     areas divide by Σ storey-heights so the per-storey perimeter, summed as
     Σ(perimeter × height) by the engine, reconstructs the measured area exactly.
+
+    When `bp.sap_floor_dimensions` is absent (SAP-16.0 flat certs) and the cert
+    is confirmed single-part and flat-type, synthesises one SapFloorDimension
+    from the cert-level `total_floor_area`. Only safe for single-storey
+    single-part flats; multi-part or multi-storey cases are left empty so
+    downstream failures stay diagnosable.
     """
     exposed_area = 0.0
     party_area = 0.0
@@ -2782,17 +3075,46 @@ def _sap_17_1_building_part(
     perimeter_per_storey = exposed_area / total_height
     party_length_per_storey = party_area / total_height
 
-    floor_dimensions = [
-        SapFloorDimension(
-            room_height_m=fd.storey_height,
-            total_floor_area_m2=fd.total_floor_area,
-            heat_loss_perimeter_m=perimeter_per_storey,
-            party_wall_length_m=party_length_per_storey,
-            floor=fd.storey,
-            floor_construction=fd.floor_type,
-        )
-        for fd in bp.sap_floor_dimensions
-    ]
+    # Guard: synthesise only when floor dims are absent AND we can confirm
+    # single-storey single-part. `is_flat` (sap_flat_details present) is the
+    # current signal — flats are always single-storey within the dwelling.
+    # Bungalows are equally single-storey but carry no equivalent structural
+    # field; `dwelling_type` string matching is the only handle, and has not
+    # been confirmed necessary (no bungalows with empty floor dims were found
+    # in the failing batch). An alternative worth considering: drop `is_flat`
+    # entirely and trigger on `not bp.sap_floor_dimensions and is_single_part`
+    # alone — if the cert lodged no dims at all, there is no per-storey data to
+    # misattribute regardless of dwelling type. Requires corpus evidence that
+    # multi-storey single-part certs never omit floor dims before widening.
+    if not bp.sap_floor_dimensions and is_single_part and is_flat:
+        floor_dimensions = [
+            SapFloorDimension(
+                room_height_m=1.0,
+                total_floor_area_m2=total_floor_area,
+                heat_loss_perimeter_m=perimeter_per_storey,
+                party_wall_length_m=party_length_per_storey,
+                floor=0,
+            )
+        ]
+    else:
+        if not bp.sap_floor_dimensions:
+            raise ValueError(
+                f"{address_line_1!r}, {postcode!r}, "
+                f"building_part {bp.building_part_number!r}: "
+                f"sap_floor_dimensions is empty and cannot be synthesised "
+                f"(is_single_part={is_single_part}, is_flat={is_flat})"
+            )
+        floor_dimensions = [
+            SapFloorDimension(
+                room_height_m=fd.storey_height,
+                total_floor_area_m2=fd.total_floor_area,
+                heat_loss_perimeter_m=perimeter_per_storey,
+                party_wall_length_m=party_length_per_storey,
+                floor=fd.storey,
+                floor_construction=fd.floor_type,
+            )
+            for fd in bp.sap_floor_dimensions
+        ]
 
     if index == 0:
         identifier = BuildingPartIdentifier.MAIN
@@ -2963,6 +3285,17 @@ def _clear_basement_flag_when_system_built(
     return replace(epc, sap_building_parts=new_parts)
 
 
+def _flat_location_int(value: Any) -> int:
+    """`sap_flat_details.flat_location` is the flat's floor number, lodged by the
+    gov API as a plain int on most certs but as a banded string `"20+"` (floor 20
+    or above) on high floors. The `epc_flat_details.flat_location` column is a
+    NOT-NULL integer, so the raw band crashed the modelling_e2e insert. Coerce the
+    band to its floor (`"20+"` → 20); Elmhurst caps the floor number at 30."""
+    if isinstance(value, int):
+        return value
+    return int(str(value).strip().rstrip("+"))
+
+
 def _measurement_value(field: Any) -> float:
     """SAP measurements arrive as a `Measurement` (with `.value`), a raw dict
     {'value': N, 'quantity': '...'} when `from_dict` didn't coerce, or a plain
@@ -3174,6 +3507,88 @@ def _default_missing_post_town(data: Dict[str, Any]) -> Dict[str, Any]:
     return {**data, "post_town": ""}
 
 
+def _derive_built_form_16x(dwelling_type: Any) -> int:
+    """Derive the RdSAP `built_form` code from a cert's `dwelling_type` text when
+    the numeric field is omitted (some 16.0 certs). The form is stated in the
+    description for houses/bungalows ("Mid-terrace house" → 4, "End-terrace" → 3,
+    "Semi-detached" → 2, "Detached" → 1). Flats ("Ground-floor flat") do not encode
+    a form, so fall back to the modal 4 (Mid-terrace) — `built_form` is an ML-only
+    feature the SAP calculator never reads, so the fallback is SAP-neutral.
+
+    `dwelling_type` arrives as a plain string or a `{'value': ...}` dict (real-API
+    shape); both are handled."""
+    if isinstance(dwelling_type, dict):
+        dwelling_type = cast(Dict[str, Any], dwelling_type).get("value")
+    text = str(dwelling_type or "").lower()
+    if "semi-detached" in text:
+        return 2
+    if "detached" in text:
+        return 1
+    if "enclosed end" in text:
+        return 5
+    if "enclosed mid" in text:
+        return 6
+    if "end-terrace" in text:
+        return 3
+    if "mid-terrace" in text or "terrace" in text:
+        return 4
+    return 4  # flats / unstated form → modal built_form (SAP- and gate-neutral)
+
+
+logger = logging.getLogger(__name__)
+
+# The recognised full-SAP schema_type labels: a full-SAP *shape* under one of
+# these is correctly labelled, not a broken schema type. Anything else carrying
+# the full-SAP shape is a mislabel (e.g. the LIG as-designed certs lodged as
+# SAP-Schema-16.x).
+_FULL_SAP_SCHEMA_LABELS: frozenset[str] = frozenset(
+    {
+        "SAP-Schema-17.0",
+        "SAP-Schema-17.1",
+        "SAP-Schema-18.0.0",
+        "SAP-Schema-19.1.0",
+    }
+)
+
+
+def _is_full_sap_assessment(data: Dict[str, Any]) -> bool:
+    """Whether a cert is a full-SAP assessment (vs reduced RdSAP), keyed on the
+    gov-API's own `assessment_type` declaration — the authoritative SAP-vs-RdSAP
+    classification, not a structural proxy. A full-SAP assessment lodges fabric
+    as measured openings + measured U-values; a reduced RdSAP one carries the
+    top-level count fields.
+
+    `assessment_type` separates the entire cert corpus cleanly — every full-SAP
+    schema (SAP-Schema-17.x/18.x and the broken `LIG` 16.x) is `"SAP"`, every
+    reduced cert (RdSAP-Schema-* and the reduced SAP-Schema-16.x) is `"RdSAP"` —
+    and it is independent of the `schema_type` LABEL, which can be broken. The
+    structural signals (`data_type`, `sap_opening_types`) agree with it on the
+    corpus but are derived shape artifacts; `assessment_type` is the meaning."""
+    return data.get("assessment_type") == "SAP"
+
+
+def _is_full_sap_label(schema: str) -> bool:
+    """Whether `schema` is a recognised full-SAP `schema_type` — so a full-SAP
+    *shape* under it is correctly labelled, not a broken schema type."""
+    return schema in _FULL_SAP_SCHEMA_LABELS
+
+
+def _record_broken_schema_type(schema: str, data: Dict[str, Any]) -> None:
+    """Surface a *broken schema type*: a cert whose `schema_type` label disagrees
+    with its structure — the label is not a full-SAP schema, yet the cert is
+    structurally full-SAP. Logged rather than silently rerouted so the unreliable
+    labels and their frequency stay visible (mirrors the skipped-cohort-cert
+    capture), and coverage can grow as new mislabelled shapes surface. e.g. the
+    LIG as-designed certs lodged under SAP-Schema-16.x."""
+    logger.warning(
+        "broken schema_type %r: structurally full-SAP "
+        "(assessment_type=%r) — routing to the full-SAP mapper (uprn=%s)",
+        schema,
+        data.get("assessment_type"),
+        data.get("uprn"),
+    )
+
+
 def _normalize_sap_schema_16_x(data: Dict[str, Any]) -> Dict[str, Any]:
     """Rewrite a `SAP-Schema-16.2`/`16.3` API doc onto the `RdSAP-Schema-17.1`
     shape so it can reuse the tested `from_rdsap_schema_17_1` mapper.
@@ -3210,6 +3625,13 @@ def _normalize_sap_schema_16_x(data: Dict[str, Any]) -> Dict[str, Any]:
     if isinstance(windows, list) and windows:
         window_list: List[Any] = cast(List[Any], windows)
         d.setdefault("window", window_list[0])
+    elif isinstance(windows, dict):
+        # Some 16.x certs (e.g. "High performance glazing" certs 9768-…-7974 /
+        # 8257-…-4992) lodge `windows` as a single dict rather than a list — take
+        # it directly. (These particular certs still fail loud below: they also omit
+        # door_count / habitable_room_count / glazed_area — genuinely insufficient
+        # data — but a windows-as-dict cert that DOES carry the rest now maps.)
+        d.setdefault("window", windows)
     d.setdefault("schema_version_original", d.get("schema_version", ""))
     # Some 16.x certs (notably 16.0) omit `tenure` — RdSapSchema17_1 requires it.
     # It is address/occupancy metadata the SAP cascade never reads, so default a
@@ -3219,6 +3641,37 @@ def _normalize_sap_schema_16_x(data: Dict[str, Any]) -> Dict[str, Any]:
     # still fail loud at from_dict — that is correct, the data is insufficient.
     d.setdefault("tenure", 0)
 
+    # Some 16.x certs (notably 16.3, cert 2628-…-2970) lodge `door_count` but
+    # omit `insulated_door_count` — RdSapSchema17_1 requires it. It is a door
+    # *refinement* (which of the lodged doors are the better-insulated type), not
+    # a core fabric field: an absent value means "no insulated doors recorded", so
+    # default 0 (the conservative RdSAP assumption — all doors take the standard
+    # door U-value; the engine's `insulated_share = insulated/door_count` is then
+    # 0). Mirrors the `tenure` default above. Certs that omit `door_count` itself
+    # still fail loud — that is correct, the fabric data is insufficient.
+    d.setdefault("insulated_door_count", 0)
+
+    # Some 16.x certs (notably 16.0, e.g. cert 8742-6624-9300-2780-4926) lodge
+    # `property_type`/`dwelling_type` but omit `built_form` — RdSapSchema17_1
+    # requires it. `built_form` is an ML-only feature (the SAP-10 calculator never
+    # reads it — only `sap10_ml/transform`), so it is SAP-neutral; and a default is
+    # gate-neutral here (verified — the component-accuracy fixture has no
+    # built-form-missing cert, so unlike `multiple_glazed_proportion` it does not
+    # tip the donor pool). DERIVE it from the dwelling_type description where the
+    # form is stated (houses), falling back to the modal value for flats (whose
+    # dwelling_type — "Ground-floor flat" — does not encode form).
+    if "built_form" not in d:
+        d["built_form"] = _derive_built_form_16x(d.get("dwelling_type"))
+
+    # NB: we deliberately do NOT default `multiple_glazed_proportion` here. A 16.x
+    # cert that omits it (e.g. 16.3 cert 0418-3986-7250-2884-7970) is left to fail
+    # the RdSapSchema17_1 parse and be handled by the cohort skip-and-report path —
+    # synthesising a value (tried `100`) drew the otherwise-unmappable cert into the
+    # EPC-prediction donor pool and tipped near-tie similarity matches, regressing
+    # the frozen-fixture component-accuracy gate (has_hot_water_cylinder 30→29/36,
+    # door_count residual 23→25/36). The field is ML-only (the SAP calc never reads
+    # it), so there is no calc cost to leaving such certs unmapped. See worklist.
+
     # 16.2 lodges glazing in BOTH `multiple_glazing_type` (frequently the "ND"
     # not-defined sentinel) AND the windows[].description. When the numeric field
     # is undefined, honour an explicit "Single glazed" description so it is not
@@ -3928,20 +4381,19 @@ def _api_sheltered_sides(built_form: object) -> Optional[int]:
 #                                               loft-sourced PIV as natural
 #                                               (no added system air change)
 #   6 positive input from outside             → EXTRACT_OR_PIV_OUTSIDE (24c)
-# Code 4 (MVHR, 24a) is DEFERRED: its (24a)m formula needs the lodged
-# heat-recovery efficiency (`mvhr_efficiency_pct`, PCDB Table 326) which the
-# API→cascade path does not yet plumb; mapping it to MVHR with a null
-# efficiency would mis-model it as MV (no recovery), so it stays NATURAL
-# until the efficiency is wired. The extract systems (2/3/6) carry no
-# efficiency, so this slice closes the clean +1.90 SAP over-rate on the
-# MEV/PIV-outside cohort (n=20, 5% within 0.5) — they were silently
-# defaulting to NATURAL, under-stating ventilation heat loss.
+# Code 4 (MVHR, 24a) resolves to MVHR: `cert_to_inputs` reads the lodged
+# heat-recovery efficiency from PCDB Table 323 (per wet-room count) ×
+# Table 329 in-use factor and feeds the §2.6.6 equation (2) credit. The
+# 3 corpus MVHR certs carry a PCDF index (`mechanical_ventilation_index_
+# number`) + wet-room + duct lodgements; an MVHR lodged with no PCDF index
+# falls back to the SAP 10.2 Table 4g default (efficiency 66% × 0.70).
+# The extract systems (2/3/6) carry no efficiency.
 _API_MECHANICAL_VENTILATION_TO_KIND: Final[dict[int, Optional[str]]] = {
     0: None,
     1: "MV",
     2: "EXTRACT_OR_PIV_OUTSIDE",
     3: "EXTRACT_OR_PIV_OUTSIDE",
-    4: None,  # MVHR — efficiency plumbing deferred; treat as natural
+    4: "MVHR",  # balanced whole-house MV with heat recovery (24a)
     5: None,
     6: "EXTRACT_OR_PIV_OUTSIDE",
 }
@@ -5777,12 +6229,16 @@ def _elmhurst_orientation_int(orientation: str) -> int:
 # skylight per the worksheet's (27a) row.
 _ELMHURST_ROOF_WINDOW_U_THRESHOLD: Final[float] = 3.0
 
-# RdSAP 10 §8.2 (PDF p.50) — BPs whose roof type is "Another dwelling
-# above" (A) or "Non-residential space above" (NR) have their own
-# external roof structure with potential rooflights, distinct from a
-# pitched-roof dwelling. Windows lodged against these BPs are routed
-# to `sap_roof_windows` regardless of their U-value.
+# Elmhurst §8 roof types that route an EXTENSION's window to a rooflight:
+# "A Another dwelling above" / "NR Non-residential space above". On an
+# extension BP these score on the worksheet (27a) Roof Windows line (cert
+# 000565 Ext2 [NR] + Ext4 [A]). NOT applied to the Main BP — a Main roof
+# of "A"/"NR" means the whole dwelling sits under another dwelling (a party
+# ceiling with no external roof), so its windows are vertical (simulated
+# case 53 / cert 000565 re-keyed as a mid-floor flat: Main roof "A",
+# External-wall window U 2.0 = vertical, Elmhurst Type "Window").
 _ELMHURST_BP_ROOF_TYPES_WITH_ROOFLIGHTS: Final[tuple[str, ...]] = ("A ", "NR ")
+_ELMHURST_MAIN_BUILDING_PARTS: Final[tuple[str, ...]] = ("Main", "Main Property")
 
 
 def _elmhurst_bp_roof_type(
@@ -5793,7 +6249,7 @@ def _elmhurst_bp_roof_type(
     Returns None when the BP isn't found (single-bp cert with no
     matching extension)."""
     bp = w.building_part
-    if bp in ("Main", "Main Property"):
+    if bp in _ELMHURST_MAIN_BUILDING_PARTS:
         return survey.roof.roof_type
     for ext in survey.extensions:
         if ext.name == bp:
@@ -5827,12 +6283,16 @@ def _is_elmhurst_roof_window(
 
       1. Single-glazed windows are never rooflights — Part L 2006
          minimum glazing for any rooflight is double-glazed.
-      2. BP roof type ∈ {A, NR} → rooflight — the BP has its own
-         external roof structure with rooflights (worksheet (30)
-         External roof + (27a) Roof Windows treatment).
-      3. U > 3.0 W/m²K → rooflight — cohort backstop catching old
-         skylights on pitched roofs (cohort cert 000516 W6).
-      4. Otherwise vertical.
+      2. Explicit "Roof of Room" location → rooflight.
+      3. EXTENSION BP roof type ∈ {A, NR} → rooflight (worksheet (30)
+         External roof + (27a) Roof Windows treatment). EXCLUDES the Main
+         BP: a Main roof of "A"/"NR" is a party ceiling (whole dwelling
+         under another dwelling), so its windows are vertical — simulated
+         case 53 / cert 000565 mid-floor flat (Main roof "A", External-wall
+         window U 2.0, Elmhurst Type "Window").
+      4. U > 3.0 W/m²K AND the BP has a room-in-roof → rooflight — cohort
+         backstop catching old skylights on a sloping ceiling (cert 000516 W6).
+      5. Otherwise vertical.
     """
     if w.glazing_type.startswith("Single"):
         return False
@@ -5841,11 +6301,15 @@ def _is_elmhurst_roof_window(
     # regardless of BP roof type or U-value.
     if "roof of room" in (w.location or "").lower():
         return True
-    bp_roof_type = _elmhurst_bp_roof_type(w, survey)
-    if bp_roof_type is not None and bp_roof_type.startswith(
-        _ELMHURST_BP_ROOF_TYPES_WITH_ROOFLIGHTS
-    ):
-        return True
+    # EXTENSION BP whose roof type is a party ceiling (A / NR) scores its
+    # windows on (27a) — but never the Main BP (a Main "A"/"NR" roof is the
+    # dwelling's own party ceiling; case 53).
+    if w.building_part not in _ELMHURST_MAIN_BUILDING_PARTS:
+        bp_roof_type = _elmhurst_bp_roof_type(w, survey)
+        if bp_roof_type is not None and bp_roof_type.startswith(
+            _ELMHURST_BP_ROOF_TYPES_WITH_ROOFLIGHTS
+        ):
+            return True
     # U > 3.0 backstop, gated on the BP having a room-in-roof. Elmhurst routes a
     # high-U "Double pre 2002" unit through the worksheet's (27a) Roof Windows
     # line regardless of its lodged "External wall" location — but ONLY where the
@@ -5857,6 +6321,21 @@ def _is_elmhurst_roof_window(
     # room-in-roof. The §11 row alone can't separate them; the room-in-roof
     # context is the discriminator (the location string is a §11 lodging
     # artifact, so it is not a reliable vertical signal either).
+    # KNOWN LIMIT (falls through to vertical below) — a roof window on a PLAIN
+    # PITCHED roof (not a room-in-roof, BP roof type not A/NR) with a normal
+    # U <= 3.0 is UNDETECTABLE from the Elmhurst Summary §11. The Summary has
+    # no roof/window "Type" column (that exists only in the U985/P960
+    # *worksheet* input echo, which this pipeline does not read), and such
+    # rooflights lodge with Location "External wall" and the vertical U —
+    # byte-identical to ordinary wall windows. Khalim's "simulated case 46"
+    # exercises this: 2 of its 6 openings are roof windows (worksheet (27a),
+    # combined area 1.70, U_eff 2.1062) yet opening 1 (wall) and opening 2
+    # (roof) read character-for-character the same in §11, so the extractor
+    # cannot separate them. The residual is 29.58 vs Elmhurst 29.68 (both round
+    # to 30) — accepted as a lossy-Summary limit, not a bug. The gov-API path
+    # is unaffected: roof windows carry a dedicated signal there
+    # (`window_wall_type == 4`, see `_api_is_roof_window`; 55 corpus certs /
+    # 124 roof windows routed correctly, worksheet-validated U/solar treatment).
     if not _elmhurst_bp_has_room_in_roof(w, survey):
         return False
     return w.u_value > _ELMHURST_ROOF_WINDOW_U_THRESHOLD
@@ -6942,6 +7421,12 @@ _ELMHURST_GLAZING_LABEL_TO_SAP10: Dict[str, int] = {
     "Single glazing": 1,
     "Double pre 2002": 2,
     "Double between 2002 and 2021": 3,
+    # Year-truncated form of "Double between 2002 and 2021": the trailing
+    # "and 2021" wraps to an adjacent PDF table cell that the extractor
+    # joins away (same artifact as "Triple post or during" below). Same
+    # SAP 10.2 code 3 (DG 2002-2021) — surfaced on the simulated-case-46
+    # multi-attribute worksheet.
+    "Double between 2002": 3,
     "Double with unknown install date": 3,
     "Double with unknown 16 mm or install date more": 3,
     # Elmhurst §11 lodgement of RdSAP-21 schema row 7 "double, known
@@ -7157,6 +7642,22 @@ def _map_elmhurst_main_heating_2(
         and mh2.main_heating_sap_code in _ELECTRIC_SAP_MAIN_HEATING_CODES
     ):
         main_fuel_int = _STANDARD_ELECTRICITY_FUEL_CODE
+    # A fuel-fired second main (room-heater SAP code) whose §14.1 omits the
+    # Fuel Type cell must derive its fuel from the SAP code's Table 4a CATEGORY
+    # — NOT inherit Main 1's fuel below. Mirrors `_elmhurst_secondary_fuel_
+    # from_sap_code` (same modal-fuel + sub-fuel caveat): a wood/coal solid
+    # second main (633) billed at Main 1's electric rate is the dual-main
+    # over-cost (simulated case 47: electric room heaters + solid room heaters
+    # 633). Boiler codes (<601) fall through to the Main-1 inherit (case 6:
+    # one oil boiler feeding rads + underfloor).
+    if main_fuel_int is None:
+        _sc = mh2.main_heating_sap_code
+        if _sc in _ELMHURST_SECONDARY_SOLID_CODES:
+            main_fuel_int = _SECONDARY_FUEL_HOUSE_COAL
+        elif _sc in _ELMHURST_SECONDARY_GAS_CODES:
+            main_fuel_int = _SECONDARY_FUEL_MAINS_GAS
+        elif _sc in _ELMHURST_SECONDARY_LIQUID_CODES:
+            main_fuel_int = _SECONDARY_FUEL_HEATING_OIL
     # §14.1 Main Heating2 often omits the "Fuel Type" cell when the
     # second main system shares Main 1's fuel (simulated case 6: one oil
     # boiler feeding radiators + underfloor, so the Summary lodges the
@@ -7527,6 +8028,7 @@ _ELMHURST_MV_TYPE_TO_KIND: Dict[str, str] = {
     # formula choice; the cascade resolves enum name → enum value when
     # picking which (25)m formula to apply.
     "Mechanical extract, decentralised (MEV dc)": "EXTRACT_OR_PIV_OUTSIDE",
+    "Mechanical ventilation with heat recovery (MVHR)": "MVHR",
 }
 
 
diff --git a/datatypes/epc/domain/tests/test_from_rdsap_schema.py b/datatypes/epc/domain/tests/test_from_rdsap_schema.py
index 77be7628e..07fc7ddb6 100644
--- a/datatypes/epc/domain/tests/test_from_rdsap_schema.py
+++ b/datatypes/epc/domain/tests/test_from_rdsap_schema.py
@@ -191,6 +191,30 @@ class TestFromRdSapSchema20_0_0:
         schema = from_dict(RdSapSchema20_0_0, load("20_0_0.json"))
         return EpcPropertyDataMapper.from_rdsap_schema_20_0_0(schema)
 
+    def test_photovoltaic_supply_as_dict_list_is_mapped_not_crashed(self) -> None:
+        # 20.0.0 types `photovoltaic_supply` as the wrapper only (not the 21.0.x
+        # Union), so a cert lodging measured arrays as a LIST leaves the leaves as
+        # raw dicts. The mapper previously did `es.photovoltaic_supply.none_or_no_
+        # details` → "'list' object has no attribute 'none_or_no_details'", sinking
+        # the whole prediction cohort. Regression for cert 6102-6227-8000-0083-2292
+        # (uprn 22086693). It now routes through `_map_schema_21_pv`, whose
+        # dict-tolerant array reader captures the arrays.
+        data = load("20_0_0.json")
+        data["sap_energy_source"]["photovoltaic_supply"] = [
+            [{"pitch": 2, "peak_power": {"value": 1.14, "quantity": "kW"},
+              "orientation": 5, "overshading": 1}],
+            [{"pitch": 2, "peak_power": 1.14, "orientation": 5, "overshading": 1}],
+        ]
+        schema = from_dict(RdSapSchema20_0_0, data)
+
+        result = EpcPropertyDataMapper.from_rdsap_schema_20_0_0(schema)
+
+        arrays = result.sap_energy_source.photovoltaic_arrays
+        assert arrays is not None and len(arrays) == 2
+        assert arrays[0].peak_power == 1.14
+        assert arrays[0].orientation == 5
+        assert result.sap_energy_source.photovoltaic_supply is None
+
     def test_uprn(self, result: EpcPropertyData) -> None:
         assert result.uprn == 12457
 
@@ -229,6 +253,42 @@ class TestFromRdSapSchema21_0_0:
         schema = from_dict(RdSapSchema21_0_0, load("21_0_0.json"))
         return EpcPropertyDataMapper.from_rdsap_schema_21_0_0(schema)
 
+    def test_optional_fields_omitted_maps_not_crashed(self) -> None:
+        # Real-API 21.0.0 cohort certs omit a set of fields that the dataclass
+        # modelled as required while 21.0.1 already treats as optional. The
+        # modelling_e2e cohort skipped 33 such certs (e.g. 2205-3036-3484-0400-
+        # 5718). This is the exact union of fields those certs omit — all are
+        # optional in 21.0.1; widening 21.0.0 to match maps them into the donor
+        # pool instead of dropping them. (Building-part fields are NOT widened:
+        # the only one those certs omit is roof_insulation_thickness.)
+        data = load("21_0_0.json")
+        for window in data.get("sap_windows", []):
+            for k in ("frame_factor", "glazing_gap", "pvc_frame",
+                      "window_transmission_details"):
+                window.pop(k, None)
+        for k in ("wet_rooms_count", "open_chimneys_count",
+                  "pressure_test_certificate_number", "windows_transmission_details",
+                  "mechanical_ventilation_index_number", "mechanical_vent_duct_type",
+                  "mechanical_vent_duct_placement", "mechanical_vent_duct_insulation",
+                  "mechanical_vent_duct_insulation_level",
+                  "mechanical_vent_measured_installation", "insulated_door_u_value",
+                  "low_energy_fixed_lighting_bulbs_count",
+                  "cfl_fixed_lighting_bulbs_count", "led_fixed_lighting_bulbs_count",
+                  "suggested_improvements"):
+            data.pop(k, None)
+        data["sap_energy_source"].pop("wind_turbine_details", None)
+        data["sap_energy_source"].pop("pv_battery_count", None)
+        for bp in data.get("sap_building_parts", []):
+            bp.pop("roof_insulation_thickness", None)
+
+        schema = from_dict(RdSapSchema21_0_0, data)
+        result = EpcPropertyDataMapper.from_rdsap_schema_21_0_0(schema)
+
+        assert result.uprn == 12457
+        # coalesced, not None → safe for the NOT-NULL epc_property column
+        assert result.wet_rooms_count == 0
+        assert result.open_chimneys_count == 0
+
     def test_uprn(self, result: EpcPropertyData) -> None:
         assert result.uprn == 12457
 
@@ -355,6 +415,66 @@ class TestFromRdSapSchema21_0_1:
 
     # --- general ---
 
+    def test_omitted_wet_rooms_count_defaults_to_zero_not_none(self) -> None:
+        # 21.0.1 lodges wet_rooms_count as Optional, so a cert that omits it
+        # mapped to EpcPropertyData.wet_rooms_count=None. That None then
+        # violated the epc_property.wet_rooms_count NOT-NULL constraint when a
+        # predicted EPC (which deep-copies a comparable template) was persisted,
+        # and would crash the calc's `wet_rooms_count > 0` check. 37 modelling_e2e
+        # properties failed on the 2026-06-23 run for this reason. Default to 0,
+        # matching every other mapper (RdSAP 0 → calc's Table-?? minimum 1 fan).
+        data = load("21_0_1.json")
+        data.pop("wet_rooms_count", None)
+        schema = from_dict(RdSapSchema21_0_1, data)
+
+        result = EpcPropertyDataMapper.from_rdsap_schema_21_0_1(schema)
+
+        assert result.wet_rooms_count == 0
+
+    def test_omitted_open_chimneys_count_defaults_to_zero_not_none(self) -> None:
+        data = load("21_0_1.json")
+        data.pop("open_chimneys_count", None)
+        schema = from_dict(RdSapSchema21_0_1, data)
+
+        result = EpcPropertyDataMapper.from_rdsap_schema_21_0_1(schema)
+
+        assert result.open_chimneys_count == 0
+
+    def test_omitted_cfl_fixed_lighting_bulbs_count_defaults_to_zero_not_none(self) -> None:
+        data = load("21_0_1.json")
+        data.pop("cfl_fixed_lighting_bulbs_count", None)
+        schema = from_dict(RdSapSchema21_0_1, data)
+
+        result = EpcPropertyDataMapper.from_rdsap_schema_21_0_1(schema)
+
+        assert result.cfl_fixed_lighting_bulbs_count == 0
+
+    def test_omitted_led_fixed_lighting_bulbs_count_defaults_to_zero_not_none(self) -> None:
+        data = load("21_0_1.json")
+        data.pop("led_fixed_lighting_bulbs_count", None)
+        schema = from_dict(RdSapSchema21_0_1, data)
+
+        result = EpcPropertyDataMapper.from_rdsap_schema_21_0_1(schema)
+
+        assert result.led_fixed_lighting_bulbs_count == 0
+
+    def test_banded_flat_location_string_coerced_to_band_floor_int(self) -> None:
+        # The gov API lodges flat_location (the flat's floor number) as a plain
+        # int on most certs, but on high floors as a banded string "20+" (floor
+        # 20 or above) — e.g. cert 2481-2122-4211-1172-4722 (UPRN 6027561).
+        # The epc_flat_details.flat_location column is a NOT-NULL integer, so the
+        # raw string crashed the modelling_e2e insert (psycopg2
+        # InvalidTextRepresentation, portfolio 796 run). Coerce the band to its
+        # floor (20); Elmhurst caps the floor number at 30.
+        data = load("21_0_1.json")
+        data["sap_flat_details"]["flat_location"] = "20+"
+        schema = from_dict(RdSapSchema21_0_1, data)
+
+        result = EpcPropertyDataMapper.from_rdsap_schema_21_0_1(schema)
+
+        assert result.sap_flat_details is not None
+        assert result.sap_flat_details.flat_location == 20
+
     def test_uprn(self, result: EpcPropertyData) -> None:
         assert result.uprn == 12457
 
@@ -2357,3 +2477,281 @@ class TestNonSeparatedConservatoryApiMirror:
         # Assert — §6.2: disregarded; no conservatory geometry.
         assert epc.sap_conservatory is None
         assert conservatory_geometry(epc) is None
+
+
+class TestNonSeparatedConservatoryApiMirror19_0:
+    """RdSAP 10 §6.1 — the same glazed-BP conservatory the 21.0.1 mapper
+    handles is also lodged on RdSAP-Schema-19.0 (repro cert 718138). The four
+    glazed fields were undeclared on the 19.0 `SapBuildingPart`, so `from_dict`
+    dropped them: the conservatory mapped to a fabric-less building part that
+    mis-scored and could not persist (NOT-NULL `construction_age_band`). The
+    19.0 mapper now mirrors the 21.0.1 split.
+
+    Unlike 21.0.1, the 19.0 mapper keeps the **lodged** `total_floor_area`
+    scalar (a real 19.0 cert already lodges the non-separated conservatory in
+    it — 718138: dwelling 140.23 + conservatory 9.71 = 149.94 → lodged 150), so
+    appending a conservatory does NOT change `total_floor_area_m2`. The §6.1
+    floor-area fold reaches the score through the calculator's dimensions, not
+    through the scalar."""
+
+    def test_from_api_response_splits_out_conservatory_building_part(
+        self,
+    ) -> None:
+        # Arrange — the 19.0 dwelling plus a non-separated double-glazed
+        # conservatory glazed BP.
+        from datatypes.epc.domain.epc_property_data import SapConservatory
+        from domain.sap10_calculator.worksheet.conservatory import (
+            conservatory_geometry,
+        )
+
+        dwelling_part_count = len(
+            EpcPropertyDataMapper.from_api_response(load("19_0.json")).sap_building_parts
+        )
+
+        cert = load("19_0.json")
+        cert["conservatory_type"] = 4
+        cert["sap_building_parts"].append(
+            {
+                "floor_area": 12.0,
+                "room_height": 1,
+                "double_glazed": "Y",
+                "glazed_perimeter": 9.0,
+            }
+        )
+
+        # Act
+        epc = EpcPropertyDataMapper.from_api_response(cert)
+
+        # Assert — conservatory split out; the glazed BP is NOT a fabric part.
+        assert epc.sap_conservatory == SapConservatory(
+            floor_area_m2=12.0,
+            glazed_perimeter_m=9.0,
+            double_glazed=True,
+            thermally_separated=False,
+            room_height_storeys=1.0,
+        )
+        assert len(epc.sap_building_parts) == dwelling_part_count
+        # §6.1 fold is active (surfaces derived by the shared cascade).
+        assert conservatory_geometry(epc) is not None
+
+    def test_separated_conservatory_lodges_no_glazed_building_part(self) -> None:
+        # Arrange — a separated conservatory (type 2/3) lodges NO glazed BP;
+        # the dwelling is unchanged.
+        from domain.sap10_calculator.worksheet.conservatory import (
+            conservatory_geometry,
+        )
+
+        cert = load("19_0.json")
+        cert["conservatory_type"] = 2
+
+        # Act
+        epc = EpcPropertyDataMapper.from_api_response(cert)
+
+        # Assert — §6.2: disregarded; no conservatory geometry.
+        assert epc.sap_conservatory is None
+        assert conservatory_geometry(epc) is None
+
+
+class TestNonSeparatedConservatoryApiMirror20_0_0:
+    """RdSAP 10 §6.1 — the same glazed-BP conservatory, on RdSAP-Schema-20.0.0.
+    Surfaced by the modelling_e2e triage: 5 type-4 certs (e.g. property 725213)
+    failed `NotNullViolation: construction_age_band` because the 20.0.0 schema
+    declared none of the four glazed fields, so the conservatory mapped to a
+    null-age fabric part. Mirrors the 19.0 / 21.0.1 split."""
+
+    def test_from_api_response_splits_out_conservatory_building_part(
+        self,
+    ) -> None:
+        from datatypes.epc.domain.epc_property_data import SapConservatory
+        from domain.sap10_calculator.worksheet.conservatory import (
+            conservatory_geometry,
+        )
+
+        dwelling_part_count = len(
+            EpcPropertyDataMapper.from_api_response(load("20_0_0.json")).sap_building_parts
+        )
+
+        cert = load("20_0_0.json")
+        cert["conservatory_type"] = 4
+        cert["sap_building_parts"].append(
+            {
+                "floor_area": 12.0,
+                "room_height": 1,
+                "double_glazed": "Y",
+                "glazed_perimeter": 9.0,
+            }
+        )
+
+        # Act
+        epc = EpcPropertyDataMapper.from_api_response(cert)
+
+        # Assert — conservatory split out; the glazed BP is NOT a fabric part
+        # (so it never hits the NOT-NULL construction_age_band on persist).
+        assert epc.sap_conservatory == SapConservatory(
+            floor_area_m2=12.0,
+            glazed_perimeter_m=9.0,
+            double_glazed=True,
+            thermally_separated=False,
+            room_height_storeys=1.0,
+        )
+        assert len(epc.sap_building_parts) == dwelling_part_count
+        assert all(
+            bp.construction_age_band is not None for bp in epc.sap_building_parts
+        )
+        assert conservatory_geometry(epc) is not None
+
+    def test_separated_conservatory_lodges_no_glazed_building_part(self) -> None:
+        from domain.sap10_calculator.worksheet.conservatory import (
+            conservatory_geometry,
+        )
+
+        cert = load("20_0_0.json")
+        cert["conservatory_type"] = 2
+
+        # Act
+        epc = EpcPropertyDataMapper.from_api_response(cert)
+
+        # Assert — §6.2: disregarded; no conservatory geometry.
+        assert epc.sap_conservatory is None
+        assert conservatory_geometry(epc) is None
+
+
+@pytest.mark.parametrize("fixture", ["17_0.json", "17_1.json", "18_0.json"])
+def test_gov_mappers_split_non_separated_conservatory(fixture: str) -> None:
+    """RdSAP 10 §6.1 — every gov mapper splits a non-separated conservatory
+    (conservatory_type=4) glazed BP out of the fabric parts and into
+    `sap_conservatory`, so it never persists as a null-age fabric part (the
+    modelling_e2e `construction_age_band` NOT-NULL triage). 19.0 / 20.0.0 /
+    21.0.1 are covered by their own classes; this pins the rest.
+
+    21.0.0 is intentionally excluded: unlike every other gov schema it never
+    adopted the ADR-0027 "every SapBuildingPart field is Optional" treatment, so
+    a sparse conservatory part fails `from_dict` on its required fields. Porting
+    it needs that broader strictness change — tracked as a follow-up; no 21.0.0
+    conservatory cert surfaced in the triage."""
+    from datatypes.epc.domain.epc_property_data import SapConservatory
+
+    base_parts = len(
+        EpcPropertyDataMapper.from_api_response(load(fixture)).sap_building_parts
+    )
+    cert = load(fixture)
+    cert["conservatory_type"] = 4
+    cert["sap_building_parts"].append(
+        {"floor_area": 12.0, "room_height": 1, "double_glazed": "Y", "glazed_perimeter": 9.0}
+    )
+
+    # Act
+    epc = EpcPropertyDataMapper.from_api_response(cert)
+
+    # Assert — split out, not a (null-age) fabric part.
+    assert epc.sap_conservatory == SapConservatory(
+        floor_area_m2=12.0,
+        glazed_perimeter_m=9.0,
+        double_glazed=True,
+        thermally_separated=False,
+        room_height_storeys=1.0,
+    )
+    assert len(epc.sap_building_parts) == base_parts
+    assert all(bp.construction_age_band is not None for bp in epc.sap_building_parts)
+
+
+@pytest.mark.parametrize(
+    "schema_cls, mapper, fixture, expected",
+    [
+        (
+            RdSapSchema17_1,
+            EpcPropertyDataMapper.from_rdsap_schema_17_1,
+            "17_1.json",
+            "Programmer and room thermostat",
+        ),
+        (
+            RdSapSchema18_0,
+            EpcPropertyDataMapper.from_rdsap_schema_18_0,
+            "18_0.json",
+            "Programmer, room thermostat and TRVs",
+        ),
+        (
+            RdSapSchema19_0,
+            EpcPropertyDataMapper.from_rdsap_schema_19_0,
+            "19_0.json",
+            "Programmer, room thermostat and TRVs",
+        ),
+        (
+            RdSapSchema20_0_0,
+            EpcPropertyDataMapper.from_rdsap_schema_20_0_0,
+            "20_0_0.json",
+            "Programmer, room thermostat and TRVs",
+        ),
+        (
+            RdSapSchema21_0_0,
+            EpcPropertyDataMapper.from_rdsap_schema_21_0_0,
+            "21_0_0.json",
+            "Programmer, room thermostat and TRVs",
+        ),
+    ],
+)
+def test_rdsap_mappers_carry_main_heating_controls_display(
+    schema_cls: Any, mapper: Any, fixture: str, expected: str
+) -> None:
+    # "Heating Control" panel row. 17.0 and 21.0.1 already map it; these five
+    # dropped it, leaving the FE "Unknown" despite the cert lodging it. Display
+    # only — the calculator reads the control CODE separately (ADR-0037 family).
+    schema = from_dict(schema_cls, load(fixture))
+
+    result = mapper(schema)
+
+    assert result.main_heating_controls is not None
+    assert result.main_heating_controls.description == expected
+
+
+@pytest.mark.parametrize(
+    "schema_cls, mapper, fixture",
+    [
+        (RdSapSchema17_1, EpcPropertyDataMapper.from_rdsap_schema_17_1, "17_1.json"),
+        (RdSapSchema18_0, EpcPropertyDataMapper.from_rdsap_schema_18_0, "18_0.json"),
+        (RdSapSchema20_0_0, EpcPropertyDataMapper.from_rdsap_schema_20_0_0, "20_0_0.json"),
+        (RdSapSchema19_0, EpcPropertyDataMapper.from_rdsap_schema_19_0, "19_0.json"),
+        (RdSapSchema21_0_0, EpcPropertyDataMapper.from_rdsap_schema_21_0_0, "21_0_0.json"),
+    ],
+)
+def test_rdsap_mappers_map_mechanical_ventilation_kind(
+    schema_cls: Any, mapper: Any, fixture: str
+) -> None:
+    # Calc-facing: an MVHR cert (mechanical_ventilation=4) must reach the §2
+    # ventilation cascade as MVHR, not be silently treated as natural. 17.1 /
+    # 18.0 / 20.0.0 built a bare SapVentilation(sheltered_sides=…) and dropped
+    # the top-level mechanical_ventilation (fixed in #1333); 19.0 + 21.0.0 set
+    # no sap_ventilation at all, dropping the whole block (fixed here — the
+    # remaining ADR-0037 ventilation follow-up). 17.0 + 21.0.1 + full-SAP
+    # already map it (via _sap_17_1_ventilation / their own wiring). Natural
+    # certs (code 0/5 → None) are unchanged, so the fix only moves genuine
+    # MEV/MVHR certs.
+    data = load(fixture)
+    data["mechanical_ventilation"] = 4
+
+    result = mapper(from_dict(schema_cls, data))
+
+    assert result.sap_ventilation.mechanical_ventilation_kind == "MVHR"
+
+
+@pytest.mark.parametrize(
+    "schema_cls, mapper, fixture",
+    [
+        (RdSapSchema19_0, EpcPropertyDataMapper.from_rdsap_schema_19_0, "19_0.json"),
+        (RdSapSchema21_0_0, EpcPropertyDataMapper.from_rdsap_schema_21_0_0, "21_0_0.json"),
+    ],
+)
+def test_rdsap_19_0_21_0_0_construct_sap_ventilation_block(
+    schema_cls: Any, mapper: Any, fixture: str
+) -> None:
+    # 19.0 + 21.0.0 previously passed no `sap_ventilation=` at all → the
+    # EpcPropertyData default empty SapVentilation, dropping the entire §2
+    # block (sheltered_sides + kind). Mirroring 21.0.1, they now construct it.
+    # `sheltered_sides` derives from built_form per §S5 (both fixtures lodge
+    # built_form=2 Semi-Detached → 1 sheltered side); a missing/empty block
+    # would leave it None and over-count shelter via the cascade default of 2.
+    schema = from_dict(schema_cls, load(fixture))
+
+    result = mapper(schema)
+
+    assert result.sap_ventilation.sheltered_sides == 1
diff --git a/datatypes/epc/domain/tests/test_from_sap_schema.py b/datatypes/epc/domain/tests/test_from_sap_schema.py
index 64b6ee5c0..08bff90a4 100644
--- a/datatypes/epc/domain/tests/test_from_sap_schema.py
+++ b/datatypes/epc/domain/tests/test_from_sap_schema.py
@@ -11,6 +11,7 @@ exercise the shape variation the design decisions hinge on
 """
 
 import json
+import logging
 import os
 from typing import Any, Dict
 
@@ -77,6 +78,137 @@ class TestFromSapSchema17_1Tracer:
         assert result.total_floor_area_m2 == 68.0
 
 
+class TestFromSapSchema17_1RebaselineFields:
+    """The calc-affecting categoricals the WIP mapper dropped (ADR-0037). Their
+    absence left the full-SAP family un-rebaselined and mis-scored, producing the
+    portfolio-796 "impossible downgrade"."""
+
+    def test_maps_sap_version_so_pre_sap10_rebaseline_can_fire(self) -> None:
+        # The full-SAP family lodges SAP 2012 (sap_version 9.92). Without it on
+        # the EpcPropertyData, CalculatorRebaseliner cannot fire trigger (a)
+        # (`sap_version < 10.2` → Effective = Calculated), so Effective
+        # Performance wrongly stays equal to the lodged SAP-2012 score while the
+        # plan models the SAP-10.2 calc — the impossible downgrade.
+        schema = from_dict(SapSchema17_1, load("sap_17_1.json"))
+
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+        assert result.sap_version == 9.92
+
+    def test_maps_property_type_as_gov_code_string(self) -> None:
+        # property_type feeds the calculator (heat_transmission `_is_house` /
+        # `_is_flat_or_maisonette` drive party-wall + heat-loss handling). Left
+        # None, the dwelling is classified as neither → degraded SAP. The fixture
+        # is a flat (gov code 2); mapped as a string like from_rdsap_schema_17_1.
+        schema = from_dict(SapSchema17_1, load("sap_17_1.json"))
+
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+        assert result.property_type == "2"
+
+    def test_maps_built_form_as_gov_code_string(self) -> None:
+        # built_form (gov code 1 in the fixture) → str, mirroring
+        # from_rdsap_schema_17_1; carried for the calculator's exposed-side /
+        # sheltered handling and the property-details panel.
+        schema = from_dict(SapSchema17_1, load("sap_17_1.json"))
+
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+        assert result.built_form == "1"
+
+    def test_maps_secondary_heating_element(self) -> None:
+        # secondary_heating is read by the calculator (cert_to_inputs) — dropping
+        # it under-counts a real secondary heater. The fixture lodges "None" (no
+        # secondary); assert it's carried through rather than silently dropped.
+        schema = from_dict(SapSchema17_1, load("sap_17_1.json"))
+
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+        assert result.secondary_heating is not None
+        assert result.secondary_heating.description == "None"
+
+    def test_maps_assessment_type(self) -> None:
+        # Full-SAP certs lodge assessment_type "SAP"; carried for provenance and
+        # the property-details panel, mirroring from_rdsap_schema_17_1.
+        schema = from_dict(SapSchema17_1, load("sap_17_1.json"))
+
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+        assert result.assessment_type == "SAP"
+
+
+class TestFromSapSchema17_1DisplayElements:
+    """Display EnergyElements the WIP mapper dropped, leaving the FE
+    property-details panel "Unknown" for full-SAP certs (ADR-0037). Brings
+    full-SAP to parity with from_rdsap_schema_17_1's display coverage."""
+
+    @pytest.fixture
+    def result(self) -> EpcPropertyData:
+        schema = from_dict(SapSchema17_1, load("sap_17_1.json"))
+        return EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+    def test_maps_main_heating_display_list(self, result: EpcPropertyData) -> None:
+        assert [e.description for e in result.main_heating] == [
+            "Boiler and radiators, mains gas"
+        ]
+
+    def test_maps_window_display_element(self, result: EpcPropertyData) -> None:
+        assert result.window is not None
+        assert result.window.description == "High performance glazing"
+
+    def test_maps_lighting_display_element(self, result: EpcPropertyData) -> None:
+        assert result.lighting is not None
+        assert result.lighting.description == "Low energy lighting in all fixed outlets"
+
+    def test_maps_hot_water_display_element(self, result: EpcPropertyData) -> None:
+        assert result.hot_water is not None
+        assert result.hot_water.description == "From main system"
+
+    def test_maps_main_heating_controls_display_element(
+        self, result: EpcPropertyData
+    ) -> None:
+        # "Heating Control" panel row. Full-SAP lodges it as a list; mirror the
+        # 21.0.1 mapper and take the first control system.
+        assert result.main_heating_controls is not None
+        assert (
+            result.main_heating_controls.description
+            == "Time and temperature zone control"
+        )
+
+
+class TestFullSapHasHotWaterCylinderFallback:
+    """Some full-SAP certs (e.g. SAP-Schema-17.0 cert 8265-7433-3220-9736-7902)
+    omit the top-level `has_hot_water_cylinder` and lodge it only under
+    `sap_heating`. The required top-level field made `from_dict` raise; it is now
+    optional and the mapper falls back to the nested value."""
+
+    def test_top_level_omitted_falls_back_to_sap_heating(self) -> None:
+        # Arrange — drop the top-level flag, keep the nested one ("true").
+        data = load("sap_17_1.json")
+        data.pop("has_hot_water_cylinder", None)
+        data["sap_heating"]["has_hot_water_cylinder"] = "true"
+
+        # Act
+        schema = from_dict(SapSchema17_1, data)
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+        # Assert — resolved from sap_heating, not crashed
+        assert result.has_hot_water_cylinder is True
+
+    def test_top_level_omitted_nested_false_resolves_false(self) -> None:
+        # Arrange
+        data = load("sap_17_1.json")
+        data.pop("has_hot_water_cylinder", None)
+        data["sap_heating"]["has_hot_water_cylinder"] = "false"
+
+        # Act
+        schema = from_dict(SapSchema17_1, data)
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+        # Assert
+        assert result.has_hot_water_cylinder is False
+
+
 class TestFromSapSchema17_1FabricDescriptions:
     """Slice 3 (D4): the measured-U fabric descriptions flow through to
     epc.walls/floors/roofs so the engine's u_wall/u_floor/u_roof can parse
@@ -245,6 +377,22 @@ class TestFromSapSchema17_1RoofWindows:
         result = self._map("sap_17_1.json")
         assert not result.sap_roof_windows
 
+    def test_rooflight_opening_type_6_maps_as_roof_window(self) -> None:
+        # SAP-19.1.0 certs lodge rooflights as opening-type 6 ("Ext Rooflight").
+        # SAP 10.2 treats roof windows and rooflights as the same inclined-glazing
+        # family, so code 6 maps onto sap_roof_windows like code 5 — previously it
+        # raised UnmappedApiCode and skipped the whole cert.
+        data = load("sap_17_1_house.json")
+        for ot in data["sap_opening_types"]:
+            if ot["type"] == 5:
+                ot["type"] = 6
+        schema = from_dict(SapSchema17_1, data)
+
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+
+        assert result.sap_roof_windows is not None
+        assert len(result.sap_roof_windows) == 2
+
 
 class TestFromSapSchema17_1UnknownOpeningType:
     """Slice 4d (D2): an opening-type code outside {1,2,3 door, 4 window,
@@ -324,7 +472,7 @@ class TestFromSapSchema17_1CodeBasedHeating:
 
 
 class TestFromSapSchema17_1Ventilation:
-    """Slice D5-vent: full-SAP sap_ventilation → measured air permeability (AP4),
+    """Slice D5-vent: full-SAP sap_ventilation → measured air permeability (AP50),
     ventilation_type → MechanicalVentilationKind, sheltered sides, wet rooms and
     the MEV PCDB index."""
 
@@ -333,9 +481,13 @@ class TestFromSapSchema17_1Ventilation:
         schema = from_dict(SapSchema17_1, load("sap_17_1.json"))
         return EpcPropertyDataMapper.from_sap_schema_17_1(schema)
 
-    def test_measured_air_permeability_fed_as_ap4(self, sample: EpcPropertyData) -> None:
+    def test_measured_air_permeability_fed_as_ap50(self, sample: EpcPropertyData) -> None:
+        # The lodged `air_permeability` is a q50 Blower-Door result, so it feeds the
+        # engine's AP50 path `(18) = AP50/20 + (8)` — NOT the AP4/Pulse formula
+        # `0.263 × AP4^0.924` (the air-permeability AP50 fix, uprn_10093116528).
         assert sample.sap_ventilation is not None
-        assert sample.sap_ventilation.air_permeability_ap4_m3_h_m2 == 2.6
+        assert sample.sap_ventilation.air_permeability_ap50_m3_h_m2 == 2.6
+        assert sample.sap_ventilation.air_permeability_ap4_m3_h_m2 is None
 
     def test_ventilation_type_6_is_extract(self, sample: EpcPropertyData) -> None:
         # ventilation_type 6 = MEV decentralised → EXTRACT_OR_PIV_OUTSIDE.
@@ -357,6 +509,31 @@ class TestFromSapSchema17_1Ventilation:
         with pytest.raises(UnmappedApiCode):
             EpcPropertyDataMapper.from_sap_schema_17_1(schema)
 
+    @pytest.mark.parametrize("code", [9, 10])
+    def test_natural_ventilation_codes_9_and_10_map_to_none(self, code: int) -> None:
+        data = load("sap_17_1.json")
+        data["sap_ventilation"]["ventilation_type"] = code
+        schema = from_dict(SapSchema17_1, data)
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+        assert result.sap_ventilation is not None
+        assert result.sap_ventilation.mechanical_ventilation_kind is None
+
+    def test_ventilation_type_7_is_mv(self) -> None:
+        data = load("sap_17_1.json")
+        data["sap_ventilation"]["ventilation_type"] = 7
+        schema = from_dict(SapSchema17_1, data)
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+        assert result.sap_ventilation is not None
+        assert result.sap_ventilation.mechanical_ventilation_kind == "MV"
+
+    def test_ventilation_type_8_is_mvhr(self) -> None:
+        data = load("sap_17_1.json")
+        data["sap_ventilation"]["ventilation_type"] = 8
+        schema = from_dict(SapSchema17_1, data)
+        result = EpcPropertyDataMapper.from_sap_schema_17_1(schema)
+        assert result.sap_ventilation is not None
+        assert result.sap_ventilation.mechanical_ventilation_kind == "MVHR"
+
 
 class TestFromSapSchema17_1Heating:
     """Slice D6: full-SAP sap_heating (differing field names) maps onto the
@@ -506,7 +683,10 @@ class TestFromSapSchema16_2:
         epc = EpcPropertyDataMapper.from_api_response(load("sap_18_0_0.json"))
         assert isinstance(epc, EpcPropertyData)
         assert epc.uprn == 10094601287
-        assert Sap10Calculator().calculate(epc).sap_score == 80  # lodged 84
+        # 80 -> 81 (closer to lodged 84) after the dMEV intermittent-fan fix:
+        # this cert is EXTRACT_OR_PIV_OUTSIDE with a lodged 0 fans, so the
+        # Table 5 age-band default is no longer substituted (SAP 10.2 §2 (7a)).
+        assert Sap10Calculator().calculate(epc).sap_score == 81  # lodged 84
 
     def test_16_0_dispatches_via_16_x_path_with_tenure_default(self) -> None:
         # SAP-Schema-16.0 is the same reduced-field 16.x shape; it omits the
@@ -519,6 +699,80 @@ class TestFromSapSchema16_2:
         assert epc.uprn == 100020933894
         assert Sap10Calculator().calculate(epc).sap_score == 61  # lodged 56
 
+    def test_16_x_missing_built_form_is_derived_from_dwelling_type(self) -> None:
+        # Some 16.0 certs (e.g. cert 8742-6624-9300-2780-4926) lodge
+        # `property_type`/`dwelling_type` but omit `built_form`, which RdSapSchema17_1
+        # requires — previously aborted the prediction cohort. The normaliser derives
+        # it from the dwelling_type text ("Semi-detached house" → 2). built_form is
+        # ML-only (SAP calc never reads it), so this is SAP- and gate-neutral.
+        data = load("sap_16_0.json")
+        del data["built_form"]
+        assert data["dwelling_type"] == "Semi-detached house"
+
+        epc = EpcPropertyDataMapper.from_api_response(data)
+
+        assert isinstance(epc, EpcPropertyData)
+        assert epc.built_form == "2"
+
+    def test_16_x_missing_built_form_for_flat_falls_back_to_modal(self) -> None:
+        # A flat's dwelling_type ("Ground-floor flat") does not encode a form, so the
+        # derivation falls back to the modal 4 (Mid-terrace) — keeps the cert mappable.
+        data = load("sap_16_0.json")
+        del data["built_form"]
+        data["dwelling_type"] = "Ground-floor flat"
+
+        epc = EpcPropertyDataMapper.from_api_response(data)
+
+        assert epc.built_form == "4"
+
+    def test_16_x_missing_insulated_door_count_defaults_to_zero(self) -> None:
+        # Some 16.x certs lodge `door_count` but omit `insulated_door_count`,
+        # which RdSapSchema17_1 requires — previously raised "missing required
+        # field 'insulated_door_count'", aborting the whole prediction cohort
+        # (EpcComparablePropertiesRepository.candidates_for maps every cohort
+        # cert in one list comprehension, so one unmappable cert killed the
+        # predict_epc path). Regression for cert 2628-3046-6233-4584-2970
+        # (SAP-Schema-16.3, uprn 100061905751) seen via modelling_e2e property
+        # 730259. The normaliser defaults the missing count to 0 — no insulated
+        # doors recorded, the conservative RdSAP assumption.
+        data = load("sap_16_3.json")
+        del data["insulated_door_count"]
+        assert "insulated_door_count" not in data
+
+        epc = EpcPropertyDataMapper.from_api_response(data)
+
+        assert isinstance(epc, EpcPropertyData)
+        assert epc.insulated_door_count == 0
+
+    def test_16_x_missing_multiple_glazed_proportion_fails_loud(self) -> None:
+        # A 16.x cert omitting `multiple_glazed_proportion` (e.g. 16.3 cert
+        # 0418-3986-7250-2884-7970) is deliberately NOT defaulted — it fails the
+        # RdSapSchema17_1 parse and is handled by the cohort skip-and-report path.
+        # Synthesising a value drew the otherwise-unmappable cert into the
+        # EPC-prediction donor pool and regressed the component-accuracy gate;
+        # the field is ML-only so there is no calc cost to leaving it unmapped.
+        data = load("sap_16_3.json")
+        del data["multiple_glazed_proportion"]
+
+        with pytest.raises(
+            ValueError, match="missing required field 'multiple_glazed_proportion'"
+        ):
+            EpcPropertyDataMapper.from_api_response(data)
+
+    def test_recorded_co2_as_measurement_dict_is_coerced_not_crashed(self) -> None:
+        # Some certs (e.g. 16.x cert 2308-4997-7262-0137-9930) lodge
+        # `co2_emissions_current` as a Measurement dict {'value': 3.5, 'quantity':
+        # 'tonnes per year'} rather than a plain number. `_with_recorded_performance`
+        # previously did `float(co2)` → "float() argument must be ... not 'dict'",
+        # crashing the whole prediction cohort. It now coerces via _measurement_value.
+        data = load("sap_16_3.json")
+        data["co2_emissions_current"] = {"value": 3.5, "quantity": "tonnes per year"}
+
+        epc = EpcPropertyDataMapper.from_api_response(data)
+
+        assert isinstance(epc, EpcPropertyData)
+        assert epc.co2_emissions_current == 3.5
+
     def test_16_2_normalizer_does_not_mutate_caller_dict(self) -> None:
         # Mirror _normalize_shower_outlets' contract: the caller's dict is
         # untouched (deep copy), so a re-dispatch sees the original shape.
@@ -527,3 +781,149 @@ class TestFromSapSchema16_2:
         EpcPropertyDataMapper.from_api_response(data)
         assert "window" not in data  # the rename landed only on the copy
         assert set(data.keys()) == before_keys
+
+
+class TestFullSapSchema16xRouting:
+    """The `SAP-Schema-16.x` name covers two structurally different certs: the
+    reduced RdSAP shape (top-level `door_count`/`glazed_area`) AND full SAP (the
+    as-designed `LIG-*` new-builds — `assessment_type=SAP`, measured
+    `sap_opening_types` + structured `sap_building_parts`, doors lodged as
+    openings not a top-level count). Dispatch must route each to its own mapper;
+    sending a full-SAP cert through the reduced normaliser failed loud with
+    `RdSapSchema17_1: missing required field 'door_count'`."""
+
+    def test_full_sap_16_x_cert_maps_via_full_sap_path(self) -> None:
+        # Arrange — a real full-SAP cert lodged under SAP-Schema-16.0 (cert
+        # 0293-3880-6151-9872-8795, lodged 83) that previously raised the
+        # missing-door_count ValueError in the reduced normaliser.
+        data = load("sap_16_0_full.json")
+
+        # Act
+        epc = EpcPropertyDataMapper.from_api_response(data)
+
+        # Assert — mapped from the real measured openings, not reduced-field
+        # defaults: the single lodged door opening (0.9 x 2.1 m) → door_count 1.
+        assert isinstance(epc, EpcPropertyData)
+        assert epc.door_count == 1
+        assert epc.dwelling_type == "Detached house"
+
+    def test_reduced_16_x_cert_unaffected_by_full_sap_routing(self) -> None:
+        # Arrange — a reduced 16.2 cert (assessment_type RdSAP) must stay on the
+        # RdSAP path, keeping its top-level property_type.
+        data = load("sap_16_2.json")
+
+        # Act
+        epc = EpcPropertyDataMapper.from_api_response(data)
+
+        # Assert
+        assert epc.property_type is not None
+
+    def test_broken_schema_type_is_recorded(
+        self, caplog: pytest.LogCaptureFixture
+    ) -> None:
+        # Arrange — a full-SAP cert mislabelled as SAP-Schema-16.0: the label
+        # disagrees with the assessment_type, so the mismatch must be surfaced
+        # (not silently rerouted).
+        data = load("sap_16_0_full.json")
+
+        # Act
+        with caplog.at_level(logging.WARNING, logger="datatypes.epc.domain.mapper"):
+            EpcPropertyDataMapper.from_api_response(data)
+
+        # Assert
+        assert any(
+            "broken schema_type" in r.message and "SAP-Schema-16.0" in r.message
+            for r in caplog.records
+        )
+
+    def test_correctly_labelled_full_sap_is_not_recorded_as_broken(
+        self, caplog: pytest.LogCaptureFixture
+    ) -> None:
+        # Arrange — a correctly-labelled full-SAP cert: assessment_type SAP AND a
+        # recognised full-SAP label, so no mismatch to record.
+        data = load("sap_17_1.json")
+
+        # Act
+        with caplog.at_level(logging.WARNING, logger="datatypes.epc.domain.mapper"):
+            EpcPropertyDataMapper.from_api_response(data)
+
+        # Assert
+        assert not any("broken schema_type" in r.message for r in caplog.records)
+
+
+class TestFullSapSchema16xNoFloorDimensions:
+    """SAP-Schema-16.0 certs with assessment_type=SAP that lodge no
+    sap_floor_dimensions inside sap_building_parts (uprn 10090783001,
+    cert lodged 88). The API only carries total_floor_area at the top level;
+    the building part has sap_walls but no per-storey dimension data.
+
+    This is the root cause of the `max() arg is an empty sequence` crash in
+    building_geometry.roof_area() — documented in
+    scripts/handover_max_empty_sequence_design_question.md.
+    """
+
+    @pytest.fixture
+    def epc(self) -> EpcPropertyData:
+        return EpcPropertyDataMapper.from_api_response(
+            load("sap_16_0_full_no_floor_dims.json")
+        )
+
+    def test_maps_successfully(self, epc: EpcPropertyData) -> None:
+        assert isinstance(epc, EpcPropertyData)
+
+    def test_uprn_and_total_floor_area(self, epc: EpcPropertyData) -> None:
+        assert epc.uprn == 10090783001
+        assert epc.total_floor_area_m2 == 72.0
+
+    def test_building_part_floor_dimensions_synthesised(
+        self, epc: EpcPropertyData
+    ) -> None:
+        # The API lodges no sap_floor_dimensions for this cert family, but the
+        # mapper synthesises one from the cert-level total_floor_area so that
+        # roof_area() and gross_heat_loss_wall_area() do not crash downstream.
+        main_part = epc.sap_building_parts[0]
+        assert len(main_part.sap_floor_dimensions) == 1
+
+    def test_total_floor_area_available_at_cert_level(
+        self, epc: EpcPropertyData
+    ) -> None:
+        # total_floor_area_m2 IS present at the EpcPropertyData level (72 m²).
+        # This is the candidate fallback value for roof_area() — accurate for
+        # single-storey single-part certs, an overestimate for multi-storey.
+        assert epc.total_floor_area_m2 == 72.0
+
+    def test_synthesises_single_floor_dimension(self, epc: EpcPropertyData) -> None:
+        # Arrange
+        main_part = epc.sap_building_parts[0]
+
+        # Act / Assert
+        assert len(main_part.sap_floor_dimensions) == 1
+
+    def test_synthesised_floor_dimension_total_area(self, epc: EpcPropertyData) -> None:
+        # Arrange
+        fd = epc.sap_building_parts[0].sap_floor_dimensions[0]
+
+        # Act / Assert
+        assert fd.total_floor_area_m2 == 72.0
+
+    def test_synthesised_floor_dimension_heat_loss_perimeter(
+        self, epc: EpcPropertyData
+    ) -> None:
+        # Arrange: both sap_walls are wall_type=2 (exposed): 43.2 + 3.88 = 47.08 m².
+        # total_height falls back to 1.0 (no storey heights lodged), so perimeter = 47.08 m.
+        fd = epc.sap_building_parts[0].sap_floor_dimensions[0]
+
+        # Act / Assert
+        assert fd.heat_loss_perimeter_m == pytest.approx(47.08)
+
+    def test_raises_when_floor_dims_absent_and_synthesis_not_possible(
+        self,
+    ) -> None:
+        # Arrange: strip sap_flat_details so is_flat=False — synthesis guard
+        # cannot fire, empty floor dims must raise rather than silently produce [].
+        data = load("sap_16_0_full_no_floor_dims.json")
+        data.pop("sap_flat_details", None)
+
+        # Act / Assert
+        with pytest.raises(ValueError, match="Wardalls Grove.*SE14 5FB.*sap_floor_dimensions"):
+            EpcPropertyDataMapper.from_api_response(data)
diff --git a/datatypes/epc/schema/rdsap_schema_17_0.py b/datatypes/epc/schema/rdsap_schema_17_0.py
index aa1255ca8..d66f9c699 100644
--- a/datatypes/epc/schema/rdsap_schema_17_0.py
+++ b/datatypes/epc/schema/rdsap_schema_17_0.py
@@ -120,6 +120,14 @@ class SapBuildingPart:
     wall_insulation_thickness: Optional[str] = None
     floor_insulation_thickness: Optional[str] = None
     flat_roof_insulation_thickness: Optional[Union[str, int]] = None
+    # RdSAP 10 §6.1 — non-separated conservatory glazed-BP fields
+    # ({double_glazed, floor_area, glazed_perimeter, room_height}); declared so
+    # `from_dict` keeps them and the mapper splits the BP into
+    # `EpcPropertyData.sap_conservatory`. Mirrors the 19.0 / 21.0.1 schema.
+    floor_area: Optional[Union[Measurement, int, float]] = None
+    room_height: Optional[Union[Measurement, int, float]] = None
+    double_glazed: Optional[str] = None
+    glazed_perimeter: Optional[Union[Measurement, int, float]] = None
 
 
 @dataclass
diff --git a/datatypes/epc/schema/rdsap_schema_17_1.py b/datatypes/epc/schema/rdsap_schema_17_1.py
index f7f186e60..bbd04b791 100644
--- a/datatypes/epc/schema/rdsap_schema_17_1.py
+++ b/datatypes/epc/schema/rdsap_schema_17_1.py
@@ -106,6 +106,14 @@ class SapBuildingPart:
     # Can be a thickness string (e.g. "100mm") or 0 for uninsulated flat roofs
     roof_insulation_thickness: Optional[Union[str, int]] = None
     wall_insulation_thickness: Optional[str] = None
+    # RdSAP 10 §6.1 — non-separated conservatory glazed-BP fields
+    # ({double_glazed, floor_area, glazed_perimeter, room_height}); declared so
+    # `from_dict` keeps them and the mapper splits the BP into
+    # `EpcPropertyData.sap_conservatory`. Mirrors the 19.0 / 21.0.1 schema.
+    floor_area: Optional[Union[Measurement, int, float]] = None
+    room_height: Optional[Union[Measurement, int, float]] = None
+    double_glazed: Optional[str] = None
+    glazed_perimeter: Optional[Union[Measurement, int, float]] = None
 
 
 @dataclass
diff --git a/datatypes/epc/schema/rdsap_schema_18_0.py b/datatypes/epc/schema/rdsap_schema_18_0.py
index b9e98154b..f35f0733c 100644
--- a/datatypes/epc/schema/rdsap_schema_18_0.py
+++ b/datatypes/epc/schema/rdsap_schema_18_0.py
@@ -121,6 +121,14 @@ class SapBuildingPart:
     wall_insulation_thickness: Optional[str] = None
     floor_insulation_thickness: Optional[str] = None
     flat_roof_insulation_thickness: Optional[Union[str, int]] = None
+    # RdSAP 10 §6.1 — non-separated conservatory glazed-BP fields
+    # ({double_glazed, floor_area, glazed_perimeter, room_height}); declared so
+    # `from_dict` keeps them and the mapper splits the BP into
+    # `EpcPropertyData.sap_conservatory`. Mirrors the 19.0 / 21.0.1 schema.
+    floor_area: Optional[Union[Measurement, int, float]] = None
+    room_height: Optional[Union[Measurement, int, float]] = None
+    double_glazed: Optional[str] = None
+    glazed_perimeter: Optional[Union[Measurement, int, float]] = None
 
 
 @dataclass
diff --git a/datatypes/epc/schema/rdsap_schema_19_0.py b/datatypes/epc/schema/rdsap_schema_19_0.py
index b91dff357..2ba0f3cbb 100644
--- a/datatypes/epc/schema/rdsap_schema_19_0.py
+++ b/datatypes/epc/schema/rdsap_schema_19_0.py
@@ -122,6 +122,16 @@ class SapBuildingPart:
     wall_insulation_thickness: Optional[str] = None
     floor_insulation_thickness: Optional[str] = None
     flat_roof_insulation_thickness: Optional[Union[str, int]] = None
+    # RdSAP 10 §6.1 — a NON-SEPARATED conservatory (`conservatory_type == 4`) is
+    # lodged by the gov API as a glazed "building part" carrying ONLY these four
+    # fields (no fabric, no floor dimensions). Previously undeclared → dropped by
+    # `from_dict`, so the conservatory was silently lost on the 19.0 path. The
+    # mapper splits this BP out into `EpcPropertyData.sap_conservatory`. Mirrors
+    # the 21.0.1 schema declaration.
+    floor_area: Optional[Union[Measurement, int, float]] = None
+    room_height: Optional[Union[Measurement, int, float]] = None
+    double_glazed: Optional[str] = None
+    glazed_perimeter: Optional[Union[Measurement, int, float]] = None
 
 
 @dataclass
diff --git a/datatypes/epc/schema/rdsap_schema_20_0_0.py b/datatypes/epc/schema/rdsap_schema_20_0_0.py
index 9a4b78f29..395fb9b92 100644
--- a/datatypes/epc/schema/rdsap_schema_20_0_0.py
+++ b/datatypes/epc/schema/rdsap_schema_20_0_0.py
@@ -131,9 +131,12 @@ class SapBuildingPart:
     # ADR-0027: 17/1000 certs lodge a CONSERVATORY-shaped building part carrying
     # only {double_glazed, floor_area, glazed_perimeter, room_height} — none of
     # the wall/roof/floor construction fields below. Following the 21.0.1
-    # precedent every field is Optional, so a conservatory part parses to an
-    # all-None SapBuildingPart; its thermal effect is carried separately by the
-    # cert-level conservatory_type, so the empty part flows through harmlessly.
+    # precedent every field is Optional. RdSAP 10 §6.1: the four glazed fields
+    # are declared so `from_dict` keeps them and the mapper can split this BP out
+    # into `EpcPropertyData.sap_conservatory` (a non-separated conservatory,
+    # `conservatory_type == 4`). Previously undeclared → dropped → the part
+    # mapped to an all-None fabric part that mis-scored AND violated the
+    # NOT-NULL `construction_age_band` column on persist (modelling_e2e triage).
     identifier: Optional[str] = None
     wall_dry_lined: Optional[str] = None
     floor_heat_loss: Optional[int] = None
@@ -153,6 +156,12 @@ class SapBuildingPart:
     wall_insulation_thickness: Optional[str] = None
     floor_insulation_thickness: Optional[str] = None
     flat_roof_insulation_thickness: Optional[Union[str, int]] = None
+    # RdSAP 10 §6.1 — non-separated conservatory glazed-BP fields (see the
+    # class docstring). Mirrors the 19.0 / 21.0.1 schema declaration.
+    floor_area: Optional[Union[Measurement, int, float]] = None
+    room_height: Optional[Union[Measurement, int, float]] = None
+    double_glazed: Optional[str] = None
+    glazed_perimeter: Optional[Union[Measurement, int, float]] = None
 
 
 @dataclass
diff --git a/datatypes/epc/schema/rdsap_schema_21_0_0.py b/datatypes/epc/schema/rdsap_schema_21_0_0.py
index c9565d9ba..2f5c8e69b 100644
--- a/datatypes/epc/schema/rdsap_schema_21_0_0.py
+++ b/datatypes/epc/schema/rdsap_schema_21_0_0.py
@@ -14,7 +14,7 @@ class EnergyElement:
 
 @dataclass
 class Addendum:
-    addendum_numbers: List[int]
+    addendum_numbers: Optional[List[int]] = None
     stone_walls: Optional[str] = None
     system_build: Optional[str] = None
 
@@ -109,7 +109,7 @@ class PhotovoltaicSupplyNoneOrNoDetails:
 
 @dataclass
 class PhotovoltaicSupply:
-    none_or_no_details: PhotovoltaicSupplyNoneOrNoDetails
+    none_or_no_details: Optional[PhotovoltaicSupplyNoneOrNoDetails] = None
 
 
 @dataclass
@@ -127,15 +127,15 @@ class PhotovoltaicArray:
     overshading: int
 
 
-@dataclass
+@dataclass(kw_only=True)
 class SapEnergySource:
     mains_gas: str
     meter_type: int
     pv_connection: int
-    pv_battery_count: int
+    pv_battery_count: Optional[int] = None
     photovoltaic_supply: Union[PhotovoltaicSupply, List[List[PhotovoltaicArray]]]
     wind_turbines_count: int
-    wind_turbine_details: WindTurbineDetails
+    wind_turbine_details: Optional[WindTurbineDetails] = None
     gas_smart_meter_present: str
     is_dwelling_export_capable: str
     wind_turbines_terrain_type: int
@@ -153,11 +153,8 @@ class WindowTransmissionDetails:
 
 @dataclass
 class SapWindow:
-    pvc_frame: str
-    glazing_gap: int
     orientation: int
     window_type: int
-    frame_factor: float
     glazing_type: int
     window_width: float
     window_height: float
@@ -165,8 +162,15 @@ class SapWindow:
     window_location: int
     window_wall_type: int
     permanent_shutters_present: str
-    window_transmission_details: WindowTransmissionDetails
     permanent_shutters_insulated: str
+    # Optional window refinements: real-API 21.0.0 certs routinely omit these
+    # (frame_factor → Table 6c fallback, transmission → SAP10 glazing lookup,
+    # glazing_gap → type-only U). Modelled required originally but defaulted in
+    # 21.0.1; mirror that so otherwise-complete cohort certs are not skipped.
+    pvc_frame: Optional[str] = None
+    glazing_gap: Optional[int] = None
+    frame_factor: Optional[float] = None
+    window_transmission_details: Optional[WindowTransmissionDetails] = None
 
 
 @dataclass
@@ -273,7 +277,7 @@ class SapAlternativeWall:
     sheltered_wall: Optional[str] = None
 
 
-@dataclass
+@dataclass(kw_only=True)
 class SapBuildingPart:
     identifier: str
     wall_dry_lined: str
@@ -287,7 +291,7 @@ class SapBuildingPart:
     party_wall_construction: Union[int, str]
     wall_thickness_measured: str
     roof_insulation_location: Union[int, str]
-    roof_insulation_thickness: Union[str, int]
+    roof_insulation_thickness: Optional[Union[str, int]] = None
     sap_room_in_roof: Optional[SapRoomInRoof] = None
     sap_alternative_wall_1: Optional[SapAlternativeWall] = None
     sap_alternative_wall_2: Optional[SapAlternativeWall] = None
@@ -382,7 +386,9 @@ class RenewableHeatIncentive:
     impact_of_solid_wall_insulation: Optional[int] = None
 
 
-@dataclass
+# kw_only so optional fields (aligned with 21.0.1) can be defaulted in place
+# without reordering; parsed only via `from_dict` (keyword construction).
+@dataclass(kw_only=True)
 class RdSapSchema21_0_0:
     uprn: int
     roofs: List[EnergyElement]
@@ -414,7 +420,7 @@ class RdSapSchema21_0_0:
     assessment_type: str
     completion_date: str
     inspection_date: str
-    wet_rooms_count: int
+    wet_rooms_count: Optional[int] = None
     extensions_count: int
     measurement_type: int
     total_floor_area: int
@@ -425,7 +431,7 @@ class RdSapSchema21_0_0:
     sap_energy_source: SapEnergySource
     secondary_heating: EnergyElement
     sap_building_parts: List[SapBuildingPart]
-    open_chimneys_count: int
+    open_chimneys_count: Optional[int] = None
     solar_water_heating: str
     habitable_room_count: int
     heating_cost_current: float
@@ -438,10 +444,10 @@ class RdSapSchema21_0_0:
     has_hot_water_cylinder: str
     heating_cost_potential: float
     hot_water_cost_current: float
-    insulated_door_u_value: float
+    insulated_door_u_value: Optional[float] = None
     mechanical_ventilation: int
     percent_draughtproofed: int
-    suggested_improvements: List[SuggestedImprovement]
+    suggested_improvements: Optional[List[SuggestedImprovement]] = None
     co2_emissions_potential: float
     energy_rating_potential: int
     lighting_cost_potential: float
@@ -449,27 +455,27 @@ class RdSapSchema21_0_0:
     hot_water_cost_potential: float
     renewable_heat_incentive: RenewableHeatIncentive
     draughtproofed_door_count: int
-    mechanical_vent_duct_type: int
-    windows_transmission_details: WindowsTransmissionDetails
-    cfl_fixed_lighting_bulbs_count: int
+    mechanical_vent_duct_type: Optional[int] = None
+    windows_transmission_details: Optional[WindowsTransmissionDetails] = None
+    cfl_fixed_lighting_bulbs_count: Optional[int] = None
     energy_consumption_current: int
     has_fixed_air_conditioning: str
     multiple_glazed_proportion: int
     calculation_software_version: str
     energy_consumption_potential: int
     environmental_impact_current: int
-    led_fixed_lighting_bulbs_count: int
-    mechanical_vent_duct_placement: int
-    mechanical_vent_duct_insulation: int
+    led_fixed_lighting_bulbs_count: Optional[int] = None
+    mechanical_vent_duct_placement: Optional[int] = None
+    mechanical_vent_duct_insulation: Optional[int] = None
     potential_energy_efficiency_band: str
-    pressure_test_certificate_number: int
-    mechanical_ventilation_index_number: int
+    pressure_test_certificate_number: Optional[int] = None
+    mechanical_ventilation_index_number: Optional[int] = None
     co2_emissions_current_per_floor_area: int
     current_energy_efficiency_band: str
     environmental_impact_potential: int
-    low_energy_fixed_lighting_bulbs_count: int
-    mechanical_vent_duct_insulation_level: int
-    mechanical_vent_measured_installation: str
+    low_energy_fixed_lighting_bulbs_count: Optional[int] = None
+    mechanical_vent_duct_insulation_level: Optional[int] = None
+    mechanical_vent_measured_installation: Optional[str] = None
     incandescent_fixed_lighting_bulbs_count: int
     sap_flat_details: Optional[SapFlatDetails] = None
     addendum: Optional[Addendum] = None
diff --git a/datatypes/epc/schema/sap_schema_17_1.py b/datatypes/epc/schema/sap_schema_17_1.py
index 195e4f537..5cad983c2 100644
--- a/datatypes/epc/schema/sap_schema_17_1.py
+++ b/datatypes/epc/schema/sap_schema_17_1.py
@@ -171,6 +171,11 @@ class EnergyElement:
     environmental_efficiency_rating: int
 
 
+@dataclass
+class SapFlatDetails:
+    level: Optional[int] = None
+
+
 @dataclass
 class SapSchema17_1:
     uprn: int
@@ -184,7 +189,6 @@ class SapSchema17_1:
     postcode: str
     post_town: str
     inspection_date: str
-    has_hot_water_cylinder: str
     has_fixed_air_conditioning: str
     roofs: List[EnergyElement]
     walls: List[EnergyElement]
@@ -194,6 +198,37 @@ class SapSchema17_1:
     sap_heating: SapHeating
     sap_energy_source: SapEnergySource = field(default_factory=SapEnergySource)
     sap_ventilation: SapVentilation = field(default_factory=SapVentilation)
+    # SAP spec the cert was lodged under (~9.92 = SAP 2012 for this family).
+    # Drives Rebaselining trigger (a): sap_version < 10.2 → Effective = the
+    # SAP-10.2 calc, not the lodged figure (ADR-0037). Optional defensively.
+    sap_version: Optional[float] = None
+    # gov property_type code (0 house, 1 bungalow, 2 flat, 3 maisonette, 4 park
+    # home). Feeds the calculator's house/flat heat-transmission split; left
+    # absent the dwelling is classified as neither → mis-scored (ADR-0037).
+    property_type: Optional[int] = None
+    # gov built_form code (1 detached … 6 enclosed mid-terrace). Carried for the
+    # property-details panel and exposed-side handling (ADR-0037).
+    built_form: Optional[int] = None
+    # Lodged secondary heating element (description + ratings); "None" when the
+    # cert has no secondary. Read by the calculator's cert_to_inputs — dropping
+    # it under-counts a real secondary heater (ADR-0037).
+    secondary_heating: Optional[EnergyElement] = None
+    # "SAP" for this family (vs "RdSAP"); carried for provenance / the panel.
+    assessment_type: Optional[str] = None
+    # Human-facing display elements (description + ratings) for the property-
+    # details panel — distinct from the measured/structural fields the calculator
+    # reads. Dropped by the WIP mapper → all "Unknown" on the FE (ADR-0037).
+    # Full-SAP lodges windows under the plural key (a single element, not a list).
+    main_heating: List[EnergyElement] = field(default_factory=list)
+    main_heating_controls: List[EnergyElement] = field(default_factory=list)
+    windows: Optional[EnergyElement] = None
+    lighting: Optional[EnergyElement] = None
+    hot_water: Optional[EnergyElement] = None
     # measured living-room area (m²); the engine consumes it via a back-solved
     # habitable_rooms_count (Table 27). Optional — 100% present in the corpus.
     living_area: Optional[Union[int, float]] = None
+    # Some 17.0 full-SAP certs omit the top-level flag and lodge it only under
+    # sap_heating; the mapper falls back to sap_heating.has_hot_water_cylinder.
+    has_hot_water_cylinder: Optional[str] = None
+    # Present for flat-type dwellings; absence means not a flat.
+    sap_flat_details: Optional[SapFlatDetails] = None
diff --git a/datatypes/epc/schema/tests/fixtures/sap_16_0_full.json b/datatypes/epc/schema/tests/fixtures/sap_16_0_full.json
new file mode 100644
index 000000000..b665cab2e
--- /dev/null
+++ b/datatypes/epc/schema/tests/fixtures/sap_16_0_full.json
@@ -0,0 +1,435 @@
+{
+  "uprn": 10008075674,
+  "roofs": [
+    {
+      "description": "Average thermal transmittance 0.11 W/m\u00b2K",
+      "energy_efficiency_rating": 5,
+      "environmental_efficiency_rating": 5
+    }
+  ],
+  "walls": [
+    {
+      "description": "Average thermal transmittance 0.21 W/m\u00b2K",
+      "energy_efficiency_rating": 5,
+      "environmental_efficiency_rating": 5
+    }
+  ],
+  "floors": [
+    {
+      "description": "Average thermal transmittance 0.12 W/m\u00b2K",
+      "energy_efficiency_rating": 5,
+      "environmental_efficiency_rating": 5
+    }
+  ],
+  "status": "entered",
+  "windows": {
+    "description": "High performance glazing",
+    "energy_efficiency_rating": 5,
+    "environmental_efficiency_rating": 5
+  },
+  "lighting": {
+    "description": "Low energy lighting in all fixed outlets",
+    "energy_efficiency_rating": 5,
+    "environmental_efficiency_rating": 5
+  },
+  "postcode": "PE2 9HD",
+  "data_type": 2,
+  "hot_water": {
+    "description": "From main system, plus solar",
+    "energy_efficiency_rating": 5,
+    "environmental_efficiency_rating": 5
+  },
+  "post_town": "PETERBOROUGH",
+  "built_form": 1,
+  "created_at": "2012-05-30 13:30:25.000000",
+  "living_area": 18.011,
+  "orientation": 7,
+  "region_code": 2,
+  "report_type": 3,
+  "sap_heating": {
+    "thermal_store": 1,
+    "has_solar_panel": "true",
+    "water_fuel_type": 1,
+    "solar_store_volume": 100,
+    "water_heating_code": 901,
+    "hot_water_store_size": 210,
+    "main_heating_details": [
+      {
+        "burner_control": 3,
+        "main_fuel_type": 1,
+        "efficiency_type": 3,
+        "heat_emitter_type": 1,
+        "main_heating_code": 102,
+        "is_flue_fan_present": "false",
+        "main_heating_number": 1,
+        "is_condensing_boiler": "true",
+        "main_heating_control": 2110,
+        "is_interlocked_system": "true",
+        "main_heating_category": 2,
+        "main_heating_fraction": 1,
+        "gas_or_oil_boiler_type": 1,
+        "main_heating_flue_type": 2,
+        "main_heating_efficiency": 89,
+        "main_heating_data_source": 2,
+        "has_delayed_start_thermostat": "false",
+        "load_or_weather_compensation": 0,
+        "is_central_heating_pump_in_heated_space": "true"
+      }
+    ],
+    "has_hot_water_cylinder": "true",
+    "has_solar_powered_pump": "false",
+    "has_cylinder_thermostat": "true",
+    "solar_panel_aperture_area": 4.51,
+    "has_fixed_air_conditioning": "false",
+    "secondary_heating_category": 1,
+    "solar_panel_collector_type": 2,
+    "is_cylinder_in_heated_space": "true",
+    "solar_panel_collector_pitch": 2,
+    "is_hot_water_separately_timed": "true",
+    "is_primary_pipework_insulated": "true",
+    "hot_water_store_insulation_type": 1,
+    "hot_water_store_heat_loss_source": 3,
+    "is_solar_store_combined_cylinder": "true",
+    "solar_panel_collector_data_source": 2,
+    "solar_panel_collector_orientation": 5,
+    "solar_panel_collector_overshading": 1,
+    "hot_water_store_insulation_thickness": 85,
+    "solar_panel_collector_heat_loss_rate": 3.681,
+    "solar_panel_collector_zero_loss_efficiency": 77
+  },
+  "sap_version": 9.9,
+  "schema_type": "SAP-Schema-16.0",
+  "uprn_source": "Energy Assessor",
+  "country_code": "EAW",
+  "main_heating": [
+    {
+      "description": "Boiler and radiators, mains gas",
+      "energy_efficiency_rating": 4,
+      "environmental_efficiency_rating": 4
+    }
+  ],
+  "air_tightness": {
+    "description": "Air permeability 4.9 m\u00b3/h.m\u00b2 (as tested)",
+    "energy_efficiency_rating": 4,
+    "environmental_efficiency_rating": 4
+  },
+  "dwelling_type": "Detached house",
+  "language_code": 1,
+  "property_type": 0,
+  "address_line_1": "43, New Road",
+  "address_line_2": "Woodston",
+  "schema_version": "LIG-15.0",
+  "assessment_date": "2012-05-30",
+  "assessment_type": "SAP",
+  "completion_date": "2012-05-30",
+  "inspection_date": "2012-05-30",
+  "sap_ventilation": {
+    "psv_count": 0,
+    "pressure_test": 1,
+    "air_permeability": 4.88,
+    "open_flues_count": 0,
+    "ventilation_type": 1,
+    "extract_fans_count": 3,
+    "open_fireplaces_count": 0,
+    "sheltered_sides_count": 2,
+    "flueless_gas_fires_count": 0
+  },
+  "design_water_use": 1,
+  "total_floor_area": 76,
+  "transaction_type": 6,
+  "conservatory_type": 1,
+  "registration_date": "2012-05-30",
+  "restricted_access": 0,
+  "sap_energy_source": {
+    "electricity_tariff": 1,
+    "wind_turbines_count": 0,
+    "wind_turbine_terrain_type": 2,
+    "fixed_lighting_outlets_count": 0,
+    "low_energy_fixed_lighting_outlets_count": 0,
+    "low_energy_fixed_lighting_outlets_percentage": 100
+  },
+  "sap_opening_types": [
+    {
+      "name": "Door (1)",
+      "type": 1,
+      "u_value": 1.8,
+      "data_source": 2,
+      "description": "Data from Manufacturer",
+      "glazing_type": 1
+    },
+    {
+      "name": "Windows (1)",
+      "type": 4,
+      "u_value": 1.5,
+      "data_source": 2,
+      "description": "Data from Manufacturer",
+      "frame_factor": 0.7,
+      "glazing_type": 7,
+      "solar_transmittance": 0.63
+    }
+  ],
+  "secondary_heating": {
+    "description": "None",
+    "energy_efficiency_rating": 0,
+    "environmental_efficiency_rating": 0
+  },
+  "lzc_energy_sources": [
+    10
+  ],
+  "sap_building_parts": [
+    {
+      "sap_roofs": [
+        {
+          "name": "main roof",
+          "u_value": 0.11,
+          "roof_type": 2,
+          "kappa_value": 9,
+          "total_roof_area": 38.65
+        },
+        {
+          "name": "flat roof",
+          "u_value": 0.19,
+          "roof_type": 2,
+          "kappa_value": 9,
+          "total_roof_area": 1.39
+        }
+      ],
+      "sap_walls": [
+        {
+          "name": "brick wall",
+          "u_value": 0.21,
+          "wall_type": 2,
+          "kappa_value": 150,
+          "total_wall_area": 115.98,
+          "is_curtain_walling": "false"
+        },
+        {
+          "name": "downstairs",
+          "u_value": 0,
+          "wall_type": 5,
+          "kappa_value": 9,
+          "total_wall_area": 44.7
+        },
+        {
+          "name": "upper",
+          "u_value": 0,
+          "wall_type": 5,
+          "kappa_value": 9,
+          "total_wall_area": 52.99
+        }
+      ],
+      "identifier": "Main Dwelling",
+      "overshading": 2,
+      "sap_openings": [
+        {
+          "name": 1,
+          "type": "Door (1)",
+          "width": 0.9,
+          "height": 2.1,
+          "location": "brick wall",
+          "orientation": 7
+        },
+        {
+          "name": 2,
+          "type": "Windows (1)",
+          "width": 0.665,
+          "height": 1.05,
+          "location": "brick wall",
+          "orientation": 1
+        },
+        {
+          "name": 3,
+          "type": "Windows (1)",
+          "width": 2.09,
+          "height": 1.05,
+          "location": "brick wall",
+          "orientation": 7
+        },
+        {
+          "name": 4,
+          "type": "Windows (1)",
+          "width": 0.665,
+          "height": 1.05,
+          "location": "brick wall",
+          "orientation": 5
+        },
+        {
+          "name": 5,
+          "type": "Windows (1)",
+          "width": 2.5,
+          "height": 2.1,
+          "location": "brick wall",
+          "orientation": 3
+        },
+        {
+          "name": 6,
+          "type": "Windows (1)",
+          "width": 1.05,
+          "height": 1.425,
+          "location": "brick wall",
+          "orientation": 7
+        },
+        {
+          "name": 7,
+          "type": "Windows (1)",
+          "width": 0.6,
+          "height": 1.2,
+          "location": "brick wall",
+          "orientation": 1
+        },
+        {
+          "name": 8,
+          "type": "Windows (1)",
+          "width": 0.8,
+          "height": 1.425,
+          "location": "brick wall",
+          "orientation": 3
+        },
+        {
+          "name": 9,
+          "type": "Windows (1)",
+          "width": 0.8,
+          "height": 1.425,
+          "location": "brick wall",
+          "orientation": 3
+        },
+        {
+          "name": 10,
+          "type": "Windows (1)",
+          "width": 0.6,
+          "height": 1.05,
+          "location": "brick wall",
+          "orientation": 5
+        }
+      ],
+      "construction_year": 2012,
+      "sap_thermal_bridges": {
+        "thermal_bridges": [
+          {
+            "length": 9.77,
+            "psi_value": 0.3,
+            "psi_value_source": 4,
+            "thermal_bridge_type": 2
+          },
+          {
+            "length": 7.27,
+            "psi_value": 0.04,
+            "psi_value_source": 4,
+            "thermal_bridge_type": 3
+          },
+          {
+            "length": 23.55,
+            "psi_value": 0.05,
+            "psi_value_source": 4,
+            "thermal_bridge_type": 4
+          },
+          {
+            "length": 27.18,
+            "psi_value": 0.16,
+            "psi_value_source": 4,
+            "thermal_bridge_type": 5
+          },
+          {
+            "length": 27.18,
+            "psi_value": 0.07,
+            "psi_value_source": 4,
+            "thermal_bridge_type": 6
+          },
+          {
+            "length": 8.68,
+            "psi_value": 0.06,
+            "psi_value_source": 4,
+            "thermal_bridge_type": 10
+          },
+          {
+            "length": 17.17,
+            "psi_value": 0.24,
+            "psi_value_source": 4,
+            "thermal_bridge_type": 12
+          },
+          {
+            "length": 21.04,
+            "psi_value": 0.09,
+            "psi_value_source": 4,
+            "thermal_bridge_type": 16
+          }
+        ],
+        "thermal_bridge_code": 5
+      },
+      "building_part_number": 1,
+      "sap_floor_dimensions": [
+        {
+          "storey": 0,
+          "u_value": 0.12,
+          "floor_type": 2,
+          "storey_height": 2.55,
+          "heat_loss_area": 38.65,
+          "total_floor_area": 38.65,
+          "kappa_value_from_below": 18
+        },
+        {
+          "storey": 1,
+          "u_value": 0,
+          "floor_type": 3,
+          "kappa_value": 18,
+          "storey_height": 2.71,
+          "heat_loss_area": 1.3900032,
+          "total_floor_area": 37.26,
+          "kappa_value_from_below": 18
+        }
+      ]
+    }
+  ],
+  "bedf_revision_number": 323,
+  "heating_cost_current": 260,
+  "co2_emissions_current": 1.2,
+  "energy_rating_average": 60,
+  "energy_rating_current": 83,
+  "lighting_cost_current": 43,
+  "main_heating_controls": [
+    {
+      "description": "Time and temperature zone control",
+      "energy_efficiency_rating": 5,
+      "environmental_efficiency_rating": 5
+    }
+  ],
+  "has_hot_water_cylinder": "true",
+  "heating_cost_potential": 251,
+  "hot_water_cost_current": 37,
+  "suggested_improvements": [
+    {
+      "sequence": 1,
+      "typical_saving": 219,
+      "indicative_cost": "\u00a311,000 - \u00a320,000",
+      "improvement_type": "U",
+      "improvement_details": {
+        "improvement_number": 34
+      },
+      "improvement_category": 3,
+      "energy_performance_rating": 94,
+      "environmental_impact_rating": 97
+    }
+  ],
+  "co2_emissions_potential": 1.2,
+  "energy_rating_potential": 83,
+  "lighting_cost_potential": 43,
+  "hot_water_cost_potential": 47,
+  "is_in_smoke_control_area": "unknown",
+  "renewable_heat_incentive": {
+    "rhi_new_dwelling": {
+      "space_heating": 3010,
+      "water_heating": 2175
+    }
+  },
+  "seller_commission_report": "Y",
+  "energy_consumption_current": 84,
+  "has_fixed_air_conditioning": "false",
+  "calculation_software_version": "Version: 1.4.0.80",
+  "energy_consumption_potential": 84,
+  "environmental_impact_current": 87,
+  "current_energy_efficiency_band": "B",
+  "environmental_impact_potential": 87,
+  "has_heated_separate_conservatory": "false",
+  "potential_energy_efficiency_band": "B",
+  "co2_emissions_current_per_floor_area": 16
+}
\ No newline at end of file
diff --git a/deployment/terraform/lambda/hubspot_deal_etl/variables.tf b/deployment/terraform/lambda/hubspot_deal_etl/variables.tf
index 84f0e5673..189822f04 100644
--- a/deployment/terraform/lambda/hubspot_deal_etl/variables.tf
+++ b/deployment/terraform/lambda/hubspot_deal_etl/variables.tf
@@ -19,7 +19,7 @@ variable "image_digest" {
 
 variable "maximum_concurrency" {
   type        = number
-  default     = 2
+  default     = 20
   description = "Maximum number of concurrent Lambda invocations from SQS (2-1000). null = no limit."
 }
 
diff --git a/deployment/terraform/lambda/modelling_e2e/main.tf b/deployment/terraform/lambda/modelling_e2e/main.tf
new file mode 100644
index 000000000..4be3bd2a8
--- /dev/null
+++ b/deployment/terraform/lambda/modelling_e2e/main.tf
@@ -0,0 +1,64 @@
+data "terraform_remote_state" "shared" {
+  backend = "s3"
+  config = {
+    bucket = "assessment-model-terraform-state"
+    key    = "env:/${var.stage}/terraform.tfstate"
+    region = "eu-west-2"
+  }
+}
+
+data "aws_secretsmanager_secret_version" "db_credentials" {
+  secret_id = "${var.stage}/assessment_model/db_credentials"
+}
+
+locals {
+  db_credentials = jsondecode(data.aws_secretsmanager_secret_version.db_credentials.secret_string)
+
+  # Per-container minimum gap (seconds) between Google Solar API calls. The Solar
+  # API caps the whole GCP project at a hard 600 QPM shared across Building
+  # Insights + Data Layers. Each of the up-to-`maximum_concurrency` containers
+  # loops its ~50-property batch sequentially, so pacing each one to
+  # 0.8 (safety headroom) × 600 QPM ÷ 60 ÷ N keeps the fleet sum under the
+  # ceiling — eliminating the sustained 429 storm that per-process backoff alone
+  # can't ride out. Derived from `maximum_concurrency` so N has one source of
+  # truth. At N=32 → 4.0s. Consumed by the handler's throttle (see
+  # infrastructure/solar/google_solar_api_client.py).
+  solar_min_request_interval_seconds = var.maximum_concurrency / (0.8 * 600 / 60)
+}
+
+module "lambda" {
+  source = "../../modules/lambda_with_sqs"
+
+  name  = var.lambda_name
+  stage = var.stage
+
+  image_uri = local.image_uri
+
+  reserved_concurrent_executions = var.reserved_concurrent_executions
+
+  batch_size          = var.batch_size
+  maximum_concurrency = var.maximum_concurrency
+
+  timeout     = 900
+  memory_size = 3008
+
+  environment = {
+    STAGE                = var.stage
+    LOG_LEVEL            = "info"
+    POSTGRES_USERNAME    = local.db_credentials.db_assessment_model_username
+    POSTGRES_PASSWORD    = local.db_credentials.db_assessment_model_password
+    POSTGRES_HOST        = var.db_host
+    POSTGRES_DATABASE    = var.db_name
+    POSTGRES_PORT        = var.db_port
+    OPEN_EPC_API_TOKEN   = var.open_epc_api_token
+    GOOGLE_SOLAR_API_KEY = var.google_solar_api_key
+    DATA_BUCKET          = "retrofit-data-${var.stage}"
+
+    SOLAR_MIN_REQUEST_INTERVAL_SECONDS = tostring(local.solar_min_request_interval_seconds)
+  }
+}
+
+resource "aws_iam_role_policy_attachment" "modelling_e2e_s3_read" {
+  role       = module.lambda.role_name
+  policy_arn = data.terraform_remote_state.shared.outputs.modelling_e2e_s3_read_arn
+}
diff --git a/deployment/terraform/lambda/modelling_e2e/outputs.tf b/deployment/terraform/lambda/modelling_e2e/outputs.tf
new file mode 100644
index 000000000..34cf4cef7
--- /dev/null
+++ b/deployment/terraform/lambda/modelling_e2e/outputs.tf
@@ -0,0 +1,9 @@
+output "modelling_e2e_queue_url" {
+  value       = module.lambda.queue_url
+  description = "URL of the modelling-e2e SQS queue (pass to trigger_modelling_e2e_sqs.py --sqs-url)"
+}
+
+output "modelling_e2e_queue_arn" {
+  value       = module.lambda.queue_arn
+  description = "ARN of the modelling-e2e SQS queue"
+}
diff --git a/deployment/terraform/lambda/modelling_e2e/provider.tf b/deployment/terraform/lambda/modelling_e2e/provider.tf
new file mode 100644
index 000000000..7100be243
--- /dev/null
+++ b/deployment/terraform/lambda/modelling_e2e/provider.tf
@@ -0,0 +1,20 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 5.0"
+    }
+  }
+
+  backend "s3" {
+    bucket = "modelling-e2e-terraform-state"
+    key    = "terraform.tfstate"
+    region = "eu-west-2"
+  }
+
+  required_version = ">= 1.2.0"
+}
+
+provider "aws" {
+  region = "eu-west-2"
+}
diff --git a/deployment/terraform/lambda/modelling_e2e/variables.tf b/deployment/terraform/lambda/modelling_e2e/variables.tf
new file mode 100644
index 000000000..bcade99c2
--- /dev/null
+++ b/deployment/terraform/lambda/modelling_e2e/variables.tf
@@ -0,0 +1,65 @@
+variable "lambda_name" {
+  type        = string
+  description = "Logical name of the lambda"
+}
+
+variable "stage" {
+  description = "Deployment stage (e.g. dev, prod)"
+  type        = string
+}
+
+variable "ecr_repo_url" {
+  type        = string
+  description = "ECR repository URL (no tag, no digest)"
+}
+
+variable "image_digest" {
+  type        = string
+  description = "Image digest (sha256:...)"
+}
+
+variable "reserved_concurrent_executions" {
+  type        = number
+  default     = -1
+  description = "Reserved concurrency for the Lambda. -1 = unreserved."
+}
+
+variable "maximum_concurrency" {
+  type        = number
+  default     = 12
+  description = "Maximum concurrent Lambda invocations from the SQS trigger."
+}
+
+variable "batch_size" {
+  type    = number
+  default = 1
+}
+
+variable "db_host" {
+  type      = string
+  sensitive = true
+}
+
+variable "db_name" {
+  type      = string
+  sensitive = true
+}
+
+variable "db_port" {
+  type      = string
+  sensitive = true
+}
+
+variable "open_epc_api_token" {
+  type      = string
+  sensitive = true
+}
+
+variable "google_solar_api_key" {
+  type      = string
+  sensitive = true
+}
+
+locals {
+  image_uri = "${var.ecr_repo_url}@${var.image_digest}"
+}
diff --git a/deployment/terraform/shared/main.tf b/deployment/terraform/shared/main.tf
index 3d6bbd393..3ff5bda4b 100644
--- a/deployment/terraform/shared/main.tf
+++ b/deployment/terraform/shared/main.tf
@@ -81,6 +81,10 @@ resource "aws_db_instance" "default" {
   publicly_accessible = true
   # Specify the CA certificate with the default RDS CA certificate
   ca_cert_identifier = "rds-ca-rsa2048-g1"
+
+  # Performance Insights (7-day retention is free)
+  performance_insights_enabled          = true
+  performance_insights_retention_period = 7
   # Temporary to enfore immediate change
   apply_immediately = true
   # Set up storage type to gp3 for better performance
@@ -858,3 +862,35 @@ module "sharepoint_renamer_registry" {
   stage  = var.stage
 }
 
+################################################
+# Modelling E2E – Lambda
+################################################
+module "modelling_e2e_state_bucket" {
+  source      = "../modules/tf_state_bucket"
+  bucket_name = "modelling-e2e-terraform-state"
+}
+
+module "modelling_e2e_registry" {
+  source = "../modules/container_registry"
+  name   = "modelling-e2e"
+  stage  = var.stage
+}
+
+module "modelling_e2e_s3_read" {
+  source = "../modules/s3_iam_policy"
+
+  policy_name        = "ModellingE2EReadS3"
+  policy_description = "Allow modelling-e2e Lambda to read spatial parquet from the data bucket"
+  bucket_arns        = ["arn:aws:s3:::retrofit-data-${var.stage}"]
+  actions            = ["s3:GetObject", "s3:ListBucket"]
+  resource_paths     = ["/*"]
+}
+
+output "modelling_e2e_s3_read_arn" {
+  value = module.modelling_e2e_s3_read.policy_arn
+}
+
+output "modelling_e2e_ecr_url" {
+  value = module.modelling_e2e_registry.repository_url
+}
+
diff --git a/docs/adr/0014-bill-derivation-from-real-fuel-rates.md b/docs/adr/0014-bill-derivation-from-real-fuel-rates.md
index 0d195f779..759086bcc 100644
--- a/docs/adr/0014-bill-derivation-from-real-fuel-rates.md
+++ b/docs/adr/0014-bill-derivation-from-real-fuel-rates.md
@@ -86,9 +86,7 @@ production migration is FE-owned (Drizzle); `docs/migrations/` updated.
   **stubs them at 0 kWh**, so the bill total currently understates by the unregulated electricity
   load. Khalim is adding the fields to `SapResult` directly; the adapter wires the
   `APPLIANCES`/`COOKING` sections in as soon as they land.
-- **Off-peak (Economy 7) day/night split** — the snapshot carries the E7 day/night rates, but
-  `FuelRates` exposes single-rate fuels only; the day/night accessor + the calculator's Table 12a
-  high/low-rate split land in a later slice.
+- ~~**Off-peak (Economy 7) day/night split**~~ — **resolved, see the 2026-06-24 amendment below.**
 - **Heat-network rate model** — heat-network certs raise `UnpricedFuel` for now (the one common gap).
 - **Regional rates + Ofgem-cap ETL** — national snapshot now; both are later refinements behind the
   same `FuelRatesRepository` port.
@@ -152,3 +150,17 @@ Bill Derivation is no longer Baseline-only — the **Modelling** stage now re-ru
 - **Plan-level first, per-measure savings next (telescoping cascade).** This slice fills the plan columns (`post_energy_bill`, `post_energy_consumption`, `energy_bill_savings`, `energy_consumption_savings`). Per-measure `recommendation.kwh_savings` / `energy_cost_savings` come from a **bill cascade over the role-3 best-practice order** (fabric → heating → renewables) — re-bill each cumulative prefix and diff, telescoping exactly to the plan totals (mirroring the SAP role-3 attribution; reuses the per-prefix `sap_result`s, no extra calls). Per-measure savings can be **negative** (ventilation increases energy) and still telescope. The legacy `recommendation.energy_savings` column is **vestigial** (legacy set it to `0`; the canonical delivered-energy field is `kwh_savings`) — left NULL.
 
 - **Limitation carried over.** The "Appliances + cooking kWh stubbed at 0" deferral above still applies — Modelling's post-package bill understates by the same unregulated-electricity load until those fields land on `SapResult`. Baseline and Modelling share the gap, so baseline-vs-post savings remain consistent.
+
+## Amendment (2026-06-24): off-peak is a whole-meter tariff, day/night split per end use from the calculator's Table 12a fractions
+
+Resolves the §4 / Deferred "off-peak day/night split" — forced by a `modelling_e2e` failure (`no rate for fuel ELECTRICITY_OFF_PEAK`) on an off-peak-metered dwelling, where the snapshot's E7 day/night entry was deliberately skipped (no single `unit_rate_p_per_kwh`) and `BillDerivation` raised `UnpricedFuel`. Decided in a `/grill-with-docs` session.
+
+- **Off-peak is a property of the METER, not of an end use.** An Economy-7-style dwelling has *one* dual-rate meter, and **every** electric end use — heating, hot water, *and* lighting / pumps-fans / appliances / cooking — bills on it (the calculator already prices the whole meter this way via Table 12a Grid 1 + Grid 2). The pre-amendment `EnergyBreakdown` modelled off-peak as a per-end-use *fuel* that only heating/HW could carry, hard-wiring the other electric lines to standard `ELECTRICITY` — a **latent under-pricing** of the daytime appliance/lighting load (standard 24.67p vs off-peak day 29.73p), the mirror of the heating over-pricing that folding-to-standard would cause. So the breakdown now models off-peak as a **whole-meter tariff**: on an off-peak meter, `from_sap_result` routes *all* electric lines to `Fuel.ELECTRICITY_OFF_PEAK`. This needs an **off-peak-meter signal on `SapResult`** (a fraction of 1.0 on the off-peak day rate is not the same as standard electricity).
+
+- **The day/night split is the calculator's existing Table 12a high-rate fraction, surfaced as a calculator output.** Each end use's **High-Rate Fraction** (fraction of its kWh at the day/high rate; remainder at night/low) is already computed inside `cert_to_inputs` (`_main_space_heating_high_rate_fraction`, `water_heating_high_rate_fraction`, the Table-13 immersion blend, the HP-DHW exception, `other_use_high_rate_fraction` for Grid 2) and folded into a blended *Table-32* cost the bill discards. Per the "fuel is a calculator output" amendment above, the **fraction is now also calculator output** — threaded `CalculatorInputs → SapResult` per end use — so the bill **reuses** it rather than re-deriving a second day/night model that would drift from the rating. Unregulated loads SAP does not rate (appliances, cooking) have no Table 12a fraction; they **inherit the `ALL_OTHER_USES` fraction** (same Grid-2 row + daytime-weighted profile as lighting) — a documented extension, since SAP itself never splits them.
+
+- **Representation: fraction-on-the-line; rates stay in `FuelRates`.** `EnergyLine` gains an optional `high_rate_fraction` (`None` = single-rate fuel). `FuelRates` gains a **day/night accessor** for `ELECTRICITY_OFF_PEAK` (the repository now reads the snapshot's existing `day_p_per_kwh` / `night_p_per_kwh`). `BillDerivation` prices an off-peak line at `kwh × (frac × day_rate + (1−frac) × night_rate)`. Rejected: (a) **pre-splitting kWh into day/night lines** upstream — leaks rate-tier structure into the calculator/adapter and doubles the section roll-up; (b) the **blended day/night rate handed over by the calculator** — that is the calculator pricing at real rates, the exact boundary §2 draws.
+
+- **Rejected shortcuts (both re-open closed decisions).** *Fold `ELECTRICITY_OFF_PEAK` → standard `ELECTRICITY`*: knowingly mis-prices in both directions (≈+45% on night-shifted storage heat, under-prices daytime loads). *A single hand-blended off-peak `unit_rate` in the snapshot*: reintroduces the legacy `AnnualBillSavings.py` **blended `PRICE_FACTOR`** anti-pattern this ADR's Context rewrote away from — the day/night weighting is per-end-use and per-dwelling, not a property of the rate.
+
+- **Safety: no-op for unaffected certs.** Standard-tariff dwellings are unchanged (every fraction is 1.0 and the carrier stays `ELECTRICITY`). Off-peak dwellings currently **hard-crash** (`UnpricedFuel` aborts the batch, §1), so there is no passing bill value to regress — they move from crash → priced. SAP scores are untouched: the bill is output-only and never feeds the rating.
diff --git a/docs/adr/0033-age-band-resolves-assumed-fabric-states.md b/docs/adr/0033-age-band-resolves-assumed-fabric-states.md
new file mode 100644
index 000000000..9486bc8d4
--- /dev/null
+++ b/docs/adr/0033-age-band-resolves-assumed-fabric-states.md
@@ -0,0 +1,136 @@
+# Age band resolves the "(assumed)"/"as built"/"Unknown" fabric states
+
+ADR-0032 dec-4 **deferred** the `WallType` "(assumed) insulated" / "partial
+insulation (assumed)" states (and, transitively, flat roofs): their
+`wall_insulation_type` is "age-inferred in RdSAP, so the code is ambiguous and
+must be pinned against the Elmhurst accuracy harness rather than guessed." This
+ADR closes that deferral. The harness has now run. Terms in CONTEXT.md (Landlord
+Overrides, Effective EPC, Validation Cohort); supersedes ADR-0032 dec-4.
+
+## Status
+
+Accepted. Supersedes the deferral in ADR-0032 dec-4. Evidence:
+`scripts/hyde/uvalue_probe_{walls,roofs}.csv` (full A–M Elmhurst sweep, produced
+by `scripts/hyde/probe_uvalues.py`).
+
+## Context: what the Elmhurst sweep showed
+
+The SAP 10.2 spec defers RdSAP to "a separate document" (Appendix S, p.122), so
+the authoritative source for "what U-value does enum X at age Y produce" is the
+accredited Elmhurst RdSAP-10 entry tool itself. We drove it across all 13
+construction-age bands (A–M) for the two components Khalim flagged and read the
+tool's recomputed **Default U-value** for every option:
+
+* **Cavity wall, As Built** `[A–M]`:
+  `1.5, 1.5, 1.5, 1.5, 1.5, 1.0, 0.6, 0.6, 0.45, 0.35, 0.3, 0.28, 0.26`
+* **Cavity wall, Filled** `[A–M]`:
+  `0.7, 0.7, 0.7, 0.7, 0.7, 0.4, 0.35, 0.35, 0.45, 0.35, 0.3, 0.28, 0.26`
+* **Flat roof, As Built / Unknown** `[A–M]`:
+  `2.3, 2.3, 2.3, 2.3, 1.5, 0.68, 0.4, 0.35, 0.35, 0.25, 0.25, 0.18, 0.15`
+
+Two facts fall out:
+
+1. **Every value already lives in our tables.** As Built ≡ `(WALL_CAVITY, 0)`,
+   Filled ≡ `_CAVITY_FILLED_ENG`, flat As Built/Unknown ≡ `_FLAT_ROOF_BY_AGE`
+   (`domain/sap10_ml/rdsap_uvalues.py`) — exact match, all 13 bands. The U-value
+   layer was never the gap.
+2. **"Unknown" computes identically to "As Built"** at every band — confirming
+   Khalim's read that Unknown is handled like As Built.
+
+## Decisions
+
+### 1. The "(assumed)" qualifier is *not* a distinct insulation code — age band is
+
+ADR-0032 dec-4 worried that "partial insulation (assumed)" needs a
+`wall_insulation_type` code we couldn't name. The sweep shows why none exists:
+Elmhurst has **no "partial" enum**. "Partial insulation (assumed)" is simply
+*As Built (code 4) evaluated at band F (1976–1982)* → 1.0 W/m²K. Likewise
+"no insulation (assumed)" is As Built at an old band (A–E → 1.5) and "insulated
+(assumed)" is As Built at a newer band (G+ → ≤0.60). All three resolve to
+`wall_insulation_type = 4`; the **construction-age-band overlay** (already a
+separate, wired override component) supplies the U-value. This matches Khalim's
+bands: cavity ≤1975 uninsulated / 1976–82 partial / later insulated is exactly
+the As-Built-by-age curve above.
+
+### 2. Resolve to int codes, not a computed U-value override
+
+Because int codes + the existing age-band tables reproduce Elmhurst exactly,
+overlays keep emitting `wall_construction` / `wall_insulation_type` (walls) and
+`roof_construction` / `roof_insulation_thickness` (roofs) — no new
+`wall_u_value` / `roof_u_value` override path. This keeps the landlord overlay on
+the same code path as every Measure (ADR-0032 dec-1) and avoids a second way to
+move the wall/roof U-value. (Considered and rejected: writing a computed U-value
+override. It would duplicate the RdSAP tables already in the calculator and
+diverge the moment those tables are revised.)
+
+### 3. Walls — extend the state map; no new machinery
+
+`wall_type_overlay._STATE_INSULATION` gains the three "as built" variants
+("as built", "as built, insulated (assumed)", "as built, partial insulation
+(assumed)") → code 4, alongside the existing "no insulation (assumed)" → 4.
+These previously produced **no overlay** (silently dropping the landlord's
+correction). The age-band overlay does the rest.
+
+### 4. Flat roofs — the overlay must set `roof_construction_type`
+
+The calculator's flat-roof age-band path (`u_roof`, `_FLAT_ROOF_BY_AGE`) fires
+only when the roof is flat, which `heat_transmission.py` reads from the **string**
+`part.roof_construction_type` (`"flat" in roof_type_lower`, line 999) — *not* the
+int `roof_construction`. The roof overlay today sets only
+`roof_insulation_thickness`, so a flat-roof override can't reach that path. This
+ADR adds `roof_construction_type` to `BuildingPartOverlay` and has
+`roof_type_overlay` set it to `"Flat"` for the "Flat, …" family, alongside the
+existing `roof_insulation_thickness` (set when the description carries an explicit
+mm depth).
+
+The same shape-flag mechanism extends to pitched roofs with no clean depth:
+
+* `"Pitched, Unknown loft insulation"` → `roof_construction_type="Pitched"`,
+  thickness left `None` → the pitched age-band default (`_ROOF_BY_AGE`).
+* `"Pitched, no insulation*"` → `roof_construction_type="Pitched"` **plus**
+  `roof_insulation_thickness=0` → the uninsulated 2.30 (Table 16 row 0). Pitched
+  "no insulation" text is load-bearing in `u_roof` (§5.11 note) — it does NOT take
+  the age-band default, unlike flat. Setting `0` (not `None`) also lets this case
+  override a lodged numeric thickness, which the "Unknown" cases cannot.
+
+Constraint: the applicator only folds *non-None* overlay fields, so it cannot
+*clear* a lodged `roof_insulation_thickness` to `None`. For As Built / Unknown
+(no depth) the age-band default fires only when the baseline part carries no
+numeric thickness — true on the Hyde flow, where the landlord override IS the roof
+source and genuine As Built/Unknown lodgements carry `AB`/`ND`/None, not a number.
+A flat/pitched-Unknown override layered on a part that already has a numeric
+thickness keeps that thickness; that case is out of scope here and surfaced by the
+coverage audit (below) for the verify step.
+
+## Consequences
+
+* Previously-dropped Hyde rows now move the score: ~1,366 flat-roof overrides
+  (`Flat: As Built` + `Flat: Unknown`) and every cavity "as built/partial/
+  insulated (assumed)" wall. This is the point — a more accurate Effective EPC —
+  and (per ADR-0032 dec-5) such overlaid Properties stay excluded from the
+  Validation Cohort on the divergence signal.
+* `BuildingPartOverlay` gains a `roof_construction` field; `apply_simulations`
+  must fold it like `wall_construction`.
+* The decision is pinned by tests mirroring the probe CSVs (one row per
+  component × band), so a future RdSAP table revision that breaks parity trips a
+  regression rather than silently drifting from Elmhurst.
+* `scripts/hyde/probe_uvalues.py` stays as the re-runnable oracle: re-sweep to
+  re-confirm parity whenever the RdSAP tables or Elmhurst change.
+* A **coverage-audit pair** guards against the silent-no-op class this ADR fixes,
+  and is the reusable gate for every future portfolio (Hyde is the template):
+  - `scripts/hyde/audit_override_coverage.py` — enum-level: runs every override
+    value through its overlay mapper and flags those that produce no overlay or
+    only an inert field. Run it whenever an override enum or overlay changes.
+  - `scripts/hyde/audit_hyde_rows.py` — row-level: weights the verdict by actual
+    portfolio row counts and cross-checks that every "another/same dwelling above"
+    party-ceiling no-op is genuinely a Flat/Maisonette (a House/Bungalow with a
+    dwelling above is a data error, not a safe no-op — flagged to CSV for review).
+  Contradictory properties (party-ceiling roof on a non-flat type — Hyde had 50,
+  possibly houses split into flats) are **skipped entirely** by the `write` step:
+  no overrides are written for them and their org_refs are recorded to
+  `skipped_contradictory_properties.csv` for joint human review, rather than
+  guessing which of the two conflicting landlord fields is correct.
+  Known residue logged, not silently dropped: `PitchedWithSlopingCeiling: *`
+  (~272 Hyde rows, needs the col-3 path), `Roof room(s)` (needs `sap_room_in_roof`),
+  the `Renewables` column (no ComponentSpec — PV unmapped), and `Timber frame,
+  with additional insulation` (wall, ~7 rows).
diff --git a/docs/adr/0034-epc-prediction-cohort-broadens-to-nearby-postcodes.md b/docs/adr/0034-epc-prediction-cohort-broadens-to-nearby-postcodes.md
new file mode 100644
index 000000000..29d58d45b
--- /dev/null
+++ b/docs/adr/0034-epc-prediction-cohort-broadens-to-nearby-postcodes.md
@@ -0,0 +1,90 @@
+# EPC Prediction cohort broadens to nearby postcodes
+
+ADR-0029 sizes an EPC-less Property from the **Comparable Properties** in its
+postcode; ADR-0031 decision 5 made `property_type` the **hard** cohort filter — a
+flat is never sized from houses — and gated out any Property with no same-type
+comparable. This records how we **broaden** the cohort when a Property's own
+postcode is too sparse to fill, rather than gating it out. Resolved against a
+real failure on branch `feature/e2e-runs`: property 718580, the only flat lodged
+in postcode `BR6 6BS` (the other 8 certs were houses/bungalows), gated out and
+failed its modelling subtask.
+
+## Status
+
+Accepted. Extends ADR-0029 / ADR-0031 decision 5 (the postcode cohort).
+
+## Context
+
+ADR-0031 decision 5 anticipated this — "an Ordnance Survey `postcode_search`
+source can supply property type more broadly … wiring it is a later enhancement
+that widens the eligible population." The gating it describes is correct (never
+size a flat from a mixed-type cohort), but it makes prediction only as good as
+the *own* postcode's lodged stock. A genuinely-isolated type (one flat among
+houses) is unpredictable with no recourse, and a no-EPC + can't-predict Property
+fails its subtask — which, over SQS, retries and dead-letters even though the
+input data is permanently insufficient.
+
+The legacy engine handled this by **trimming the postcode** (`BR6 6BS` → `BR6 6B`
+→ `BR6` …) and re-querying, because the old EPC API accepted partial postcodes.
+The current gov EPC API (`api.get-energy-performance-data.communities.gov.uk`)
+does **not**: its domestic search accepts only a *full* real postcode, `uprn`,
+`council[]`, `constituency[]`, or `address` — confirmed against its OpenAPI spec.
+There is no outcode/prefix, radius, or lat/long search.
+
+## Decisions
+
+### 1. Broaden to the real unit postcodes physically nearest the target
+
+When the own-postcode cohort yields no same-type member, the cohort is broadened
+to the real unit postcodes around the target, resolved from its coordinates via
+**postcodes.io**'s keyless `nearest` endpoint (already a trusted dependency in
+`scripts/fetch_epc_prediction_dense_corpus.py`). Each nearby postcode is then
+searched exactly as the own postcode is — so `property_type` stays the same hard
+filter and ADR-0031 decision 5 is upheld; only the *reach* of the candidate pool
+widens, never the selection rule. The hard gate still fires when even the
+broadened cohort has no same-type comparable: broadening widens the eligible
+population, it does not force a prediction.
+
+### 2. postcodes.io over `council[]` and a bulk centroid dataset
+
+- **`council[]`** (the only "wider than postcode" gov-API filter) returns the
+  *whole* local authority — tens of thousands of certs, many pages — and its
+  result rows carry **no `property_type`**, so narrowing to the target's type
+  would mean fetching every certificate. Rejected: cost is unbounded by distance
+  and dominated by per-cert fetches.
+- **OS Code-Point Open / ONSPD → S3** would give an offline unit-postcode→
+  coordinate table, but is a ~1.7M-row asset to ingest and host for a path that
+  fires rarely. Rejected as disproportionate; reconsider if postcodes.io's
+  availability becomes a liability.
+- **OS Places radius API** needs an `OS_API_KEY` the modelling path does not
+  otherwise carry. Rejected to avoid a new secret.
+
+postcodes.io is keyless, bounded by radius (a tight neighbourhood, not an
+authority), and reuses the existing per-postcode search unchanged.
+
+### 3. Lazy, nearest-first with early-stop, and soft-failing
+
+Broadening runs **only on gate-out** (a no-EPC Property whose own postcode lacks
+a same-type comparable) — the common cases never pay for it. Nearby postcodes are
+walked **nearest first** and the walk **stops early** once enough same-type
+comparables surface, so a dense area resolves in one or two searches instead of
+the whole radius. Results are memoised per `(postcode, property_type)`. The
+postcodes.io call is **soft-failing**: any error (after the shared transient
+retry) degrades to the seed postcode alone, so a flaky or unavailable
+postcodes.io can never break prediction — it just declines to broaden.
+
+## Consequences
+
+- A new external dependency, postcodes.io, sits in the modelling/Lambda path. It
+  is keyless and isolated behind `PostcodesIoClient` (shared transient-retry +
+  soft-fail), but its availability and rate limits are now a (bounded) operational
+  concern. ADR-0031 decision 5's `postcode_search` lever remains an alternative.
+- The `ComparablePropertiesRepository` gains `candidates_near` alongside
+  `candidates_for`; the predictor/handler try the own postcode first and broaden
+  only on an empty cohort.
+- Prediction reaches across postcode boundaries, so the geo-distance weighting
+  ADR-0029 already applies (a comparable's vote decays with haversine distance)
+  becomes load-bearing for broadened cohorts, not just a refinement.
+- `property_type` gating is unchanged: a Property with no same-type comparable
+  *anywhere nearby* is still gated out — now a genuine "no comparable stock"
+  signal rather than an artefact of a sparse single postcode.
diff --git a/docs/adr/0035-coherent-heating-system-synthesis.md b/docs/adr/0035-coherent-heating-system-synthesis.md
new file mode 100644
index 000000000..3dbbcb006
--- /dev/null
+++ b/docs/adr/0035-coherent-heating-system-synthesis.md
@@ -0,0 +1,114 @@
+# Coherent Heating System is owned by the synthesiser, not the calculator
+
+## Status
+
+accepted
+
+## Context
+
+A dwelling's heating is one conceptual **system**, but its fields are physically
+scattered across `EpcPropertyData` because that type mirrors the gov-API / RdSAP
+schema: the main cluster lives on `sap_heating`, the electricity tariff on
+`sap_energy_source.meter_type`, and hot-water flags (`has_hot_water_cylinder`,
+`solar_water_heating`) on loose top-level fields.
+
+Three places **synthesise** a heating system — a Measure Option (HHRSH/ASHP), a
+Landlord Override, and EPC Prediction's heating donor — and each was hand-copying
+a *different ad-hoc subset* of those fields. The override and the donor both
+omitted `meter_type`. Property 713406 (a predicted property whose landlord
+override set "Electric storage heaters") landed on the oil structural template's
+single-rate meter, so its overnight storage heat billed at the peak electricity
+rate: the calculator scored it **SAP 13 (G)** instead of **~50 (E)**, which then
+inflated the HHRSH measure to **+45.8 SAP** and pushed the plan to band A.
+
+## Decision
+
+Treat **"a heating system"** as one named boundary (a **Coherent Heating
+System** — see CONTEXT.md). Whoever *synthesises* a heating system owns covering
+the whole boundary, with a fill policy suited to its source:
+
+- **Measure** → set a designed end-state (already did).
+- **Landlord Override** → *complete* the partial system the landlord named.
+  Companion fields are **derived from the SAP code**, not hand-attached per
+  archetype: the off-peak meter from the calculator's single off-peak
+  classification (`OFF_PEAK_IMPLYING_HEATING_CODES`, SAP §12 Rules 1-2), and —
+  where a field has no logical pairing — a **conservative** default (storage
+  charge control → manual, SAP Table 4e 2401, the lowest-SAP storage control).
+  So adding a heating archetype is just adding its code; coherent companions
+  fall out and cannot be forgotten.
+- **EPC Prediction donor** → *carry* a real neighbour's whole coherent set
+  (including its `meter_type`), since the donor is already internally coherent.
+
+**Coherence is a synthesis-time obligation, never a calculator normalisation.**
+A real lodged cert is scored exactly as lodged — the calculator must not "fix" a
+genuinely single-rate storage dwelling (its existing Unknown-meter inference is
+a separate, spec-faithful net for certs that lodged *Unknown*, and does not fire
+on an explicit meter). A contract test guards the override path: every off-peak
+code the archetype map can emit must drag a `Dual` meter, and every other code an
+explicit `Single` meter — a system switch can never leave the previous system's
+meter in place.
+
+### Amendment: the gas-boiler companion set (property 728513)
+
+The storage-heater drag-along above covered electric systems; a landlord-named
+**gas boiler** was still synthesised as a sparse patch — only the SAP code (its
+meter/charge-control companions are `None` for a boiler). The replaced system's
+fields therefore bled through: an electric-storage flat reclassified as a gas
+combi kept `mains_gas=False`, heating category 7, the 2401 storage charge
+control, a `Dual` meter and an electric-immersion cylinder. That incoherent
+record gated out the gas-boiler-upgrade Measure and made the heating Generator
+read the dwelling as off-gas (offering HHRSH storage to a gas property).
+
+A gas-boiler archetype (Table 4b 102 regular / 104 combi / 120 CPSU) now drags
+its **whole** coherent set, code-derived like the storage companions:
+
+- **`mains_gas=True` + `main_fuel_type=26`** — a gas boiler implies a mains-gas
+  connection and gas main fuel (so a heating-system-only override is
+  self-coherent, not dependent on a companion `main_fuel` override). The
+  `main_fuel` overlay independently sets `mains_gas=True` for a "mains gas" fuel;
+  the two agree (both 26 / True) so composition stays order-independent. A
+  non-gas `main_fuel` override (electricity/LPG/oil) leaves `mains_gas` **None**
+  (unchanged) — an electric main heating does not prove there is no gas hob.
+- **`main_heating_category=2`** (gas boiler) and **`fan_flue_present=True`** — a
+  modern room-sealed condensing boiler.
+- **`main_heating_control=2106`** (programmer + room thermostat + TRVs) — the
+  landlord names the boiler, not its controls. Unlike the storage charge control
+  (where the *conservative* lowest-SAP default is right because the control is
+  genuinely unknown), a gas boiler installed under modern Building Regs must
+  carry compliant controls, and the overlay already assumes the modern condensing
+  efficiency for the boiler — so **assuming modern controls is the coherent,
+  consistent default** (the alternative, a conservative "no controls" 2101, was
+  considered and rejected as inconsistent with the assumed-modern boiler). The
+  controls tune-up Measure still adds zone control on top.
+- **Hot water from the main system** (`water_heating_code=901`,
+  `water_heating_fuel=26`) with the cylinder set from the boiler type — a combi
+  (104) has **no** cylinder (`has_hot_water_cylinder=False`), a regular boiler /
+  CPSU keeps one. (Mirrors Elmhurst: the cylinder choice is offered for a regular
+  condensing boiler and greyed out for a combi.)
+- **`meter_type="Single"`** — a boiler is single-rate; the explicit Single meter
+  overwrites any inherited storage `Dual` (the symmetric mirror of storage→Dual).
+
+A `mains_gas` flag was added to the `main_fuel` overlay. The companion-fuel and
+heating-system overlays now share the `mains_gas` / `main_fuel_type` fields
+rather than being strictly disjoint — accepted because they only ever agree for
+the mains-gas archetypes. The archetype map holds only mains-gas boilers, so a
+gas-boiler override always implies mains gas; a *contradictory* fuel override
+(gas boiler + a non-gas fuel) is out-of-scope incoherent landlord input (a
+finaliser-level validation, not an overlay concern).
+
+## Considered Options
+
+- **Reify a `HeatingSystem` value object** all three produce/consume — rejected:
+  overlaps `HeatingOverlay` and is a large, risky restructure for the value.
+- **A global coherence pass over the assembled effective EPC** — rejected: it
+  would corrupt real lodged certs (force storage→dual on a genuine single-rate
+  lodgement). Coherence must be scoped to synthesis points.
+- **Set `meter_type="Unknown"` and lean on the calculator's storage inference**
+  — rejected as the primary mechanism: an explicit `Dual` is self-contained,
+  matches the measure overlay, carries display value, and does not depend on a
+  repo *extension* that could later be tightened toward spec.
+
+This amends [ADR-0029](0029-epc-prediction-from-comparable-properties.md) (the
+heating donor now carries the meter) and extends
+[ADR-0032](0032-landlord-override-epc-overlay.md) (the override overlay derives
+coherent companions).
diff --git a/docs/adr/0036-non-separated-conservatory-mapper-split-and-round-trip-persistence.md b/docs/adr/0036-non-separated-conservatory-mapper-split-and-round-trip-persistence.md
new file mode 100644
index 000000000..ac5c01472
--- /dev/null
+++ b/docs/adr/0036-non-separated-conservatory-mapper-split-and-round-trip-persistence.md
@@ -0,0 +1,78 @@
+---
+Status: accepted
+---
+
+# Non-separated conservatory: mapper-owned §6.1 split, persisted 1:1, with round-trip fidelity as the contract
+
+Decided in a `/grill-with-docs` session (2026-06-24) while fixing the gov-API
+conservatory path (repro cert 718138, `RdSAP-Schema-19.0`). Extends
+[ADR-0015](0015-mappers-own-cert-normalization.md) (mappers own cert
+normalization) and echoes [ADR-0035](0035-coherent-heating-system-synthesis.md)
+(coherence is a synthesis-time obligation, never a calculator normalisation).
+
+## Context
+
+The gov register lodges a **Non-Separated Conservatory** (`conservatory_type = 4`)
+as a glazed "building part" carrying only `{floor_area, room_height,
+double_glazed, glazed_perimeter}` — no construction age band, no wall/roof, no
+floor dimensions. Treated as a generic fabric building part it is **mis-scored**
+(its floor heat-loss is counted as a normal part) and **cannot persist** (the
+`epc_building_part` columns `construction_age_band` / `wall_construction` are
+NOT-NULL). The correct RdSAP treatment folds it into the dwelling under §6.1; a
+**Separated Conservatory** (`type 2/3`) is disregarded under §6.2 and lodges no
+glazed part. See CONTEXT.md for both terms.
+
+Two placements were available for the §6.1 "split" (detect the glazed part, lift
+it out of the fabric parts, carry it as the dwelling's conservatory):
+
+- in the **mapper**, producing a normalized `EpcPropertyData` with
+  `sap_conservatory` set and the glazed part excluded from `sap_building_parts`
+  (the existing 21.0.1 choice, commit `d501535c`);
+- at the **calculator / persistence-reload boundary**, re-deriving the split
+  each time the picture is scored.
+
+The production flow is *map → save → reload-from-DB → score*. The mapper split
+alone is invisible to the scored picture, because the reload (`_compose`) did not
+reconstruct `sap_conservatory` and the glazed part was excluded from the
+persisted `sap_building_parts` — so the conservatory was silently dropped on the
+path that actually scores. This is the same latent gap the 21.0.1 fix carried.
+
+## Decision
+
+1. **The §6.1 split lives in the mapper.** It is cert-shape knowledge, not
+   physics (ADR-0015). `EpcPropertyData` — `sap_conservatory` populated, glazed
+   part excluded from `sap_building_parts` — is the canonical normalized shape.
+   We do **not** re-derive the split in the calculator or at reload; a global
+   coherence pass over the assembled picture is rejected for the same reason
+   ADR-0035 rejected one for heating.
+2. **Persist the conservatory 1:1 on `epc_property`.** `SapConservatory` is a
+   single optional value per dwelling, so it is five nullable columns on
+   `epc_property` (alongside the existing scalar conservatory flags), not a child
+   table. Save writes them; `_compose` rebuilds `SapConservatory` from them. The
+   columns are FE/Drizzle-owned — documented in
+   `docs/migrations/epc-property-round-trip-fidelity.md`, applied there, never by
+   this repo.
+3. **Round-trip fidelity is the contract that makes the split correct.** Because
+   the split lives only in the mapper, the *only* thing guaranteeing the scored
+   (reloaded) picture matches the mapped one is that `EpcPropertyData` survives
+   `save → get` unchanged. We treat that as an enforced invariant: the
+   deep-equality round-trip test (Model#1129) gains a non-separated-conservatory
+   case, and a structural field-coverage guard fails if any `EpcPropertyData`
+   field is neither reconstructed by `_compose` nor on a documented allow-list —
+   turning "latent until a fixture exercises it" into an explicit decision.
+
+## Consequences
+
+- A future reader sees a conservatory — a "building part" in the source —
+  persisted as flat columns on `epc_property` and absent from the dwelling's
+  building parts. That is deliberate: it is a §6.1 dwelling attribute, not a
+  fabric part.
+- The persistence + guard are schema-version-agnostic, so they close the same
+  latent gap for the already-merged 21.0.1 path, not only 19.0.
+- The structural guard documents `sap_roof_windows` and the `solar_hw_collector_*`
+  fields as known round-trip gaps (their FE columns are tracked follow-ups), so
+  they are visible rather than silently dropped.
+- The per-schema mapper piece (declare the four glazed fields + filter + fold)
+  still has to be ported to the remaining gov mappers (17.0/17.1/18.0/20.0.0/
+  21.0.0) one validated cert at a time; this ADR covers the shared shape, not
+  that rollout.
diff --git a/docs/adr/0037-full-sap-cert-family-rebaselines-like-rdsap.md b/docs/adr/0037-full-sap-cert-family-rebaselines-like-rdsap.md
new file mode 100644
index 000000000..d6977a571
--- /dev/null
+++ b/docs/adr/0037-full-sap-cert-family-rebaselines-like-rdsap.md
@@ -0,0 +1,26 @@
+# Full-SAP cert family rebaselines to SAP 10.2, validated by growing Elmhurst-anchored coverage
+
+## Context
+
+Certs come in two structural families: **RdSAP** (reduced-data) and **full-SAP** (measured openings, `assessment_type = "SAP"`, e.g. `SAP-Schema-16.x/17.x`, lodged under SAP 2012 / `sap_version` ~9.9x). Full-SAP certs route through `_from_full_sap` → `from_sap_schema_17_1`, a WIP mapper that left `sap_version`, `property_type`, `built_form`, `secondary_heating` and the display `EnergyElement`s (`main_heating`/`window`/`lighting`/`hot_water`) unmapped — even though the raw cert carries them all.
+
+Because `sap_version` was `None`, **Rebaselining** trigger (a) (`sap_version < 10.2` → Effective = Calculated, see CONTEXT.md / ADR-0013) could not fire, so **Effective Performance wrongly stayed equal to the lodged SAP-2012 value** while the Plan modelled the SAP-10.2 calc. Result: an "impossible" post-works downgrade (effective B/84 vs post-works C/80.14) on ≈**3,824 of 34,917** portfolio-796 plans (100% `effective == lodged` signature), an all-"Unknown" property-details panel, and zero recommendations. `property_type = None` also mis-classifies the dwelling in `heat_transmission` (`_is_house`/`_is_flat_or_maisonette`), so the calc value itself was degraded.
+
+## Decision
+
+Complete `SapSchema17_1` + `from_sap_schema_17_1` for the **calc-affecting** fields (`sap_version`, `property_type`, `built_form`, `secondary_heating`) **and** the display `EnergyElement`s in **one slice**, mirroring `from_rdsap_schema_17_1` inline (the repo's one-mapper-per-schema convention; equivalence guarded by test, not a shared helper). This makes the full-SAP family rebaseline to SAP 10.2 exactly as pre-10.2 RdSAP certs already do — **restoring documented behaviour, not a new policy**.
+
+The `sap_version` flip and the categorical completion are **coupled**: neither ships alone, because flipping Effective to a calc fed a `None` `property_type` would replace a wrong-high lodged score with a confidently-wrong-low calc one.
+
+## Validation
+
+The full-SAP path has **no accuracy corpus** (the gauge is RdSAP-21.0.1 only) and the lodged SAP-2012 value is not a valid SAP-10.2 target (Validation Cohort rule). We accept the path on **sufficient, growing coverage** rather than full corpus parity:
+
+- mapper-completeness unit tests (SAP-17.1 fixture → fields mapped),
+- the RdSAP-21.0.1 accuracy corpus staying green (the main path is untouched — ratchet not loosened),
+- **≥1 Elmhurst-anchored full-SAP `RealCertExpectation` gating the merge** (Jun-te's Elmhurst skill provides the accredited SAP-10.2 ground truth), coverage growing cert-by-cert over time,
+- a post-fix **population sanity sweep** flagging survivors (Effective ≥2 bands / >15 SAP below Lodged) for separate triage — surfaced, never silently shipped.
+
+## Consequences
+
+Deploying and re-running flips ~3,824 portfolio-796 Effective baselines from lodged-SAP-2012 to our-SAP-10.2; many legitimately drop a band. FE/product should expect a **visible population-wide baseline shift** — this is correct Rebaselining, not a regression. The RdSAP-path downgrades (Case B: ~8,160 plans, avg drop 0.7) are a **separate cause**, not addressed here. Tracked under the `fix/baseline-downgrades` umbrella, this being the first (full-SAP) sub-branch.
diff --git a/docs/adr/0038-solar-pv-bounded-to-dwelling-roof.md b/docs/adr/0038-solar-pv-bounded-to-dwelling-roof.md
new file mode 100644
index 000000000..2644ec5f3
--- /dev/null
+++ b/docs/adr/0038-solar-pv-bounded-to-dwelling-roof.md
@@ -0,0 +1,80 @@
+---
+status: accepted (extends ADR-0026)
+---
+
+# Solar PV array is bounded to the dwelling's own roof
+
+ADR-0026 sized a PV array at **0.70 × Google `maxArrayPanelsCount`**, implicitly
+assuming Google's roof *is* the dwelling's roof. On medium-quality imagery —
+common for **semi-detached and terraced** homes — Google conflates the dwelling
+with its neighbour and returns the **whole building's** roof, so the array is
+sized to two (or more) homes. Property 742003 (portfolio 812) is a **55 m²
+bungalow** but Google reports a 158.8 m² roof / 363 m² footprint → a ~16 kWp
+array → the plan jumps effective **E/49.7 → A/92.4 on solar alone**. We now
+**bound the array to the dwelling's own usable roof**, derived from the EPC, so
+Google can only ever influence the array *within* the dwelling's physical roof.
+
+## Decision
+
+**A dwelling-roof area budget caps the array, and segment selection is anchored
+on the dwelling, not Google's building centre.**
+
+- **Budget** = `roof_area(epc, MAIN) / cos(pitch) × USABLE_FRACTION`
+  (`USABLE_FRACTION = 0.5` — one usable, non-north plane minus setbacks /
+  obstructions; a documented, tunable constant alongside the existing
+  `_USABLE_PANEL_FRACTION = 0.70`). `roof_area` is the RdSAP §3.8 plan area
+  (`domain/building_geometry.py`); dividing by `cos(pitch)` converts it to the
+  pitched-surface units Google reports.
+- **Final cap** = `min(area-budget panels, 0.70 × maxArrayPanelsCount)`. This is
+  a **no-op on correctly-matched homes** (Google's roof ≈ the dwelling's, so the
+  area budget is ≳ what Google offers) — it only bites when Google's roof
+  materially exceeds the dwelling's, i.e. conflation.
+- **Trim unit = panels** (sub-segment partial fills allowed) — the budget is
+  routinely smaller than a single roof segment (~33 m² here, vs a 40.5 m²
+  segment).
+- **Segment selection by proximity:** rank Google's roof segments by distance
+  from the **dwelling's own lat/long** (`property_details_spatial`, *not*
+  Google's building `center`, which sits at the conflated centroid), keep the
+  home's roof and drop the neighbour's, then fill the budget from the home's
+  segments **by generation** (so a near-but-NE plane doesn't win over the home's
+  SW plane). This requires the `SolarPotential` projection to carry each
+  segment's **centre + area** (from `roofSegmentStats`, keyed by
+  `segment_index`), which it previously dropped.
+- **Fallback:** when `roof_area` is missing or absurd, fall back to the existing
+  0.70-Google cap — never emit a zero-panel or unbounded array.
+
+## Considered options
+
+- **Port the legacy `GoogleSolarApi.py` guards as-is** (`ROOF_AREA_TOLERANCE`
+  correction, `exclude_likely_duplicate_surfaces` + `double_property` halving,
+  `PERCENTAGE_OF_ROOF_LIMIT`). Rejected: fragile and case-specific — the
+  duplicate-surface heuristic only fires for `built_form == "Semi-Detached" and
+  extension_count == 0` (it would not fire for *this* bungalow), and relies on
+  azimuth-similarity + distance-to-Google-centre tolerances. A single physical
+  budget (this ADR) subsumes all three guards.
+- **OS building-footprint polygon clipping now** — geometrically intersect
+  Google's segments with the dwelling's MasterMap outline. Deferred: no GIS
+  footprint data is ingested today (we have OS *point* coordinates only). Logged
+  as the principled future enhancement — it fixes *which* segments robustly and
+  would let us delete the proximity heuristic entirely.
+- **Fill the budget strictly nearest-first.** Rejected: the nearest segment can
+  be poorly oriented (here the nearest is NE). Within the home's own segments we
+  fill by generation.
+- **Bound directly on Google's per-segment `areaMeters2`** instead of the EPC
+  roof. Rejected as the primary basis: those areas are themselves the conflated
+  roof; the EPC `roof_area` is the dwelling-scale ground truth. (We still read
+  the segment areas — to convert the budget into a panel count per segment.)
+
+## Consequences
+
+- `SolarPotential` / `SolarRoofSegment` grow a per-segment **centre + area**;
+  the Google `buildingInsights` → `SolarPotential` projection maps them from
+  `roofSegmentStats`. `recommend_solar` / `select_conservative_configs` thread
+  the dwelling's `roof_area` + anchor coordinate.
+- **SAP scores fall on conflated homes** (the intended correction); correctly
+  matched homes are unchanged. Regression-anchored on property 742003
+  (~16 kWp → ~6.5 kWp).
+- **Out of scope (separate ticket):** the solar bundle cost is flat (£6,550)
+  across 5.2–16 kWp, so the optimiser had no cost reason to prefer a smaller
+  array — with sizing bounded this stops mattering for the conflation case, but
+  the cost curve saturating is its own issue.
diff --git a/docs/adr/0039-override-aware-rebaselining.md b/docs/adr/0039-override-aware-rebaselining.md
new file mode 100644
index 000000000..bca7e7abc
--- /dev/null
+++ b/docs/adr/0039-override-aware-rebaselining.md
@@ -0,0 +1,27 @@
+# Effective baseline rebaselines off the calculator when overrides or prediction moved the picture
+
+## Context
+
+**Rebaselining** (CONTEXT.md) is meant to fire on three triggers: (a) the cert was lodged under a superseded methodology (`sap_version < 10.2`), (b) **Landlord Overrides / Site Notes changed the physical state**, or (c) the picture was **estimated (EPC Prediction) or remapped**. On any trigger the calculator's scoring of the Effective EPC *is* the Effective Performance; otherwise Effective equals the lodged accredited figure.
+
+The code only implemented trigger (a). `CalculatorRebaseliner` branched solely on `sap_version`: for a cert at `sap_version >= 10.2` it **kept the lodged figure** and ran the calculator only to log divergence — regardless of whether Landlord Overrides had changed the dwelling, or the picture was a synthesised prediction. So a property's stored **Effective baseline echoed the lodged accredited headline** even when the authoritative picture (EPC + overrides) described a different dwelling.
+
+This surfaced as a portfolio-796 hit-list (e.g. property 725634): a lodged ASHP+solar cert scored B/81, but the landlord override reassigned it to electric storage heaters on an uninsulated cavity. The stored Effective stayed **B/81** (lodged echo) while the modelling plan modelled the override-applied picture at **C/D** — an incoherent "already B, post-works C/D" plan. The same applied to predicted properties, whose synthetic headline was trusted as if accredited.
+
+The "trust lodged at ≥10.2" rule (ADR-0037 / the *Calculated SAP10 Performance* glossary entry) exists for a real reason: the deterministic calculator under-reads genuine accredited certs (e.g. 74.6 vs an accredited 81 on the un-overridden 725634 ASHP cert), so for a **pristine** lodged cert the accredited figure is the better baseline. The bug was applying that rule unconditionally — including to certs the landlord had explicitly corrected.
+
+## Decision
+
+Thread a **`physical_state_changed`** signal (`Property.physical_state_changed` — true on Site Notes, Landlord Overrides, or EPC Prediction) from the `PropertyBaselineOrchestrator` into the Rebaseliner. The calculator output becomes Effective Performance whenever **any** trigger fired — `pre_sap10` (a) **or** `physical_state_changed` (b/c) — tagged `pre_sap10` / `physical_state_changed` / `both`. Only a **pristine lodged SAP ≥ 10.2 cert with no overrides** keeps its accredited figure (`reason = "none"`), and that is now the *only* case the calculator runs purely to validate (and the only case the accredited-vs-calc divergence warning is meaningful, so divergence is logged only there).
+
+This realises trigger (b)/(c) as the domain model always claimed — **restoring documented behaviour, not new policy**. "EPC + overrides is authoritative" (decided with Khalim): a landlord's correction is trusted over the lodged cert, and a mistaken override is a *data* problem fixed at source (with the client), not papered over by the baseline.
+
+`physical_state_changed` is deliberately coarse — **any** resolved override trips it, not only a "material" one. A no-op override (asserting what the cert already says) would re-introduce the calculator's known under-read into the baseline; we accept that because landlords rarely enter no-op overrides, and "the assembled picture is authoritative" is the simpler, more defensible rule than a materiality threshold.
+
+## Consequences
+
+- Re-running the baseline flips every overridden / predicted property's Effective from its lodged/synthetic headline to the calculator's scoring of EPC + overrides. **Many legitimately change band** (725634 → D, 739060 → D, 721985 → C, …). The displayed baseline and the modelling plan now derive from the *same* picture, so they agree — the incoherent "B baseline, C/D plan" is gone.
+- FE/product should expect a **visible baseline shift** on overridden/predicted properties — this is correct Rebaselining. Pristine lodged ≥10.2 certs are unchanged.
+- A wrong override now *visibly* downgrades a property (725634 was really an ASHP cert). That is intended: the override is authoritative for modelling, and bad override data is a separate, surfaced concern — an override-plausibility scanner (anomalies like "another dwelling above", community-heated + gas-boiler) is its own ticket.
+- The baseline is only correct on a **faithful** Effective EPC: this decision is paired with [ADR-0040](0040-nested-field-epc-persistence-fidelity.md) (the DB EPC must round-trip without dropping PV arrays / floor flags), and the orchestrator must read the same faithful picture the plan modelled.
+- Numbers finalise only after deploy + re-model (the handler re-fetches the live cert and re-saves it faithfully, then the baseline recomputes). The `rebaseline_reason` enum (`none` / `pre_sap10` / `physical_state_changed` / `both`) already existed in the FE schema; this is a backend-only change.
diff --git a/docs/adr/0040-nested-field-epc-persistence-fidelity.md b/docs/adr/0040-nested-field-epc-persistence-fidelity.md
new file mode 100644
index 000000000..12781a5ec
--- /dev/null
+++ b/docs/adr/0040-nested-field-epc-persistence-fidelity.md
@@ -0,0 +1,29 @@
+# EPC persistence must round-trip nested scoring fields, guarded recursively
+
+## Context
+
+The modelling pipeline scores the **DB-stored** `EpcPropertyData` (ADR-0003: the DB is the read model). ADR-0036 added a round-trip-fidelity guarantee — an `EpcPropertyData` saved to the `epc_property` tables, reloaded and mapped back must reconstruct the original — backed by a deep-equality round-trip test and a structural coverage guard.
+
+Both had a blind spot: they only covered **top-level** `EpcPropertyData` fields. The round-trip test only catches a dropped field when a *fixture populates it*, and the chosen fixtures (RdSAP-21.0.0/21.0.1) happened not to exercise certain fields; the structural guard inspected only `dataclasses.fields(EpcPropertyData)`, never recursing into nested objects. So fields on nested sub-objects were dropped **silently**, corrupting the scored baseline:
+
+- `sap_energy_source.photovoltaic_arrays` — no table existed; a dwelling's solar PV was dropped on save, **−12 SAP points** on a real ASHP+solar property (725634: `calc(live)` 74.6 → `calc(reloaded)` 62.1).
+- `SapFloorDimension.is_exposed_floor` / `is_above_partially_heated_space` — no columns; a `True` flag reloaded as the `False` default, **flipping the floor's heat-loss path** (+8 SAP points on 721534).
+- Recursing the guard then surfaced **seven more calculator-read nested fields** with no column (community-heating fuel + CHP fraction, alt-wall `is_sheltered`, wall insulation thermal conductivity, `pv_diverter_present`, measured cylinder volume, AP50 air permeability) — the same silent-drop class.
+
+A lossy read model is corrosive: the handler models off the faithful **in-memory** live cert (so the *plan* is right) but the baseline re-reads the lossy DB projection, so the two disagree for reasons unrelated to any override — compounding the ADR-0039 baseline confusion.
+
+## Decision
+
+Make the `epc_property` projection **faithful for every scoring field**, and make the guard able to *see* nested gaps:
+
+1. **New storage** (FE/Drizzle migrations, applied additively): `epc_photovoltaic_array` child table (one row per array, ordered by `array_index`); `epc_floor_dimension.{is_exposed_floor, is_above_partially_heated_space}`; and columns for the seven calculator-read nested fields. Python SQLModel + `save`/`_compose` mappers wire each, with deep-equality round-trip tests.
+2. **Recursive structural guard**: the ADR-0036 coverage guard now walks **every domain dataclass reachable from `EpcPropertyData`** (through Optionals/lists) and asserts each field is either reconstructed by a `_compose`/`_to_*` mapper or on an allow-list keyed by `Class.field`. Adding a field at any depth now forces a conscious persist-or-justify decision.
+
+Fields the calculator does **not** read stay allow-listed as dormant (e.g. `SapBuildingPart.{floor_u_value, roof_u_value, wall_u_value}`); a few structural gaps (`SapRoofWindow`, room-in-roof detail, alt-wall `u_value`/`wall_thickness_mm`) remain FE-column-pending and are explicitly allow-listed, not silent. The top-level `extract_fans_count` (a mirror of the persisted `sap_ventilation` copy the calculator actually reads) is reconstructed from that column so the object round-trips complete with no exception.
+
+## Consequences
+
+- The DB EPC round-trips **exactly for every scoring field** — verified against the live schema: 725634 and 721534 now reload with SAP delta `+0.00` (was −12.5 / +8.2). Residual non-equality is limited to allow-listed dormant fields and a sub-millimetre `real`-column float artifact, none scoring-relevant.
+- This is a **prerequisite for [ADR-0039](0039-override-aware-rebaselining.md)**: storing `calc(EPC + overrides)` as the Effective baseline is only correct if the stored EPC is faithful. Until a property is re-modelled (handler re-fetches + re-saves), its existing DB row stays lossy, so the live baseline finalises only after deploy + re-model.
+- A class of silent persistence drops can no longer hide: the recursive guard fails CI on any unjustified nested gap.
+- New EPC scoring fields now carry a persistence cost (column + mapper + round-trip assertion) by construction — the intended friction.
diff --git a/docs/baseline-downgrade-followups.md b/docs/baseline-downgrade-followups.md
new file mode 100644
index 000000000..cc3931d36
--- /dev/null
+++ b/docs/baseline-downgrade-followups.md
@@ -0,0 +1,99 @@
+# Follow-ups from the full-SAP baseline-downgrade work (ADR-0037)
+
+Open items surfaced while fixing the full-SAP mapper / portfolio-796 downgrades.
+Each is **separate from** the full-SAP fix (`fix/baseline-downgrades`).
+
+## 1. RdSAP ventilation mapping is inconsistent across schemas
+
+**Severity: accuracy bug for MEV/MVHR dwellings.** The mappers handle
+`sap_ventilation` four different ways:
+
+- `17_0` + full-SAP — build via `_sap_17_1_ventilation`, which **maps**
+  `mechanical_ventilation_kind`. ✅
+- `21_0_1` — rich inline `SapVentilation(...)` incl. the kind. ✅
+- **`17_1` / `18_0` / `20_0_0`** — built `SapVentilation(sheltered_sides=…)` and
+  **dropped** the kind. **Fixed in #1333** (mirror `_api_mechanical_ventilation_kind`).
+- **`19_0` / `21_0_0`** — set **no `sap_ventilation` at all** → the
+  `EpcPropertyData` default (`None`). They dropped the **entire** ventilation
+  block (sheltered sides + kind), not just the kind. **Fixed in
+  `feat/rdsap-19-21-ventilation`**: both now construct `SapVentilation(...)`
+  mirroring 21.0.1, but only for the fields each schema lodges — the top-level
+  `mechanical_ventilation` enum (→ kind) and `sheltered_sides` (from
+  `built_form`). Neither lodges the fan/flue/vent counts, so those stay unset
+  (RdSAP Table-5 age defaults — see counts note below).
+
+Either way, an MEV/MVHR cert (`mechanical_ventilation ≠ 0`) is treated as
+**natural** by the affected mappers — wrong §2 ventilation cascade (and heat
+recovery). Natural certs (code `0`/`5` → `None`) are unaffected.
+
+- For **natural-ventilation** certs (`mechanical_ventilation = 0`, e.g. UPRN
+  100020603823 / property 726605) it's **benign** — unmapped → `None` defaults to
+  natural in the §2 cascade.
+- For **MEV/MVHR** certs (`mechanical_ventilation ≠ 0`) the calculator treats the
+  dwelling as **naturally ventilated**, getting the SAP §2 ventilation cascade
+  (and any heat recovery) wrong → mis-scored SAP.
+
+The granular **counts** (fans/flues/vents) are *not* a bug: older RdSAP open-data
+certs don't lodge them, and the calc correctly uses RdSAP Table-5 age defaults.
+`percent_draughtproofed` is mapped (top-level) and read by the calc.
+
+**19.0 / 21.0.0 fix (done, `feat/rdsap-19-21-ventilation`):** both build
+`SapVentilation(sheltered_sides=…, mechanical_ventilation_kind=…)` mirroring
+21.0.1. Guarded by the extended mapper-level MVHR test + a `sheltered_sides`
+regression, with the corpus (held 73.3% / MAE 0.774 — it's 21.0.1-only so the
+change isn't exercised by it) and the 6002-case mapper-corpus staying green.
+**Outstanding SAP-accuracy fast-follow:** an **Elmhurst-anchored MEV/MVHR
+`RealCertExpectation`** (the corpus is natural-vent-dominated, so the kind
+change isn't exercised by it). **Blast radius (still to quantify):** count
+portfolio-796 certs on schema 19.0 / 21.0.0 with `mechanical_ventilation ≠ 0`.
+
+## 2. FE "Main Fuel: Unknown" is FE-side, not a Model mapper gap
+
+`main_fuel_type` (the gov fuel **code**) **is** populated Model-side — UPRN
+10093412452 (709791) → `1`, UPRN 100020603823 (726605) → `26` — and is persisted
+(`epc_main_heating_detail.main_fuel_type`). So the panel's "Main Fuel: Unknown"
+is the **front-end** either not mapping the code → fuel name or reading a field we
+don't populate. Needs an FE-repo (Drizzle/Next) check, not a Model change.
+
+## 3. Survivor clusters from the post-fix population sweep
+
+`scripts/hyde/case_a_population_sweep.py`: the representative sample rebaselined
+cleanly (0 survivors), but the worst-old-drop sample held **28 survivors**
+(lodged A/B → new C/D, 15–25 SAP) in tight UPRN clusters (new-build blocks),
+spanning multiple schemas (16.0/16.1/17.1/18.0.0) and heating types. No single
+mapper-gap signature → likely genuine SAP-2012→10.2 drops for very-high-lodged
+new-builds, but **triage one in Elmhurst** to confirm genuine vs a residual calc
+issue before trusting the cohort.
+
+## 4. Predicted-property display path (e.g. property 721167)
+
+721167 has **no lodged EPC** (predicted). Its Heating-Control / Main-Fuel /
+Ventilation Unknowns come from the prediction synthesis path
+(`domain/epc_prediction/epc_prediction.py`), **not** the lodged-cert mappers and
+**not** the landlord-override overlay (`overlays_from` is simulation-time only,
+ADR-0032 — it never writes the persisted/displayed EPC). Investigated and fixed
+on `fix/predicted-property-display-unknowns`:
+
+- **Heating Control — FIXED (Model).** `_apply_heating_donor` copied the donor's
+  *calc* `sap_heating` cluster but left the *display* rows (`main_heating`,
+  `main_heating_controls`) on the size-representative structural template —
+  incoherent with the donated system, and "Unknown" whenever the template lodged
+  no control row (exactly 721167: no `main_heating_controls` energy element
+  persisted). Now carries the donor's display heating + control alongside the
+  calc cluster.
+- **Ventilation — FIXED (Model).** The prediction never synthesised ventilation
+  — it kept the template's `sap_ventilation`, so a predicted dwelling in an
+  MEV/MVHR neighbourhood was scored + displayed as natural. New
+  `_apply_ventilation_mode` modes `mechanical_ventilation_kind` across the cohort
+  (recency/geo-weighted, mirroring glazing). Natural-vent cohorts mode to None
+  and stay natural (§2 default) — so a genuinely natural dwelling like 721167
+  correctly stays natural; the fix moves only real MEV/MVHR neighbourhoods.
+- **Main Fuel — NOT a prediction gap.** `epc_main_heating_detail.main_fuel_type`
+  *is* persisted for predicted properties (721167 → `26` = mains gas, carried
+  from the heating donor). The "Unknown" is the **same FE code→name gap as item
+  2** (the Drizzle/Next repo not mapping the fuel code), not a Model issue.
+
+Both fixes are display-only for the calculator (component-accuracy gate, corpus
+harness, and prediction e2e all green); persistence already carries
+`main_heating_controls` (energy element) and `ventilation_mechanical_ventilation_kind`,
+so the synthesised values reach the passport on the next prediction run.
diff --git a/docs/migrations/epc-property-round-trip-fidelity.md b/docs/migrations/epc-property-round-trip-fidelity.md
index 53590a2fe..ce7684f0c 100644
--- a/docs/migrations/epc-property-round-trip-fidelity.md
+++ b/docs/migrations/epc-property-round-trip-fidelity.md
@@ -48,11 +48,67 @@ and **still require the matching DB migration** wherever the physical tables liv
 - **§2.1 `epc_renewable_heat_incentive` table** (#1137) — now created on the SQLModel and wired
   into save/get; the round-trip test asserts **full deep-equality** (no exclusion). DB migration
   still required.
+- **§3.1 conservatory geometry** (ADR-0036) — the five `conservatory_*` columns are now on the
+  SQLModel and wired into save/`_compose`; the round-trip test gains a non-separated-conservatory
+  case (deep-equality). DB migration still required. This closes the §6.1 conservatory round-trip
+  for **every** gov schema, not just the 19.0 cert that surfaced it.
 
-**Still open (follow-up issues):** the remaining §2 structural tables (room-in-roof detail, PV
-arrays, roof windows) + §3 nested-wall fields (`SapAlternativeWall.u_value`/`wall_thickness_mm`) +
-`SapFloorDimension` exposed-floor flags — none populated in the 21.0.0/21.0.1 fixtures, so latent
-until a richer fixture exercises them.
+**Structural guard (ADR-0036):** `tests/repositories/epc/test_epc_persistence_field_coverage.py`
+now fails if any `EpcPropertyData` field is neither reconstructed by `_compose` nor on a documented
+allow-list — so the gaps below are no longer "latent until a fixture exercises them", they are
+explicit and tracked.
+
+**Still open (follow-up issues):** the remaining §2 structural tables (room-in-roof detail,
+**roof windows** — `sap_roof_windows`) + §3 nested-wall fields
+(`SapAlternativeWall.u_value`/`wall_thickness_mm`) + the
+solar-HW collector columns (`solar_hw_collector_orientation` / `_pitch_deg` / `_overshading`, §3.1).
+Each is on the structural-guard allow-list with a reason until its columns land.
+
+---
+
+## Slice 2 — PV arrays + floor heat-loss flags (#TBD)
+
+Closed two **scoring-relevant** round-trip gaps that were corrupting the modelling baseline by up
+to ~12 SAP points on a real Hyde property (725634, an ASHP + solar dwelling whose DB-read picture
+scored ~12 points below the in-memory cert it was modelled from):
+
+- **§2 `epc_photovoltaic_array` child table** — `sap_energy_source.photovoltaic_arrays` (a list of
+  `peak_power` kWp + `pitch`/`overshading`/`orientation` SAP codes) had no table, so every array was
+  dropped on save and the dwelling lost its PV generation credit. Now persisted (one row per array,
+  ordered by `array_index`) and reconstructed in `_to_energy_source`. **Round-trip test asserts
+  deep-equality** (`test_photovoltaic_arrays_round_trip`).
+- **§3 `epc_floor_dimension` flags** — `is_exposed_floor` + `is_above_partially_heated_space` had no
+  columns, so a `True` flag round-tripped back to the `False` default and silently flipped the
+  floor's heat-loss path. Now persisted and reconstructed in `_to_floor_dimension`. **Round-trip
+  test** `test_floor_dimension_heat_loss_flags_round_trip`.
+
+DB migration: FE branch `feature/epc-pv-and-floor-heatloss-schema` (additive — new table + two
+`NOT NULL DEFAULT false` columns; no backfill). Run `drizzle-kit generate`/migrate **before**
+deploying this backend code.
+
+### Recursive-guard gaps (surfaced AND closed)
+
+Generalising the ADR-0036 structural guard to recurse into **nested** dataclasses (it previously
+saw only `EpcPropertyData`'s top-level fields — which is exactly how the PV-array and floor-flag
+drops stayed latent) surfaced **7 pre-existing, calculator-read** nested fields with no FE column —
+silent-drop gaps of the **same class as the PV bug**. All 7 are now **closed**: FE columns added
+(additive migration), Python SQLModel + save/`_compose` wired, and a deep-equality round-trip test
+(`test_calculator_read_fields_round_trip`) pins them. Their allow-list entries were removed, so the
+guard now *enforces* their reconstruction.
+
+| Field | Lives on | DB column (table) |
+|---|---|---|
+| `community_heating_boiler_fuel_type`, `community_heating_chp_fraction` | `MainHeatingDetail` | `epc_main_heating_detail` |
+| `is_sheltered` | `SapAlternativeWall` | `epc_building_part.alt_wall_{1,2}_is_sheltered` |
+| `wall_insulation_thermal_conductivity` | `SapBuildingPart` | `epc_building_part` (jsonb) |
+| `pv_diverter_present` | `SapEnergySource` | `epc_property.energy_pv_diverter_present` |
+| `cylinder_volume_measured_l` | `SapHeating` | `epc_property.heating_cylinder_volume_measured_l` |
+| `air_permeability_ap50_m3_h_m2` | `SapVentilation` | `epc_property.ventilation_air_permeability_ap50_m3_h_m2` |
+
+(Still allow-listed as dormant — not calculator-read, no column: `SapBuildingPart.{floor_u_value,
+roof_u_value, wall_u_value, wall_is_basement, rafter_insulation_thickness}`,
+`SapAlternativeWall.is_basement`, `SapHeating.cylinder_heat_loss`. And `SapAlternativeWall.{u_value,
+wall_thickness_mm}` remain FE-column-pending.)
 
 ---
 
@@ -124,6 +180,11 @@ the Type-2 geometry and the Detailed-measurement surfaces. Replace with a child
 ### 3.1 `epc_property` additions
 | Column | Type | Source | Pri |
 |---|---|---|---|
+| `conservatory_floor_area_m2` | float (double precision), null | `sap_conservatory.floor_area_m2` | **P0** |
+| `conservatory_glazed_perimeter_m` | float (double precision), null | `sap_conservatory.glazed_perimeter_m` | **P0** |
+| `conservatory_double_glazed` | bool, null | `sap_conservatory.double_glazed` | **P0** |
+| `conservatory_thermally_separated` | bool, null | `sap_conservatory.thermally_separated` | **P0** |
+| `conservatory_room_height_storeys` | float (double precision), null | `sap_conservatory.room_height_storeys` | **P0** |
 | `addendum_stone_walls` | bool, null | `addendum.stone_walls` | P2 |
 | `addendum_system_build` | bool, null | `addendum.system_build` | P2 |
 | `addendum_numbers` | JSONB, null | `addendum.addendum_numbers` (`List[int]`) | P2 |
diff --git a/domain/billing/bill.py b/domain/billing/bill.py
index 5aff24cf4..a524e1454 100644
--- a/domain/billing/bill.py
+++ b/domain/billing/bill.py
@@ -28,11 +28,17 @@ class BillSection(Enum):
 @dataclass(frozen=True)
 class EnergyLine:
     """One section's delivered energy on one fuel. A section may have more than
-    one line (e.g. gas main heating + electric secondary heating)."""
+    one line (e.g. gas main heating + electric secondary heating).
+
+    ``high_rate_fraction`` is the calculator's High-Rate Fraction for this end
+    use — the share of its kWh billed at the day (high) rate on an Off-Peak
+    Meter — set only on ``ELECTRICITY_OFF_PEAK`` lines; ``None`` for single-rate
+    fuels, which bill at their flat unit rate."""
 
     section: BillSection
     fuel: Fuel
     kwh: float
+    high_rate_fraction: Optional[float] = None
 
 
 @dataclass(frozen=True)
@@ -51,35 +57,74 @@ class EnergyBreakdown:
         are billed at their resolved fuel (`sap_code_to_fuel`); lighting / pumps-
         fans / appliances / cooking / cooling are electricity by construction. A
         line is emitted only when its kWh is positive; PV export carries to
-        `exported_kwh` for the SEG credit. The `from_*` factory mirrors
-        `Performance.from_sap_result`; living on the target keeps the calculator
-        free of any `property_baseline` dependency."""
+        `exported_kwh` for the SEG credit.
+
+        On an **Off-Peak Meter** (`result.is_off_peak_meter`) the whole meter is
+        off-peak: every electric end use bills on `ELECTRICITY_OFF_PEAK`, each
+        carrying its calculator **High-Rate Fraction** for the day/night split
+        (appliances / cooking / cooling inherit the `ALL_OTHER_USES` fraction).
+        The `from_*` factory mirrors `Performance.from_sap_result`; living on the
+        target keeps the calculator free of any `property_baseline` dependency."""
+        off_peak = result.is_off_peak_meter
         candidates = [
             _fuelled_line(
                 BillSection.HEATING,
                 result.main_heating_fuel_code,
                 result.main_heating_fuel_kwh_per_yr,
+                high_rate_fraction=result.main_heating_high_rate_fraction,
+                off_peak_meter=off_peak,
             ),
             _fuelled_line(
                 BillSection.HEATING,
                 result.main_2_heating_fuel_code,
                 result.main_2_heating_fuel_kwh_per_yr,
+                high_rate_fraction=result.main_2_heating_high_rate_fraction,
+                off_peak_meter=off_peak,
             ),
             _fuelled_line(
                 BillSection.HEATING,
                 result.secondary_heating_fuel_code,
                 result.secondary_heating_fuel_kwh_per_yr,
+                high_rate_fraction=result.secondary_heating_high_rate_fraction,
+                off_peak_meter=off_peak,
             ),
             _fuelled_line(
                 BillSection.HOT_WATER,
                 result.hot_water_fuel_code,
                 result.hot_water_kwh_per_yr,
+                high_rate_fraction=result.hot_water_high_rate_fraction,
+                off_peak_meter=off_peak,
+            ),
+            _electric_line(
+                BillSection.LIGHTING,
+                result.lighting_kwh_per_yr,
+                high_rate_fraction=result.other_electricity_high_rate_fraction,
+                off_peak_meter=off_peak,
+            ),
+            _electric_line(
+                BillSection.PUMPS_FANS,
+                result.pumps_fans_kwh_per_yr,
+                high_rate_fraction=result.pumps_fans_high_rate_fraction,
+                off_peak_meter=off_peak,
+            ),
+            _electric_line(
+                BillSection.APPLIANCES,
+                result.appliances_kwh_per_yr,
+                high_rate_fraction=result.other_electricity_high_rate_fraction,
+                off_peak_meter=off_peak,
+            ),
+            _electric_line(
+                BillSection.COOKING,
+                result.cooking_kwh_per_yr,
+                high_rate_fraction=result.other_electricity_high_rate_fraction,
+                off_peak_meter=off_peak,
+            ),
+            _electric_line(
+                BillSection.COOLING,
+                result.space_cooling_fuel_kwh_per_yr,
+                high_rate_fraction=result.other_electricity_high_rate_fraction,
+                off_peak_meter=off_peak,
             ),
-            _electric_line(BillSection.LIGHTING, result.lighting_kwh_per_yr),
-            _electric_line(BillSection.PUMPS_FANS, result.pumps_fans_kwh_per_yr),
-            _electric_line(BillSection.APPLIANCES, result.appliances_kwh_per_yr),
-            _electric_line(BillSection.COOKING, result.cooking_kwh_per_yr),
-            _electric_line(BillSection.COOLING, result.space_cooling_fuel_kwh_per_yr),
         ]
         return cls(
             lines=[line for line in candidates if line is not None],
@@ -88,7 +133,12 @@ class EnergyBreakdown:
 
 
 def _fuelled_line(
-    section: BillSection, fuel_code: Optional[int], kwh: float
+    section: BillSection,
+    fuel_code: Optional[int],
+    kwh: float,
+    *,
+    high_rate_fraction: float,
+    off_peak_meter: bool,
 ) -> Optional[EnergyLine]:
     """An `EnergyLine` for a fuelled end use, or None when it has no energy. A
     positive kWh with no resolved fuel code is a data gap — raise rather than
@@ -100,14 +150,50 @@ def _fuelled_line(
             f"{section.value} has {kwh} kWh but no fuel code on the SapResult; "
             "cannot attribute a billing fuel"
         )
-    return EnergyLine(section=section, fuel=sap_code_to_fuel(fuel_code), kwh=kwh)
+    return _line(
+        section, sap_code_to_fuel(fuel_code), kwh,
+        high_rate_fraction=high_rate_fraction, off_peak_meter=off_peak_meter,
+    )
 
 
-def _electric_line(section: BillSection, kwh: float) -> Optional[EnergyLine]:
+def _electric_line(
+    section: BillSection,
+    kwh: float,
+    *,
+    high_rate_fraction: float,
+    off_peak_meter: bool,
+) -> Optional[EnergyLine]:
     """An electricity `EnergyLine` for an electric end use, or None when zero."""
     if kwh <= 0:
         return None
-    return EnergyLine(section=section, fuel=Fuel.ELECTRICITY, kwh=kwh)
+    return _line(
+        section, Fuel.ELECTRICITY, kwh,
+        high_rate_fraction=high_rate_fraction, off_peak_meter=off_peak_meter,
+    )
+
+
+def _line(
+    section: BillSection,
+    fuel: Fuel,
+    kwh: float,
+    *,
+    high_rate_fraction: float,
+    off_peak_meter: bool,
+) -> EnergyLine:
+    """Build a line, routing electricity to the Off-Peak Meter carrier. On an
+    off-peak meter every electric end use (and any end use whose own fuel code
+    already resolved to off-peak electricity) bills on `ELECTRICITY_OFF_PEAK`,
+    carrying its High-Rate Fraction for the day/night split. Non-electric fuels
+    and standard-meter electricity bill flat (no fraction)."""
+    is_electric = fuel in (Fuel.ELECTRICITY, Fuel.ELECTRICITY_OFF_PEAK)
+    if is_electric and (off_peak_meter or fuel is Fuel.ELECTRICITY_OFF_PEAK):
+        return EnergyLine(
+            section=section,
+            fuel=Fuel.ELECTRICITY_OFF_PEAK,
+            kwh=kwh,
+            high_rate_fraction=high_rate_fraction,
+        )
+    return EnergyLine(section=section, fuel=fuel, kwh=kwh)
 
 
 @dataclass(frozen=True)
diff --git a/domain/billing/bill_derivation.py b/domain/billing/bill_derivation.py
index c1a09c646..a73b7d4e0 100644
--- a/domain/billing/bill_derivation.py
+++ b/domain/billing/bill_derivation.py
@@ -10,6 +10,7 @@ from domain.billing.bill import (
     BillSection,
     BillSectionCost,
     EnergyBreakdown,
+    EnergyLine,
 )
 
 _DAYS_PER_YEAR: Final[float] = 365.0
@@ -36,9 +37,7 @@ class BillDerivation:
         fuels_used: set[Fuel] = set()
         for line in breakdown.lines:
             section_kwh[line.section] += line.kwh
-            section_cost_p[line.section] += (
-                line.kwh * self._rates.unit_rate_p_per_kwh(line.fuel)
-            )
+            section_cost_p[line.section] += line.kwh * self._unit_rate_p_per_kwh(line)
             if line.kwh > 0:
                 fuels_used.add(line.fuel)
 
@@ -69,3 +68,15 @@ class BillDerivation:
             seg_credit_gbp=seg_credit_gbp,
             total_gbp=total_gbp,
         )
+
+    def _unit_rate_p_per_kwh(self, line: EnergyLine) -> float:
+        """Price one line's fuel (p/kWh). An Off-Peak Meter line blends day/night
+        by its High-Rate Fraction; every other fuel bills at its flat unit rate."""
+        if line.fuel is Fuel.ELECTRICITY_OFF_PEAK:
+            if line.high_rate_fraction is None:
+                raise ValueError(
+                    f"{line.section.value} bills on an off-peak meter but carries "
+                    "no high-rate fraction; cannot split day/night"
+                )
+            return self._rates.off_peak_blended_p_per_kwh(line.high_rate_fraction)
+        return self._rates.unit_rate_p_per_kwh(line.fuel)
diff --git a/domain/billing/sap_fuel.py b/domain/billing/sap_fuel.py
index b0523a2ff..0c78ddae8 100644
--- a/domain/billing/sap_fuel.py
+++ b/domain/billing/sap_fuel.py
@@ -19,6 +19,9 @@ _CODE_TO_FUEL: Final[dict[int, Fuel]] = {
     **dict.fromkeys([12], Fuel.SMOKELESS),
     **dict.fromkeys([20, 21], Fuel.WOOD_LOGS),  # logs, chips
     **dict.fromkeys([22, 23], Fuel.WOOD_PELLETS),
+    # Dual fuel (mineral + wood) — SAP 10.2 keeps it as its own fuel, so bill it
+    # as its own carrier (priced as the mineral+wood midpoint in the snapshot).
+    **dict.fromkeys([10], Fuel.DUAL_FUEL_MINERAL_AND_WOOD),
     **dict.fromkeys([30], Fuel.ELECTRICITY),  # standard tariff
     # 7/10/18-hour off-peak tariffs + 24-hour heating tariff — priced once the
     # off-peak day/night slice lands; ELECTRICITY_OFF_PEAK is unpriced until then.
diff --git a/domain/elmhurst/README.md b/domain/elmhurst/README.md
new file mode 100644
index 000000000..fc6e97e5c
--- /dev/null
+++ b/domain/elmhurst/README.md
@@ -0,0 +1,28 @@
+# Elmhurst reference data
+
+Lookup tables to support re-keying certs into the Elmhurst RdSAP entry tool
+(see `scripts/hyde/` and the `expand-sap-accuracy-corpus` skill).
+
+## `pcdb_gas_oil_boiler_codes.csv`
+
+Every gas/oil boiler in the SAP Product Characteristics Database (PCDB Table
+105), one row per boiler, so you can look up the **Ref No** to type into
+Elmhurst's *PCDF boiler Reference* field (Space Heating → 🔍 search → Select).
+
+Columns: `pcdb_id` (the Ref No), `brand`, `model`, `qualifier`, `type`
+(Regular / Combi / Combi-storage / CPSU), `winter_eff_pct`, `summer_eff_pct`,
+`output_kw_max`, `final_year`.
+
+- Generated from `domain/sap10_calculator/tables/pcdb/data/pcdb_table_105_gas_oil_boilers.jsonl`.
+- `type` is decoded from the raw PCDB row's boiler-type code (`raw[14]`:
+  `1`→Regular, `2`→Combi, `3`→Combi-storage, `4`→CPSU). This is the field that
+  decides whether Elmhurst wants a hot-water cylinder (Regular) or not (Combi).
+- Find a boiler: `grep -i "ecotec pro,28" pcdb_gas_oil_boiler_codes.csv` or
+  filter by brand/model; the cert's lodged `main_heating_index_number` is the
+  `pcdb_id`.
+
+**Note on entering it in Elmhurst:** the on-screen *PCDF boiler Reference* text
+box is editable and will *display* a number you type, but typing alone does NOT
+re-resolve the boiler — its type/efficiency/cylinder behaviour stays from the
+previously-selected boiler. Only selecting via the 🔍 **search dialog** genuinely
+sets the boiler. This CSV tells you which Ref to pick.
diff --git a/domain/epc/property_overlays/construction_age_band_overlay.py b/domain/epc/property_overlays/construction_age_band_overlay.py
new file mode 100644
index 000000000..55054168a
--- /dev/null
+++ b/domain/epc/property_overlays/construction_age_band_overlay.py
@@ -0,0 +1,39 @@
+"""Map a Landlord-Override construction-age-band value to a fabric Simulation
+Overlay.
+
+A construction-age-band value is the RdSAP England-&-Wales letter code (A..M)
+the calculator's U-value cascades key on (`SapBuildingPart.construction_age_band`,
+read via `.strip().upper()` against the letter-code bands). The overlay targets
+the override's building part and sets the band; an unrecognised code produces no
+overlay. Re-dating a part re-derives its construction-default U-values, so this
+is the highest-leverage fabric override.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
+from domain.modelling.simulation import BuildingPartOverlay, EpcSimulation
+
+# RdSAP England-&-Wales construction age bands (letter codes A..M).
+_VALID_AGE_BANDS: frozenset[str] = frozenset("ABCDEFGHIJKLM")
+
+
+def age_band_overlay_for(
+    age_band_value: str, building_part: int
+) -> Optional[EpcSimulation]:
+    band = age_band_value.strip().upper()
+    if band not in _VALID_AGE_BANDS:
+        return None
+
+    identifier = (
+        BuildingPartIdentifier.MAIN
+        if building_part == 0
+        else BuildingPartIdentifier.extension(building_part)
+    )
+    return EpcSimulation(
+        building_parts={
+            identifier: BuildingPartOverlay(construction_age_band=band)
+        }
+    )
diff --git a/domain/epc/property_overlays/glazing_overlay.py b/domain/epc/property_overlays/glazing_overlay.py
new file mode 100644
index 000000000..d692181d8
--- /dev/null
+++ b/domain/epc/property_overlays/glazing_overlay.py
@@ -0,0 +1,36 @@
+"""Map a Landlord-Override glazing value to a glazing Simulation Overlay.
+
+A glazing value is one canonical glazing description carrying type + era
+("Double glazing, 2002 or later", "Single glazing", "Triple glazing, 2002 or
+later"). The calculator derives each window's U-value from its SAP10
+`glazing_type` code via the RdSAP Table 24 cascade, so the overlay decomposes
+the value into that code and emits a whole-dwelling `GlazingOverlay` (a landlord
+describes the dwelling's glazing as a whole, with no per-window geometry, so
+`building_part` is ignored). `_fold_glazing` expands it across every window.
+Unresolvable values produce no overlay.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from domain.modelling.simulation import EpcSimulation, GlazingOverlay
+
+# Canonical glazing description → SAP10 glazing-type code (the Table 24 /
+# `u_window` cascade enum, `_GLAZING_CODE_TO_UWINDOW` in heat_transmission).
+_GLAZING_CODES: dict[str, int] = {
+    "Single glazing": 1,
+    "Double glazing, 2002 or later": 2,
+    "Double glazing, pre-2002": 3,
+    "Triple glazing, pre-2002": 6,
+    "Triple glazing, 2002 or later": 9,
+}
+
+
+def glazing_overlay_for(
+    glazing_value: str, building_part: int
+) -> Optional[EpcSimulation]:
+    code = _GLAZING_CODES.get(glazing_value)
+    if code is None:
+        return None
+    return EpcSimulation(glazing=GlazingOverlay(glazing_type=code))
diff --git a/domain/epc/property_overlays/main_fuel_overlay.py b/domain/epc/property_overlays/main_fuel_overlay.py
new file mode 100644
index 000000000..25e28247f
--- /dev/null
+++ b/domain/epc/property_overlays/main_fuel_overlay.py
@@ -0,0 +1,57 @@
+"""Map a Landlord-Override main-fuel value to a heating Simulation Overlay.
+
+A main-fuel value is one canonical gov-EPC `main_fuel` description ("mains gas",
+"electricity", …). The calculator reads the dwelling's primary fuel from
+`main_heating_details[0].main_fuel_type` as the RdSAP **int code**, so the
+overlay decomposes the value into that code and emits a whole-dwelling
+`HeatingOverlay` (fuel is not a per-building-part attribute, so `building_part`
+is ignored). Codes follow the modern RdSAP-20/21 `(not community)` family the
+gov-EPC API baseline uses. Unresolvable values produce no overlay.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from domain.modelling.simulation import EpcSimulation, HeatingOverlay
+
+# RdSAP-20/21 `main_fuel` `(not community)` codes (epc_codes.csv `main_fuel`).
+_FUEL_CODES: dict[str, int] = {
+    "mains gas": 26,
+    "mains gas (community)": 20,
+    "LPG (bulk)": 27,
+    "bottled LPG": 3,
+    "LPG special condition": 17,
+    "oil": 28,
+    "electricity": 29,
+    "electricity (community)": 25,
+    "house coal": 33,
+    "smokeless coal": 15,
+    "dual fuel (mineral and wood)": 10,
+    "biomass (community)": 31,
+}
+
+# A "mains gas" main fuel asserts the dwelling has a mains-gas connection, so the
+# overlay must also flip `sap_energy_source.mains_gas` — not just the fuel code.
+# Without it the effective EPC says "fuel = mains gas" while `mains_gas` stays
+# False, which (a) gates out the gas-boiler-upgrade Measure and (b) makes the
+# heating Generator read the dwelling as off-gas and wrongly offer HHRSH storage
+# (property 728513). Only the **private** mains-gas connection (code 26) sets it;
+# community mains gas (code 20) is a heat network, not a gas-grid connection.
+# Non-gas fuels leave the flag None ("unchanged") rather than clearing it: an
+# electric (or LPG/oil) main fuel does not tell us there is no gas supply (a
+# dwelling can heat electrically yet still have a gas hob), so only electrifying
+# Measures clear `mains_gas`, never a Landlord fuel correction.
+_MAINS_GAS_FUEL_VALUES: frozenset[str] = frozenset({"mains gas"})
+
+
+def fuel_overlay_for(
+    main_fuel_value: str, building_part: int
+) -> Optional[EpcSimulation]:
+    code = _FUEL_CODES.get(main_fuel_value)
+    if code is None:
+        return None
+    mains_gas = True if main_fuel_value in _MAINS_GAS_FUEL_VALUES else None
+    return EpcSimulation(
+        heating=HeatingOverlay(main_fuel_type=code, mains_gas=mains_gas)
+    )
diff --git a/domain/epc/property_overlays/main_heating_system_overlay.py b/domain/epc/property_overlays/main_heating_system_overlay.py
new file mode 100644
index 000000000..94d4947c7
--- /dev/null
+++ b/domain/epc/property_overlays/main_heating_system_overlay.py
@@ -0,0 +1,150 @@
+"""Map a Landlord-Override main-heating-system value to a heating Simulation Overlay.
+
+A main-heating-system value is one canonical system archetype ("Gas boiler,
+combi", "Electric storage heaters, fan"). The calculator reads the primary
+system's `sap_main_heating_code` (SAP Table 4a/4b), so the overlay maps the
+archetype to a representative code and emits a whole-dwelling `HeatingOverlay`
+targeting `main_heating_details[0]` (`building_part` is ignored). It composes
+field-wise with the main_fuel / water_heating overlays.
+
+**Coherent Heating System / drag-along (ADR-0035):** a landlord tells us the
+*system*, not the dependent fields a coherent heating system carries — its
+electricity tariff (meter) and, for storage heaters, its charge control. Rather
+than hand-attach those per archetype (easy to forget when a new system is
+added), they are **derived from the SAP code**: the off-peak meter from the
+calculator's single off-peak classification (`OFF_PEAK_IMPLYING_HEATING_CODES`,
+SAP §12), and the conservative manual charge control for storage heaters. So
+adding a heating archetype is just adding its code — coherent companions fall
+out. Synthesis owns coherence; the calculator never normalises a lodged cert.
+
+The SEDBUK A-G efficiency band the Hyde "Heating" column carries is NOT honoured
+yet (no efficiency slot on the overlay/MainHeatingDetail) -- archetypes map to
+their modern/condensing Table 4b code, so an old low-rated boiler is currently
+modelled at the condensing efficiency. Heat pumps and community heating (which
+resolve via main_heating_index_number / community codes, not a Table 4b code)
+are left UNKNOWN until modelled. Unresolvable values produce no overlay.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from domain.modelling.simulation import EpcSimulation, HeatingOverlay
+from domain.sap10_calculator.tables.table_12a import (
+    OFF_PEAK_IMPLYING_HEATING_CODES,
+)
+
+# Off-peak (Economy 7) meter. Electric storage / CPSU systems charge overnight at
+# the low rate and cannot run economically on a single-rate meter; "Dual" lets
+# the §12 dispatch resolve the specific tariff (storage 7-hour, CPSU 10-hour).
+_OFF_PEAK_METER = "Dual"
+# Single-rate meter (SAP 10.2 Table 12a code 2 → STANDARD tariff). Every non-off-
+# peak archetype synthesises this *explicitly* rather than leaving the meter
+# untouched: switching OFF storage heaters must not let the dwelling's old "Dual"
+# meter bleed through and bill the new gas/direct-acting system on an Economy-7
+# split (the mirror of the storage→Dual drag, ADR-0035).
+_SINGLE_RATE_METER = "Single"
+
+# SAP Table 4e Group 4 storage charge-control code. Manual charge control is the
+# *conservative* assumption when the landlord didn't tell us the control: its
+# +0.7 C mean-internal-temperature adjustment is the largest of the storage
+# controls (automatic / Celect +0.4, HHR 0), so it never over-credits an
+# unobserved control. Scoped to storage *heaters* (Table 4a 401-409) — the only
+# systems that take a charge control.
+_MANUAL_CHARGE_CONTROL = 2401
+_STORAGE_HEATER_CODES = frozenset(range(401, 410))
+
+# SAP Table 4c full boiler-control code: programmer + room thermostat + TRVs. The
+# landlord names the boiler, not its controls — but a gas boiler installed under
+# modern Building Regs must carry compliant controls, and this overlay already
+# assumes the modern condensing efficiency for the boiler (A-G deferred), so
+# assuming modern controls is the *coherent* default (decided with Khalim). It
+# also overwrites any stale storage charge control (2401) the dwelling carried
+# before the switch. (Conservative-vs-modern trade-off documented in ADR-0035.)
+_FULL_BOILER_CONTROL = 2106
+
+# Gas-boiler archetypes (Table 4b 102 regular / 104 combi / 120 CPSU) and the
+# subset that heats hot water instantaneously (a combi has no cylinder; a regular
+# boiler and a CPSU heat a cylinder). A gas boiler implies a mains-gas connection
+# + a gas main fuel + a gas-boiler heating category (Table 4a cat 2) + a fanned
+# room-sealed flue — all set so a heating-system-only override is self-coherent.
+_GAS_BOILER_CODES = frozenset({102, 104, 120})
+_COMBI_CODES = frozenset({104})
+_GAS_BOILER_CATEGORY = 2
+_MAINS_GAS_FUEL = 26
+# SAP Table 4a "from the main system" water-heating code — a gas boiler heats hot
+# water from itself, so the override routes water heating to the main system on
+# mains gas (clearing a storage dwelling's old electric-immersion arrangement).
+_FROM_MAIN_WATER_HEATING_CODE = 901
+
+# Canonical system archetype → representative SAP `sap_main_heating_code`. Codes
+# map to the modern/condensing variant (A-G efficiency deferred): 102 regular
+# condensing, 104 condensing combi, 120 CPSU, 401-404 storage heaters, 191
+# direct-acting electric. Companion fields (meter / control / fuel / hot water)
+# are NOT listed here — they are derived from the code below, so a new archetype
+# is just a code (ADR-0035 drag-along).
+_MAIN_HEATING_CODES: dict[str, int] = {
+    "Gas boiler, combi": 104,
+    "Gas boiler, regular": 102,
+    "Gas CPSU": 120,
+    "Electric storage heaters, old": 401,
+    "Electric storage heaters, slimline": 402,
+    "Electric storage heaters, convector": 403,
+    "Electric storage heaters, fan": 404,
+    "Direct-acting electric": 191,
+}
+
+
+def _meter_for(code: int) -> str:
+    """The coherent meter a heating code implies: an off-peak ("Dual") meter for
+    the calculator's §12 off-peak systems, an explicit single-rate ("Single")
+    meter for every other system. Always set — never left to bleed."""
+    return _OFF_PEAK_METER if code in OFF_PEAK_IMPLYING_HEATING_CODES else _SINGLE_RATE_METER
+
+
+def _control_for(code: int) -> Optional[int]:
+    """The control to assume when the landlord named only the system: a
+    conservative manual charge control for storage heaters, full modern controls
+    for a gas boiler, None for systems that take neither (direct-acting electric).
+    Overwrites a stale control inherited from the system being replaced."""
+    if code in _STORAGE_HEATER_CODES:
+        return _MANUAL_CHARGE_CONTROL
+    if code in _GAS_BOILER_CODES:
+        return _FULL_BOILER_CONTROL
+    return None
+
+
+def _gas_boiler_overlay(code: int) -> HeatingOverlay:
+    """The coherent gas-boiler companion set: a mains-gas connection + gas main
+    fuel, the gas-boiler heating category, a fanned room-sealed flue, full modern
+    controls, a single-rate meter, and a hot-water arrangement drawn from the
+    main system (a combi has no cylinder; a regular boiler / CPSU keeps one)."""
+    return HeatingOverlay(
+        sap_main_heating_code=code,
+        main_heating_category=_GAS_BOILER_CATEGORY,
+        main_fuel_type=_MAINS_GAS_FUEL,
+        mains_gas=True,
+        main_heating_control=_FULL_BOILER_CONTROL,
+        fan_flue_present=True,
+        meter_type=_SINGLE_RATE_METER,
+        water_heating_code=_FROM_MAIN_WATER_HEATING_CODE,
+        water_heating_fuel=_MAINS_GAS_FUEL,
+        has_hot_water_cylinder=code not in _COMBI_CODES,
+    )
+
+
+def main_heating_overlay_for(
+    main_heating_value: str, building_part: int
+) -> Optional[EpcSimulation]:
+    code = _MAIN_HEATING_CODES.get(main_heating_value)
+    if code is None:
+        return None
+    if code in _GAS_BOILER_CODES:
+        return EpcSimulation(heating=_gas_boiler_overlay(code))
+    return EpcSimulation(
+        heating=HeatingOverlay(
+            sap_main_heating_code=code,
+            meter_type=_meter_for(code),
+            main_heating_control=_control_for(code),
+        )
+    )
diff --git a/domain/epc/property_overlays/roof_type_overlay.py b/domain/epc/property_overlays/roof_type_overlay.py
index 888379889..aadcc3878 100644
--- a/domain/epc/property_overlays/roof_type_overlay.py
+++ b/domain/epc/property_overlays/roof_type_overlay.py
@@ -1,12 +1,21 @@
-"""Map a Landlord-Override `RoofType` value to a roof Simulation Overlay (ADR-0032).
+"""Map a Landlord-Override `RoofType` value to a roof Simulation Overlay (ADR-0032/0033).
 
-The calculator derives the roof U-value from the building part's loft-insulation
-depth, so a `roof_type` override moves the score only via
-`BuildingPartOverlay.roof_insulation_thickness` (mm). The resolvable family is
-the explicit `"Pitched, N mm loft insulation"` values — N is parsed out.
-Everything else (flat roofs, room-in-roof, "Unknown loft insulation",
-"Another Premises Above" — a flat with a dwelling above, no roof to insulate) has
-no clean loft depth, so it produces no overlay.
+Two resolvable families:
+
+* `"Pitched, N mm loft insulation"` — the loft depth N maps to
+  `BuildingPartOverlay.roof_insulation_thickness` (mm); the calculator scores the
+  roof from that depth.
+* `"Flat, …"` — a flat roof carries no loft depth, so its U-value comes from the
+  age-band default (`_FLAT_ROOF_BY_AGE`, ADR-0033). The calculator's flat path
+  keys on the `roof_construction_type` *string* (`"flat" in …`), so the overlay
+  sets that to `"Flat"` and leaves thickness `None` for the (separately overlaid)
+  construction age band to drive the U-value. No flat `RoofType` value carries an
+  explicit mm depth, confirmed by the Elmhurst sweep (As Built / Unknown ≡
+  age-band default).
+
+Everything else (room-in-roof, "Unknown loft insulation", party-ceiling adjacency
+markers like "Another Premises Above") has no clean depth or shape correction, so
+it produces no overlay.
 """
 
 from __future__ import annotations
@@ -23,8 +32,8 @@ _LOFT_MM = re.compile(r"(\d+)\+?\s*mm loft insulation")
 def roof_overlay_for(
     roof_type_value: str, building_part: int
 ) -> Optional[EpcSimulation]:
-    match = _LOFT_MM.search(roof_type_value)
-    if match is None:
+    overlay = _overlay_for(roof_type_value)
+    if overlay is None:
         return None
 
     identifier = (
@@ -32,10 +41,28 @@ def roof_overlay_for(
         if building_part == 0
         else BuildingPartIdentifier.extension(building_part)
     )
-    return EpcSimulation(
-        building_parts={
-            identifier: BuildingPartOverlay(
-                roof_insulation_thickness=int(match.group(1))
-            )
-        }
-    )
+    return EpcSimulation(building_parts={identifier: overlay})
+
+
+def _overlay_for(roof_type_value: str) -> Optional[BuildingPartOverlay]:
+    match = _LOFT_MM.search(roof_type_value)
+    if match is not None:
+        return BuildingPartOverlay(roof_insulation_thickness=int(match.group(1)))
+    if roof_type_value.startswith("Flat,"):
+        # Flat roof: U-value is the age-band default; flag the shape and let the
+        # age-band overlay drive `_FLAT_ROOF_BY_AGE` (ADR-0033).
+        return BuildingPartOverlay(roof_construction_type="Flat")
+    if roof_type_value == "Pitched, Unknown loft insulation":
+        # Unknown loft depth: U-value is the pitched age-band default. Assert the
+        # pitched shape (keeps `is_flat_roof`/`is_sloping_ceiling` False) and leave
+        # thickness None so the age-band overlay drives `_ROOF_BY_AGE` (ADR-0033).
+        return BuildingPartOverlay(roof_construction_type="Pitched")
+    if roof_type_value.startswith("Pitched, no insulation"):
+        # Genuinely uninsulated pitched roof → 2.30 (Table 16 row 0). Thickness 0
+        # drives the calculator's thickness path and, unlike "Unknown", overrides
+        # any lodged numeric thickness (ADR-0033). Pitched text is load-bearing
+        # here — it does NOT take the age-band default (rdsap_uvalues §5.11 note).
+        return BuildingPartOverlay(
+            roof_construction_type="Pitched", roof_insulation_thickness=0
+        )
+    return None
diff --git a/domain/epc/property_overlays/wall_type_overlay.py b/domain/epc/property_overlays/wall_type_overlay.py
index 63ac6aa0c..0620819cf 100644
--- a/domain/epc/property_overlays/wall_type_overlay.py
+++ b/domain/epc/property_overlays/wall_type_overlay.py
@@ -34,8 +34,16 @@ _MATERIAL_CONSTRUCTION: dict[str, int] = {
 # RdSAP `wall_insulation_type` codes by insulation-state suffix
 # (domain/sap10_ml/rdsap_uvalues.py): external 1, filled-cavity 2, internal 3,
 # as-built/uninsulated 4, cavity+external 6, cavity+internal 7.
+# All three "as built (assumed)" variants resolve to the same as-built code (4);
+# the construction-age-band overlay supplies the U-value, so "partial" / "insulated"
+# need no distinct code (ADR-0033, confirmed by the full A–M Elmhurst sweep in
+# scripts/hyde/uvalue_probe_walls.csv — cavity As Built ≡ (CAVITY,0) by age band,
+# e.g. band F → 1.0 = "partial"). The bare "as built" covers Cob / Park home.
 _STATE_INSULATION: dict[str, int] = {
+    "as built": 4,
     "as built, no insulation (assumed)": 4,
+    "as built, partial insulation (assumed)": 4,
+    "as built, insulated (assumed)": 4,
     "with internal insulation": 3,
     "with external insulation": 1,
     "filled cavity": 2,
diff --git a/domain/epc/property_overlays/water_heating_overlay.py b/domain/epc/property_overlays/water_heating_overlay.py
new file mode 100644
index 000000000..3ec952de2
--- /dev/null
+++ b/domain/epc/property_overlays/water_heating_overlay.py
@@ -0,0 +1,47 @@
+"""Map a Landlord-Override water-heating value to a heating Simulation Overlay.
+
+A water-heating value is one canonical "<system>, <fuel>" description ("From main
+system, mains gas", "Electric immersion, electricity"). The calculator reads the
+hot-water arrangement from `sap_heating.water_heating_code` (the SAP Table 4a
+system code) and `water_heating_fuel`, so the overlay decomposes the value into
+those two int codes and emits a whole-dwelling `HeatingOverlay` (water heating is
+not per-building-part, so `building_part` is ignored). It composes field-wise with
+the main_fuel / main_heating overlays. Unresolvable values produce no overlay.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from domain.modelling.simulation import EpcSimulation, HeatingOverlay
+
+# Canonical "<system>, <fuel>" description → (water_heating_code, water_heating_fuel).
+# water_heating_code: 901 "from main system" (SAP Table 4a inherit-from-main),
+# 903 "electric immersion". Fuel codes are the modern RdSAP "(not community)"
+# family (26 mains gas, 29 electricity), matching the main_fuel overlay.
+_WATER_HEATING_CODES: dict[str, tuple[int, int]] = {
+    "From main system, mains gas": (901, 26),
+    "From main system, electricity": (901, 29),
+    "From main system, oil": (901, 28),
+    "From main system, LPG (bulk)": (901, 27),
+    "From main system, bottled LPG": (901, 3),
+    "From main system, house coal": (901, 33),
+    "Electric immersion, electricity": (903, 29),
+    # "boiler/circulator for water heating only" — SAP Table 4a code 911 (gas).
+    "Gas boiler/circulator, mains gas": (911, 26),
+}
+
+
+def water_heating_overlay_for(
+    water_heating_value: str, building_part: int
+) -> Optional[EpcSimulation]:
+    codes = _WATER_HEATING_CODES.get(water_heating_value)
+    if codes is None:
+        return None
+    water_heating_code, water_heating_fuel = codes
+    return EpcSimulation(
+        heating=HeatingOverlay(
+            water_heating_code=water_heating_code,
+            water_heating_fuel=water_heating_fuel,
+        )
+    )
diff --git a/domain/epc/property_overrides/__init__.py b/domain/epc/property_overrides/__init__.py
new file mode 100644
index 000000000..e11710a45
--- /dev/null
+++ b/domain/epc/property_overrides/__init__.py
@@ -0,0 +1,4 @@
+"""Landlord property-override classifier vocabulary — the category enums a
+landlord description resolves into, plus their value→code helpers. The classifier
+target for the property_overrides chain (mirrors the property_overrides table /
+override_component pgEnum). Distinct from the EPC-context types of the same name."""
diff --git a/domain/epc/built_form_type.py b/domain/epc/property_overrides/built_form_type.py
similarity index 100%
rename from domain/epc/built_form_type.py
rename to domain/epc/property_overrides/built_form_type.py
diff --git a/domain/epc/property_overrides/construction_age_band.py b/domain/epc/property_overrides/construction_age_band.py
new file mode 100644
index 000000000..83f6e9a85
--- /dev/null
+++ b/domain/epc/property_overrides/construction_age_band.py
@@ -0,0 +1,31 @@
+from enum import Enum
+
+
+class ConstructionAgeBand(Enum):
+    """A landlord-supplied construction age band, as resolved by the
+    landlord-description-overrides context.
+
+    Each member's value is the RdSAP England-&-Wales age-band **letter code**
+    (A..M) the calculator's U-value cascades read from
+    `SapBuildingPart.construction_age_band` — the same representation the gov-EPC
+    API lodges. The construction-age-band Simulation Overlay
+    (``domain/epc/property_overlays/construction_age_band_overlay.py``) sets the
+    letter directly, so these values MUST stay the bare letter codes. Member
+    names carry the year ranges for readability. ``UNKNOWN`` covers values the
+    classifier cannot resolve (it leaves the lodged cert's age band untouched).
+    """
+
+    A_BEFORE_1900 = "A"
+    B_1900_1929 = "B"
+    C_1930_1949 = "C"
+    D_1950_1966 = "D"
+    E_1967_1975 = "E"
+    F_1976_1982 = "F"
+    G_1983_1990 = "G"
+    H_1991_1995 = "H"
+    I_1996_2002 = "I"
+    J_2003_2006 = "J"
+    K_2007_2011 = "K"
+    L_2012_2022 = "L"
+    M_2023_ONWARDS = "M"
+    UNKNOWN = "Unknown"
diff --git a/domain/epc/property_overrides/glazing_type.py b/domain/epc/property_overrides/glazing_type.py
new file mode 100644
index 000000000..ee3ad267b
--- /dev/null
+++ b/domain/epc/property_overrides/glazing_type.py
@@ -0,0 +1,24 @@
+from enum import Enum
+
+
+class GlazingType(Enum):
+    """A landlord-supplied glazing description, as resolved by the
+    landlord-description-overrides context.
+
+    Each member's value is the canonical glazing description (type + era) that
+    the glazing Simulation Overlay
+    (``domain/epc/property_overlays/glazing_overlay.py``) decomposes into the
+    SAP10 ``glazing_type`` code the calculator's Table-24 cascade reads — so the
+    member values here MUST stay in lock-step with that overlay's
+    ``_GLAZING_CODES`` keys. The era matters: double-glazing pre-2002 and
+    2002-onward resolve to different codes (and U-values). ``UNKNOWN`` covers
+    values the classifier cannot resolve, and any glazing not yet given a
+    verified overlay code (it leaves the lodged cert's glazing untouched).
+    """
+
+    SINGLE = "Single glazing"
+    DOUBLE_POST_2002 = "Double glazing, 2002 or later"
+    DOUBLE_PRE_2002 = "Double glazing, pre-2002"
+    TRIPLE_PRE_2002 = "Triple glazing, pre-2002"
+    TRIPLE_POST_2002 = "Triple glazing, 2002 or later"
+    UNKNOWN = "Unknown"
diff --git a/domain/epc/property_overrides/main_fuel_type.py b/domain/epc/property_overrides/main_fuel_type.py
new file mode 100644
index 000000000..8427b9cf0
--- /dev/null
+++ b/domain/epc/property_overrides/main_fuel_type.py
@@ -0,0 +1,29 @@
+from enum import Enum
+
+
+class MainFuelType(Enum):
+    """A landlord-supplied main-fuel description, as resolved by the
+    landlord-description-overrides context.
+
+    Each member's value is the canonical fuel description that the main-fuel
+    Simulation Overlay (``domain/epc/property_overlays/main_fuel_overlay.py``)
+    decomposes into the RdSAP ``main_fuel`` int code the calculator reads — so
+    the member values here MUST stay in lock-step with that overlay's
+    ``_FUEL_CODES`` keys. ``UNKNOWN`` covers values the classifier cannot
+    resolve, and also any fuel not yet given a verified overlay code (it leaves
+    the lodged cert's fuel untouched rather than guessing).
+    """
+
+    MAINS_GAS = "mains gas"
+    MAINS_GAS_COMMUNITY = "mains gas (community)"
+    ELECTRICITY = "electricity"
+    ELECTRICITY_COMMUNITY = "electricity (community)"
+    LPG_BULK = "LPG (bulk)"
+    LPG_BOTTLED = "bottled LPG"
+    LPG_SPECIAL_CONDITION = "LPG special condition"
+    OIL = "oil"
+    HOUSE_COAL = "house coal"
+    SMOKELESS_COAL = "smokeless coal"
+    DUAL_FUEL_MINERAL_WOOD = "dual fuel (mineral and wood)"
+    BIOMASS_COMMUNITY = "biomass (community)"
+    UNKNOWN = "Unknown"
diff --git a/domain/epc/property_overrides/main_heating_system_type.py b/domain/epc/property_overrides/main_heating_system_type.py
new file mode 100644
index 000000000..bea14e6af
--- /dev/null
+++ b/domain/epc/property_overrides/main_heating_system_type.py
@@ -0,0 +1,27 @@
+from enum import Enum
+
+
+class MainHeatingSystemType(Enum):
+    """A landlord-supplied main-heating-system description, as resolved by the
+    landlord-description-overrides context.
+
+    Each member's value is the canonical system archetype that the main-heating
+    Simulation Overlay
+    (``domain/epc/property_overlays/main_heating_system_overlay.py``) maps to a
+    representative SAP ``sap_main_heating_code`` — so the member values MUST stay
+    in lock-step with that overlay's ``_MAIN_HEATING_CODES`` keys. The SEDBUK A-G
+    efficiency band the Hyde "Heating" column carries is NOT modelled yet
+    (deferred), so archetypes map to their modern/condensing code. ``UNKNOWN``
+    covers values the classifier cannot resolve and the not-yet-modelled systems
+    (heat pumps, community heating).
+    """
+
+    GAS_COMBI = "Gas boiler, combi"
+    GAS_REGULAR = "Gas boiler, regular"
+    GAS_CPSU = "Gas CPSU"
+    ELECTRIC_STORAGE_OLD = "Electric storage heaters, old"
+    ELECTRIC_STORAGE_SLIMLINE = "Electric storage heaters, slimline"
+    ELECTRIC_STORAGE_CONVECTOR = "Electric storage heaters, convector"
+    ELECTRIC_STORAGE_FAN = "Electric storage heaters, fan"
+    DIRECT_ELECTRIC = "Direct-acting electric"
+    UNKNOWN = "Unknown"
diff --git a/domain/epc/override_code_mapping.py b/domain/epc/property_overrides/override_code_mapping.py
similarity index 100%
rename from domain/epc/override_code_mapping.py
rename to domain/epc/property_overrides/override_code_mapping.py
diff --git a/domain/epc/property_type.py b/domain/epc/property_overrides/property_type.py
similarity index 100%
rename from domain/epc/property_type.py
rename to domain/epc/property_overrides/property_type.py
diff --git a/domain/epc/roof_type.py b/domain/epc/property_overrides/roof_type.py
similarity index 100%
rename from domain/epc/roof_type.py
rename to domain/epc/property_overrides/roof_type.py
diff --git a/domain/epc/wall_type.py b/domain/epc/property_overrides/wall_type.py
similarity index 100%
rename from domain/epc/wall_type.py
rename to domain/epc/property_overrides/wall_type.py
diff --git a/domain/epc/wall_type_construction_dates.py b/domain/epc/property_overrides/wall_type_construction_dates.py
similarity index 97%
rename from domain/epc/wall_type_construction_dates.py
rename to domain/epc/property_overrides/wall_type_construction_dates.py
index 0eccc44cd..04deda230 100644
--- a/domain/epc/wall_type_construction_dates.py
+++ b/domain/epc/property_overrides/wall_type_construction_dates.py
@@ -27,7 +27,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Mapping, Optional
 
-from domain.epc.wall_type import WallType
+from domain.epc.property_overrides.wall_type import WallType
 
 
 @dataclass(frozen=True)
diff --git a/domain/epc/property_overrides/water_heating_type.py b/domain/epc/property_overrides/water_heating_type.py
new file mode 100644
index 000000000..e85a195d8
--- /dev/null
+++ b/domain/epc/property_overrides/water_heating_type.py
@@ -0,0 +1,26 @@
+from enum import Enum
+
+
+class WaterHeatingType(Enum):
+    """A landlord-supplied water-heating description, as resolved by the
+    landlord-description-overrides context.
+
+    Each member's value is the canonical "<system>, <fuel>" description that the
+    water-heating Simulation Overlay
+    (``domain/epc/property_overlays/water_heating_overlay.py``) decomposes into
+    the SAP ``water_heating_code`` + ``water_heating_fuel`` int codes the
+    calculator reads — so the member values MUST stay in lock-step with that
+    overlay's ``_WATER_HEATING_CODES`` keys. ``UNKNOWN`` covers values the
+    classifier cannot resolve, and any combination not yet given verified codes
+    (it leaves the lodged cert's hot-water arrangement untouched).
+    """
+
+    FROM_MAIN_MAINS_GAS = "From main system, mains gas"
+    FROM_MAIN_ELECTRICITY = "From main system, electricity"
+    FROM_MAIN_OIL = "From main system, oil"
+    FROM_MAIN_LPG_BULK = "From main system, LPG (bulk)"
+    FROM_MAIN_BOTTLED_LPG = "From main system, bottled LPG"
+    FROM_MAIN_HOUSE_COAL = "From main system, house coal"
+    ELECTRIC_IMMERSION = "Electric immersion, electricity"
+    GAS_BOILER_CIRCULATOR_MAINS_GAS = "Gas boiler/circulator, mains gas"
+    UNKNOWN = "Unknown"
diff --git a/domain/epc_prediction/epc_prediction.py b/domain/epc_prediction/epc_prediction.py
index bcd4f1cf2..c582548c8 100644
--- a/domain/epc_prediction/epc_prediction.py
+++ b/domain/epc_prediction/epc_prediction.py
@@ -18,6 +18,7 @@ from datetime import date
 from typing import Callable, Iterable, Optional, Union
 
 from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
     EpcPropertyData,
     MainHeatingDetail,
     SapBuildingPart,
@@ -69,6 +70,7 @@ class EpcPrediction:
         )
         self._apply_categorical_modes(predicted, comparables, target.coordinates)
         self._apply_glazing_mode(predicted, comparables, target.coordinates)
+        self._apply_ventilation_mode(predicted, comparables, target.coordinates)
         self._apply_heating_donor(predicted, comparables)
         self._apply_overrides(predicted, target)
         return predicted
@@ -86,13 +88,32 @@ class EpcPrediction:
         (a recent cert reflects the current system). This makes the predicted
         heating both representative and internally coherent, rather than whatever
         the size-representative template happened to carry. No donor (no neighbour
-        lodges a main heating system) leaves the template's heating in place."""
+        lodges a main heating system) leaves the template's heating in place.
+
+        The coherent heating system spans more than `sap_heating` (ADR-0035): its
+        electricity tariff (`sap_energy_source.meter_type`) and hot-water flags
+        live on loose top-level fields. Carry the donor's whole set, not a subset
+        — otherwise a donated storage system lands on the template's single-rate
+        meter and the SAP score collapses (off-peak heat billed at the peak rate).
+
+        The system also has a DISPLAY face — the building-passport "Main Heating"
+        and "Heating Control" rows (`main_heating` / `main_heating_controls`
+        EnergyElements). These describe the same system as the calc cluster, so
+        they travel with the donor too; left on the structural template they are
+        incoherent with the donated calc heating, and `main_heating_controls`
+        shows "Unknown" whenever the size-template lodged no control row but the
+        donor does (predicted property 721167, ADR-0029 follow-up)."""
         donor = _heating_donor(comparables.members)
         if donor is None:
             return
         predicted.sap_heating = copy.deepcopy(donor.epc.sap_heating)
         predicted.has_hot_water_cylinder = donor.epc.has_hot_water_cylinder
         predicted.solar_water_heating = donor.epc.solar_water_heating
+        predicted.sap_energy_source.meter_type = donor.epc.sap_energy_source.meter_type
+        predicted.main_heating = copy.deepcopy(donor.epc.main_heating)
+        predicted.main_heating_controls = copy.deepcopy(
+            donor.epc.main_heating_controls
+        )
 
     @staticmethod
     def _apply_glazing_mode(
@@ -119,6 +140,36 @@ class EpcPrediction:
         for window in predicted.sap_windows:
             window.glazing_type = glazing
 
+    @staticmethod
+    def _apply_ventilation_mode(
+        predicted: EpcPropertyData,
+        comparables: ComparableProperties,
+        target_coordinates: Optional[Coordinates],
+    ) -> None:
+        """Set the predicted mechanical-ventilation kind to the recency- and
+        geo-weighted cohort mode. A mechanical system (MEV/MVHR) is a new-build /
+        retrofit feature that clusters by era and street (like glazing), so a
+        recent, near neighbour is the best signal for the target's system; the
+        size-representative structural template is not (it just happens to carry
+        whatever its own cert lodged). Only the kind moves — the rest of the
+        template's `sap_ventilation` (e.g. `sheltered_sides`, derived from
+        built_form) stays. A natural-vent cohort modes to None and is left
+        natural — the §2 cascade default — so this only moves genuine MEV/MVHR
+        neighbourhoods (ADR-0029 follow-up; predicted property 721167)."""
+        ventilation = predicted.sap_ventilation
+        if ventilation is None:
+            return
+        members = comparables.members
+        weights = _combine(
+            _recency_weights(members), _geo_weights(target_coordinates, members)
+        )
+        kind = _weighted_mode(
+            (_comparable_ventilation_kind(c) for c in members), weights
+        )
+        if kind is None:
+            return
+        ventilation.mechanical_ventilation_kind = kind
+
     def confidence(
         self, comparables: ComparableProperties
     ) -> PredictionConfidence:
@@ -150,13 +201,27 @@ class EpcPrediction:
         the member whose floor area is closest to the cohort median. A single
         neighbour's geometry is copied wholesale, so a size-representative
         template keeps the prediction off the cohort's size outliers (ADR-0029
-        decision 4: closest on size)."""
+        decision 4: closest on size).
+
+        The template must also present a MAIN building part: its structure is
+        copied wholesale, so seeding from a member whose only part is OTHER (the
+        gov API lodged its identifier as null) gives a prediction with no main
+        dwelling — which the modelling handler then rejects as not-predictable,
+        discarding an otherwise-rich cohort. Candidates are therefore restricted
+        to the MAIN-bearing members; the median is still taken over the whole
+        cohort (the size centre is a property of the cohort, not the template
+        pool). When no member is MAIN-bearing the whole same-type cohort is
+        unlabelled, so the closest-on-size fallback is left for that guard to
+        reject rather than silently relabelling real data."""
         members: tuple[ComparableProperty, ...] = comparables.members
         median_area: float = statistics.median(
             c.epc.total_floor_area_m2 for c in members
         )
+        candidates: list[ComparableProperty] = [
+            c for c in members if _has_main_part(c)
+        ] or list(members)
         return min(
-            members,
+            candidates,
             key=lambda c: abs(c.epc.total_floor_area_m2 - median_area),
         )
 
@@ -296,6 +361,15 @@ def _main_floor_attr(comparable: ComparableProperty, attr: str) -> Optional[int]
     return value
 
 
+def _has_main_part(comparable: ComparableProperty) -> bool:
+    """Whether a comparable carries a MAIN building part — i.e. it can seed a
+    prediction that presents a main dwelling (see `EpcPrediction._template`)."""
+    return any(
+        part.identifier is BuildingPartIdentifier.MAIN
+        for part in comparable.epc.sap_building_parts
+    )
+
+
 def _geo_weighted_floor_area(
     members: tuple[ComparableProperty, ...],
     target_coordinates: Optional[Coordinates],
@@ -508,6 +582,15 @@ def _comparable_modal_glazing(
     return Counter(types).most_common(1)[0][0] if types else None
 
 
+def _comparable_ventilation_kind(
+    comparable: ComparableProperty,
+) -> Optional[str]:
+    """A comparable's mechanical-ventilation kind (the `MechanicalVentilationKind`
+    enum name, e.g. "MVHR"), or None when it lodges no system (natural)."""
+    ventilation = comparable.epc.sap_ventilation
+    return ventilation.mechanical_ventilation_kind if ventilation is not None else None
+
+
 def _main_heating_detail(comparable: ComparableProperty) -> Optional[MainHeatingDetail]:
     """The primary heating system's detail row, or None when none is lodged."""
     details = comparable.epc.sap_heating.main_heating_details
diff --git a/domain/fuel_rates/fuel.py b/domain/fuel_rates/fuel.py
index fff51f57b..f84a9b27e 100644
--- a/domain/fuel_rates/fuel.py
+++ b/domain/fuel_rates/fuel.py
@@ -23,6 +23,10 @@ class Fuel(Enum):
     SMOKELESS = "SMOKELESS"
     WOOD_LOGS = "WOOD_LOGS"
     WOOD_PELLETS = "WOOD_PELLETS"
+    # SAP 10.2 dual-fuel appliance (mineral + wood) — its own SAP fuel, so kept
+    # as its own billing carrier rather than collapsed onto wood or coal. Priced
+    # as the mineral+wood midpoint (see the Fuel Rates snapshot note).
+    DUAL_FUEL_MINERAL_AND_WOOD = "DUAL_FUEL_MINERAL_AND_WOOD"
     HEAT_NETWORK = "HEAT_NETWORK"
 
 
diff --git a/domain/fuel_rates/fuel_rates.py b/domain/fuel_rates/fuel_rates.py
index a5b2eb73f..2266b75a4 100644
--- a/domain/fuel_rates/fuel_rates.py
+++ b/domain/fuel_rates/fuel_rates.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 from dataclasses import dataclass
+from typing import Optional
 
 from domain.fuel_rates.fuel import Fuel, UnpricedFuel
 
@@ -18,6 +19,28 @@ class FuelRate:
     standing_charge_p_per_day: float
 
 
+@dataclass(frozen=True)
+class OffPeakRate:
+    """An Off-Peak Meter's dual-rate tariff — a cheaper ``night`` (low) rate and
+    a dearer ``day`` (high) rate, plus the daily standing charge (ADR-0014).
+
+    Off-peak electricity has no single unit rate, so it does not live in the
+    single-rate ``FuelRates.rates`` map; each end use blends day/night by its own
+    High-Rate Fraction (a calculator output)."""
+
+    day_p_per_kwh: float
+    night_p_per_kwh: float
+    standing_charge_p_per_day: float
+
+    def blended_p_per_kwh(self, high_rate_fraction: float) -> float:
+        """Effective p/kWh for an end use billing ``high_rate_fraction`` of its
+        kWh at the day (high) rate and the remainder at the night (low) rate."""
+        return (
+            high_rate_fraction * self.day_p_per_kwh
+            + (1.0 - high_rate_fraction) * self.night_p_per_kwh
+        )
+
+
 @dataclass(frozen=True)
 class FuelRates:
     """A current Fuel Rates snapshot — the rate per billing Fuel plus the SEG
@@ -32,11 +55,24 @@ class FuelRates:
     period: str
     seg_export_p_per_kwh: float
     rates: Mapping[Fuel, FuelRate]
+    off_peak: Optional[OffPeakRate] = None
+
+    def off_peak_blended_p_per_kwh(self, high_rate_fraction: float) -> float:
+        """Blended day/night p/kWh for an Off-Peak Meter end use at the given
+        High-Rate Fraction. Raises ``UnpricedFuel`` when the snapshot carries no
+        off-peak entry."""
+        if self.off_peak is None:
+            raise UnpricedFuel(Fuel.ELECTRICITY_OFF_PEAK)
+        return self.off_peak.blended_p_per_kwh(high_rate_fraction)
 
     def unit_rate_p_per_kwh(self, fuel: Fuel) -> float:
         return self._rate(fuel).unit_rate_p_per_kwh
 
     def standing_charge_p_per_day(self, fuel: Fuel) -> float:
+        if fuel is Fuel.ELECTRICITY_OFF_PEAK:
+            if self.off_peak is None:
+                raise UnpricedFuel(fuel)
+            return self.off_peak.standing_charge_p_per_day
         return self._rate(fuel).standing_charge_p_per_day
 
     def _rate(self, fuel: Fuel) -> FuelRate:
diff --git a/domain/modelling/generators/glazing_recommendation.py b/domain/modelling/generators/glazing_recommendation.py
index 897b011ce..53a77bac8 100644
--- a/domain/modelling/generators/glazing_recommendation.py
+++ b/domain/modelling/generators/glazing_recommendation.py
@@ -21,7 +21,7 @@ scoring (ADR-0016).
 from dataclasses import dataclass
 from typing import Final, Optional
 
-from datatypes.epc.domain.epc_property_data import EpcPropertyData
+from datatypes.epc.domain.epc_property_data import EpcPropertyData, SapWindow
 from domain.geospatial.planning_restrictions import PlanningRestrictions
 from domain.modelling.measure_type import MeasureType
 from domain.modelling.recommendation import Cost, MeasureOption, Recommendation
@@ -48,6 +48,7 @@ class _GlazingTarget:
     glazing_type: int
     u_value: float
     solar_transmittance: float
+    frame_factor: float
 
 
 # Unrestricted: replace the units with double glazing (gt=5 "Double post 2022";
@@ -58,6 +59,10 @@ _DOUBLE: Final[_GlazingTarget] = _GlazingTarget(
     glazing_type=5,
     u_value=1.40,
     solar_transmittance=0.72,
+    # Replacement double units re-lodge a standard FF=0.70 (cert 001431's
+    # after), overriding the panes they replace (e.g. FF 1.00 / 0.50 on the
+    # "single glazing, known data" windows) — feeds §6 solar gains.
+    frame_factor=0.70,
 )
 # Protected (conservation/listed/heritage): fit an internal secondary pane
 # (gt=11 "Secondary glazing - Normal emissivity", what cert 001431 re-lodges;
@@ -70,9 +75,61 @@ _SECONDARY: Final[_GlazingTarget] = _GlazingTarget(
     glazing_type=11,
     u_value=2.90,
     solar_transmittance=0.85,
+    frame_factor=0.70,  # cert 001431's after re-lodges FF=0.70.
 )
 
 
+def _is_draught_proofed(window: SapWindow) -> bool:
+    """`SapWindow.draught_proofed` is `Union[bool, str]` (bool from the
+    site-notes mapper, the string "true"/"false" from the API). Normalise
+    to a bool."""
+    flag = window.draught_proofed
+    if isinstance(flag, bool):
+        return flag
+    return flag.strip().lower() in {"true", "yes"}
+
+
+def _recompute_percent_draughtproofed(
+    epc: EpcPropertyData, upgraded_indices: tuple[int, ...]
+) -> Optional[int]:
+    """RdSAP 10 §8.1 draught-proofing percentage after a glazing upgrade.
+
+    §8.1: "[(number of draughtproofed openable windows & doors) / (total
+    number of openable windows & doors)] × 100", as an integer. Sealed
+    double/secondary units are draught-proofed, so every upgraded window
+    that was NOT draught-proofed flips into the numerator.
+
+    Anchored on the lodged dwelling-level `percent_draughtproofed` (the
+    value the §2 cascade reads) rather than re-deriving the before-count
+    from per-window flags: the unchanged openings are already folded into
+    that aggregate, so this is robust to incomplete window extraction.
+
+        d0    = round(before% / 100 × N)        # draught-proofed before
+        after = round((d0 + flips) / N × 100)    # RdSAP 10 §8.1, integer
+
+    N counts every openable window (vertical + roof) plus external doors.
+    Returns None when no before% is lodged or there are no openings.
+    """
+    before = epc.percent_draughtproofed
+    if before is None:
+        return None
+    n_openings = (
+        len(epc.sap_windows)
+        + len(epc.sap_roof_windows or [])
+        + (epc.door_count or 0)
+    )
+    if n_openings <= 0:
+        return None
+    flips = sum(
+        1
+        for index in upgraded_indices
+        if not _is_draught_proofed(epc.sap_windows[index])
+    )
+    draught_proofed_before = round(before / 100 * n_openings)
+    after = round((draught_proofed_before + flips) / n_openings * 100)
+    return max(0, min(100, after))
+
+
 def recommend_glazing(
     epc: EpcPropertyData,
     products: ProductRepository,
@@ -99,9 +156,15 @@ def recommend_glazing(
                 glazing_type=target.glazing_type,
                 u_value=target.u_value,
                 solar_transmittance=target.solar_transmittance,
+                frame_factor=target.frame_factor,
             )
             for index in single_indices
-        }
+        },
+        # Sealed units draught-proof the panes they replace — RdSAP 10
+        # §8.1 re-lodges the dwelling's percentage (cert 001431: 84 → 100).
+        percent_draughtproofed=_recompute_percent_draughtproofed(
+            epc, single_indices
+        ),
     )
     cost = Cost(
         total=len(single_indices) * product.unit_cost_per_m2,
diff --git a/domain/modelling/generators/heating_recommendation.py b/domain/modelling/generators/heating_recommendation.py
index 475039df7..9eae0353e 100644
--- a/domain/modelling/generators/heating_recommendation.py
+++ b/domain/modelling/generators/heating_recommendation.py
@@ -284,6 +284,7 @@ def recommend_heating(
     epc: EpcPropertyData,
     products: ProductRepository,
     restrictions: PlanningRestrictions = PlanningRestrictions(),
+    considered_measures: Optional[frozenset[MeasureType]] = None,
 ) -> Optional[Recommendation]:
     """Return a "Heating & Hot Water" Recommendation of competing whole-system
     bundles for the dwelling, else None when no bundle is eligible. ASHP is
@@ -302,7 +303,7 @@ def recommend_heating(
     if boiler_option is not None:
         options.append(boiler_option)
 
-    options.extend(_system_tune_up_options(epc, products))
+    options.extend(_system_tune_up_options(epc, products, considered_measures))
 
     if not options:
         return None
@@ -310,7 +311,9 @@ def recommend_heating(
 
 
 def _system_tune_up_options(
-    epc: EpcPropertyData, products: ProductRepository
+    epc: EpcPropertyData,
+    products: ProductRepository,
+    considered_measures: Optional[frozenset[MeasureType]] = None,
 ) -> list[MeasureOption]:
     """The system tune-up options: keep the existing wet boiler but install
     better heating controls (standard 2106 and/or zone 2110, as competing
@@ -338,7 +341,10 @@ def _system_tune_up_options(
                 ),
             )
         )
-    if control_code not in _ZONE_CONTROL_CODES:
+    if control_code not in _ZONE_CONTROL_CODES and (
+        considered_measures is None
+        or _SYSTEM_TUNE_UP_ZONED_MEASURE_TYPE in considered_measures
+    ):
         options.append(
             _tune_up_option(
                 epc,
diff --git a/domain/modelling/generators/solar_recommendation.py b/domain/modelling/generators/solar_recommendation.py
index b74c3b631..f97a5752f 100644
--- a/domain/modelling/generators/solar_recommendation.py
+++ b/domain/modelling/generators/solar_recommendation.py
@@ -13,6 +13,7 @@ selection, the overlay and `recommend_solar` land in later slices.
 
 from __future__ import annotations
 
+import math
 from typing import Optional
 
 from datatypes.epc.domain.epc_property_data import (
@@ -21,7 +22,9 @@ from datatypes.epc.domain.epc_property_data import (
     PvBatteries,
     PvBattery,
 )
+from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
 from datatypes.epc.domain.field_mappings import PROPERTY_TYPE_LOOKUP
+from domain.building_geometry import ground_floor_area, roof_area
 from domain.geospatial.planning_restrictions import PlanningRestrictions
 from domain.modelling.products import Products, SolarCostInputs
 from domain.modelling.measure_type import MeasureType
@@ -46,9 +49,13 @@ _BATTERY_CAPACITY_KWH = 5.0
 # Watts → kilowatts for peak-power.
 _WATTS_PER_KW = 1000.0
 # The dwelling's PV connects to its own meter (the after-cert §19 "Connected to
-# the dwelling's meter: Yes"). Non-load-bearing for the SAP cascade; carried for
-# fidelity. 1 = connected, the modal install case.
-_PV_CONNECTED_TO_DWELLING = 1
+# the dwelling's meter: Yes"). LOAD-BEARING: `cert_to_inputs` credits PV to the
+# dwelling's SAP only when `pv_connection == 2` ("connected"); value 1 means
+# "present but NOT connected" and zeroes the credit. gov-API enum (corpus- and
+# Elmhurst-validated): 0 = no PV, 1 = not connected, 2 = connected (the modal
+# install case, 52 vs 5 on the RdSAP-21.0.1 corpus). A newly-installed
+# recommended array is connected to the dwelling's own meter.
+_PV_CONNECTED_TO_DWELLING = 2
 
 # A roof plane within this many degrees of due north (0°/360°, Google compass
 # convention) is dropped: it generates little and is not worth panelling. The
@@ -61,6 +68,48 @@ _USABLE_PANEL_FRACTION = 0.70
 # At most this many competing configs go to the Optimiser (× battery on/off).
 _MAX_CONFIGS = 5
 
+# ADR-0038 Dwelling-Roof Cap. Google's `maxArrayPanelsCount` reflects whatever
+# building its imagery matched — on medium-quality imagery (common for semi-
+# detached / terraced homes) that is the *conflated* whole-building roof, so the
+# 0.70 cap above sizes the array to two or more dwellings. We additionally bound
+# the array to the dwelling's OWN usable roof, derived from the EPC.
+#
+# `_DWELLING_USABLE_ROOF_FRACTION` is the share of the roof plan area that takes
+# panels — roughly one non-north plane minus chimney/vent/edge setbacks. A
+# documented, tunable constant (cf. `_USABLE_PANEL_FRACTION`).
+_DWELLING_USABLE_ROOF_FRACTION = 0.5
+# RdSAP §11.1 snaps most roofs to 30°, and Google's imagery pitches cluster
+# there; used only to convert the EPC plan roof area to the pitched-surface
+# units Google's panel footprint is measured in. Residual error is absorbed by
+# the usable fraction.
+_NOMINAL_ROOF_PITCH_DEG = 30.0
+# Fallback panel footprint (m²) when Google omits panel dimensions — a standard
+# ~1.88 × 1.05 m domestic module.
+_DEFAULT_PANEL_AREA_M2 = 1.96
+
+
+def _dwelling_roof_panel_cap(
+    potential: SolarPotential, dwelling_roof_area_m2: Optional[float]
+) -> Optional[float]:
+    """The maximum panel count that fits the dwelling's own usable roof
+    (ADR-0038), or None when no usable dwelling roof area is known (fall back to
+    Google's `maxArrayPanelsCount` cap alone). Budget = roof plan area ÷
+    cos(pitch) × usable fraction, divided by the panel's pitched-surface
+    footprint."""
+    if dwelling_roof_area_m2 is None or dwelling_roof_area_m2 <= 0.0:
+        return None
+    panel_area_m2: float = (
+        potential.panel_height_m * potential.panel_width_m
+        if potential.panel_height_m and potential.panel_width_m
+        else _DEFAULT_PANEL_AREA_M2
+    )
+    usable_surface_m2: float = (
+        dwelling_roof_area_m2
+        / math.cos(math.radians(_NOMINAL_ROOF_PITCH_DEG))
+        * _DWELLING_USABLE_ROOF_FRACTION
+    )
+    return usable_surface_m2 / panel_area_m2
+
 # Google Solar inverter DC→AC efficiency — the canonical rate the legacy
 # `GoogleSolarApi.dc_to_ac_rate` uses (mid of the 93–98% range); distinct from
 # the unrelated no-API `MEDIAN_WATTAGE_TO_AC` fallback.
@@ -139,13 +188,25 @@ def _drop_north_segments(config: SolarPanelConfiguration) -> SolarPanelConfigura
 
 def select_conservative_configs(
     potential: SolarPotential,
+    dwelling_roof_area_m2: Optional[float] = None,
 ) -> tuple[SolarPanelConfiguration, ...]:
     """Choose up to five conservatively-sized array configs for the Optimiser
     (ADR-0026): drop north-facing planes, cap usable panels at ~70% of
     maxArrayPanelsCount, then sample five spanning min→max by expected
     generation (the size-suitability proxy) so the size/cost choice is genuine.
-    Returns an empty tuple when nothing usable remains."""
+    Returns an empty tuple when nothing usable remains.
+
+    When the dwelling's own roof area is known, the panel count is additionally
+    bounded by the Dwelling-Roof Cap (ADR-0038) — `min(0.70 ×
+    maxArrayPanelsCount, dwelling-roof budget)` — so Google footprint conflation
+    can't size the array to a neighbour's roof. The cap is a no-op when Google's
+    roof already fits the dwelling's (a correctly-matched home)."""
     panel_cap: float = _USABLE_PANEL_FRACTION * potential.max_array_panels_count
+    roof_cap: Optional[float] = _dwelling_roof_panel_cap(
+        potential, dwelling_roof_area_m2
+    )
+    if roof_cap is not None:
+        panel_cap = min(panel_cap, roof_cap)
     feasible: list[SolarPanelConfiguration] = [
         trimmed
         for config in potential.configurations
@@ -264,7 +325,7 @@ def recommend_solar(
     if solar_potential is None or not _solar_eligible(epc, restrictions):
         return None
     configs: tuple[SolarPanelConfiguration, ...] = select_conservative_configs(
-        solar_potential
+        solar_potential, _dwelling_roof_area_m2(epc)
     )
     if not configs:
         return None
@@ -278,6 +339,34 @@ def recommend_solar(
     return Recommendation(surface=_SOLAR_SURFACE, options=tuple(options))
 
 
+def _dwelling_roof_area_m2(epc: EpcPropertyData) -> Optional[float]:
+    """The dwelling's own roof plan area for the Dwelling-Roof Cap (ADR-0038),
+    or None when the EPC has no MAIN building part to measure (the cap then
+    falls back to Google's `maxArrayPanelsCount` cap).
+
+    The roof covers the **ground-floor footprint**, so the basis is
+    `ground_floor_area` (not the greatest per-storey area); `roof_area` is the
+    fallback when no ground (floor 0) dimension is lodged.
+
+    Clamped by total floor area: a footprint can never exceed the whole
+    dwelling's floor area (= footprint × storeys), so the clamp is a no-op on a
+    consistent lodged EPC. It matters for a **predicted** EPC, whose building-part
+    geometry is the structural template's — decoupled from the predicted floor
+    area (ADR-0029) — so without it the cap would read the template neighbour's
+    (larger) footprint rather than the predicted dwelling's size."""
+    try:
+        footprint: float = ground_floor_area(epc, BuildingPartIdentifier.MAIN)
+    except StopIteration:
+        try:
+            footprint = roof_area(epc, BuildingPartIdentifier.MAIN)
+        except StopIteration:
+            return None
+    total: Optional[float] = epc.total_floor_area_m2
+    if total is not None and total > 0.0:
+        return min(footprint, total)
+    return footprint
+
+
 def _solar_eligible(
     epc: EpcPropertyData, restrictions: PlanningRestrictions
 ) -> bool:
diff --git a/domain/modelling/scoring/overlay_applicator.py b/domain/modelling/scoring/overlay_applicator.py
index 9c83724a2..93875bbfd 100644
--- a/domain/modelling/scoring/overlay_applicator.py
+++ b/domain/modelling/scoring/overlay_applicator.py
@@ -9,16 +9,19 @@ then discarded). See ADR-0016.
 
 import copy
 from dataclasses import fields
-from typing import Optional, Sequence
+from typing import Final, Optional, Sequence
 
 from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
     EpcPropertyData,
+    SapBuildingPart,
     SapVentilation,
     SapWindow,
     WindowTransmissionDetails,
 )
 from domain.modelling.simulation import (
     EpcSimulation,
+    GlazingOverlay,
     HeatingOverlay,
     LightingOverlay,
     SecondaryHeatingOverlay,
@@ -28,6 +31,39 @@ from domain.modelling.simulation import (
 )
 
 
+# A Landlord Override's building part is a POSITIONAL index (0=main, 1=extension
+# 1…, ADR-0004), translated to a `BuildingPartIdentifier` upstream. This recovers
+# that position so an override can fall back onto the part the EPC actually models
+# at that slot when the gov-API labelled it differently (e.g. lodged a 2nd part as
+# `other` rather than `extension_1`).
+_POSITION_BY_IDENTIFIER: Final[dict[BuildingPartIdentifier, int]] = {
+    BuildingPartIdentifier.MAIN: 0,
+    BuildingPartIdentifier.EXTENSION_1: 1,
+    BuildingPartIdentifier.EXTENSION_2: 2,
+    BuildingPartIdentifier.EXTENSION_3: 3,
+    BuildingPartIdentifier.EXTENSION_4: 4,
+}
+
+
+def _resolve_part(
+    epc: EpcPropertyData,
+    parts_by_id: dict[BuildingPartIdentifier, SapBuildingPart],
+    identifier: BuildingPartIdentifier,
+) -> Optional[SapBuildingPart]:
+    """The building part an overlay targets: the EPC's part with that identifier
+    when present, else the part at the override's positional index (so a
+    correction for `extension_1` still lands on the EPC's 2nd part even when the
+    gov-API lodged it under a different label). ``None`` when the EPC models no
+    part at that position."""
+    part = parts_by_id.get(identifier)
+    if part is not None:
+        return part
+    position = _POSITION_BY_IDENTIFIER.get(identifier)
+    if position is None or position >= len(epc.sap_building_parts):
+        return None
+    return epc.sap_building_parts[position]
+
+
 def apply_simulations(
     baseline: EpcPropertyData, simulations: Sequence[EpcSimulation]
 ) -> EpcPropertyData:
@@ -40,7 +76,12 @@ def apply_simulations(
 
     for simulation in simulations:
         for identifier, overlay in simulation.building_parts.items():
-            part = parts_by_id[identifier]
+            part = _resolve_part(result, parts_by_id, identifier)
+            # No part at this position — the EPC models fewer parts than the
+            # override's index. We have no geometry to model the missing part, so
+            # skip it rather than crash the whole property's modelling.
+            if part is None:
+                continue
             for overlay_field in fields(overlay):
                 value = getattr(overlay, overlay_field.name)
                 if value is not None:
@@ -53,6 +94,8 @@ def apply_simulations(
             )
         if simulation.lighting is not None:
             _fold_lighting(result, simulation.lighting)
+        if simulation.glazing is not None:
+            _fold_glazing(result, simulation.glazing)
         if simulation.heating is not None:
             _fold_heating(result, simulation.heating)
         if simulation.secondary_heating is not None:
@@ -63,6 +106,8 @@ def apply_simulations(
             result.property_type = simulation.property_type
         if simulation.built_form is not None:
             result.built_form = simulation.built_form
+        if simulation.percent_draughtproofed is not None:
+            result.percent_draughtproofed = simulation.percent_draughtproofed
 
     return result
 
@@ -175,11 +220,13 @@ def _fold_lighting(epc: EpcPropertyData, overlay: LightingOverlay) -> None:
 
 def _fold_window(window: SapWindow, overlay: WindowOverlay) -> None:
     """Write a `WindowOverlay`'s non-``None`` fields onto a (copied) window:
-    ``glazing_type`` flat on the window, ``u_value`` / ``solar_transmittance``
-    into its `WindowTransmissionDetails` (where the cascade reads them), starting
-    a fresh one when the window lodged none."""
+    ``glazing_type`` and ``frame_factor`` flat on the window, ``u_value`` /
+    ``solar_transmittance`` into its `WindowTransmissionDetails` (where the
+    cascade reads them), starting a fresh one when the window lodged none."""
     if overlay.glazing_type is not None:
         window.glazing_type = overlay.glazing_type
+    if overlay.frame_factor is not None:
+        window.frame_factor = overlay.frame_factor
     if overlay.u_value is None and overlay.solar_transmittance is None:
         return
     details: Optional[WindowTransmissionDetails] = window.window_transmission_details
@@ -202,6 +249,21 @@ def _fold_window(window: SapWindow, overlay: WindowOverlay) -> None:
         details.solar_transmittance = overlay.solar_transmittance
 
 
+def _fold_glazing(epc: EpcPropertyData, overlay: GlazingOverlay) -> None:
+    """Expand a whole-dwelling `GlazingOverlay` across every window: set each
+    window's `glazing_type` to the corrected SAP10 code AND clear its lodged
+    transmission U, so `heat_transmission`'s Table-24 cascade re-derives U from
+    the new type (the lodged U was for the old, mis-recorded glazing). A landlord
+    glazing override carries no per-window geometry, so it applies uniformly —
+    the expansion lives here because the baseline window list is known only at
+    fold time."""
+    if overlay.glazing_type is None:
+        return
+    for window in epc.sap_windows:
+        window.glazing_type = overlay.glazing_type
+        window.window_transmission_details = None
+
+
 def _fold_ventilation(
     baseline: Optional[SapVentilation], overlay: VentilationOverlay
 ) -> SapVentilation:
diff --git a/domain/modelling/simulation.py b/domain/modelling/simulation.py
index 624826f68..2f6fc94d5 100644
--- a/domain/modelling/simulation.py
+++ b/domain/modelling/simulation.py
@@ -28,6 +28,12 @@ class BuildingPartOverlay:
     # The wall material (RdSAP `wall_construction` code). Left `None` by Measures
     # — insulating a wall doesn't change its material — but set by a Landlord
     # Override that corrects the construction itself (ADR-0032).
+    # RdSAP England-&-Wales construction age band — the letter code A..M the
+    # calculator's U-value cascades key on (`SapBuildingPart.construction_age_band`).
+    # Left `None` by Measures (retrofits don't change build era); set by a Landlord
+    # Override that corrects the lodged age band, which re-derives this part's
+    # fabric U-value defaults. Folds onto the part via the generic field loop.
+    construction_age_band: Optional[str] = None
     wall_construction: Optional[int] = None
     wall_insulation_type: Optional[int] = None
     # Added solid-wall insulation depth (mm) — drives the calculator's Table 6
@@ -35,6 +41,12 @@ class BuildingPartOverlay:
     # IWI (`wall_insulation_type=3`); λ defaults to 0.04 W/m·K in the calculator.
     wall_insulation_thickness: Optional[int] = None
     roof_insulation_thickness: Optional[int] = None
+    # The roof shape string the calculator's flat-roof path keys on
+    # (`heat_transmission.py`: `"flat" in roof_construction_type`). Left `None`
+    # by Measures (insulating a roof doesn't change its shape); set by a Landlord
+    # Override that corrects a roof to flat so the `_FLAT_ROOF_BY_AGE` age-band
+    # default applies (ADR-0033). Folds onto the part via the generic field loop.
+    roof_construction_type: Optional[str] = None
     floor_insulation_thickness: Optional[int] = None
     floor_insulation_type_str: Optional[str] = None
 
@@ -65,12 +77,38 @@ class WindowOverlay:
     are written into the window's `WindowTransmissionDetails` — where the
     calculator reads heat loss and solar gain from — because our calculator
     consumes the lodged values directly rather than deriving them from
-    `glazing_type`. A `None` field means "leave the baseline value unchanged".
+    `glazing_type`. `frame_factor` is written flat on the window (the §6
+    solar-gain area factor); a replacement unit re-lodges its own FF, which
+    can differ from the pane it replaced. A `None` field means "leave the
+    baseline value unchanged".
     """
 
     glazing_type: Optional[int] = None
     u_value: Optional[float] = None
     solar_transmittance: Optional[float] = None
+    frame_factor: Optional[float] = None
+
+
+@dataclass(frozen=True)
+class GlazingOverlay:
+    """All-optional partial of the dwelling's whole-glazing state — the
+    correction a Landlord Override makes when the lodged glazing is wrong.
+
+    Unlike a per-window `WindowOverlay` (keyed by `sap_windows` index), this
+    targets no single window: a landlord describes the dwelling's glazing as a
+    whole ("Double glazing, 2002 or later") with no per-window geometry, so the
+    overlay builder (which never sees the baseline window list) emits one of
+    these and `_fold_glazing` expands it across every `sap_windows` entry.
+
+    `glazing_type` is the SAP10 glazing-type code (Table 24 / `u_window`
+    cascade: 1=single, 2=double 2002-2021, 3=double pre-2002, 9=triple 2002+,
+    …). The fold sets it on every window AND clears each window's lodged
+    transmission U-value, so the Table-24 cascade re-derives the corrected U
+    from the new type (the lodged U was for the OLD, mis-recorded glazing).
+    A `None` field means "leave the baseline value unchanged".
+    """
+
+    glazing_type: Optional[int] = None
 
 
 @dataclass(frozen=True)
@@ -220,6 +258,7 @@ class EpcSimulation:
     windows: Mapping[int, WindowOverlay] = field(default_factory=_no_windows)
     ventilation: Optional[VentilationOverlay] = None
     lighting: Optional[LightingOverlay] = None
+    glazing: Optional[GlazingOverlay] = None
     heating: Optional[HeatingOverlay] = None
     secondary_heating: Optional[SecondaryHeatingOverlay] = None
     solar: Optional[SolarOverlay] = None
@@ -228,3 +267,8 @@ class EpcSimulation:
     # built form (property_type drives party-wall heat loss + measure eligibility).
     property_type: Optional[str] = None
     built_form: Optional[str] = None
+    # Whole-dwelling RdSAP 10 §8.1 draught-proofing percentage, when a
+    # Measure changes it (e.g. glazing: sealed units draught-proof the
+    # panes they replace). The §2 cascade reads this dwelling-level value,
+    # so the overlay sets it directly. `None` leaves the baseline's value.
+    percent_draughtproofed: Optional[int] = None
diff --git a/domain/modelling/solar_potential.py b/domain/modelling/solar_potential.py
index 1d90e14fc..2881c189a 100644
--- a/domain/modelling/solar_potential.py
+++ b/domain/modelling/solar_potential.py
@@ -19,7 +19,7 @@ Potential).
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Mapping
+from typing import Any, Mapping, Optional
 
 # Google's `azimuthDegrees` is a compass bearing: 0°=N, 90°=E, 180°=S, 270°=W,
 # increasing clockwise. The SAP octant codes (ORIENTATION_BY_SAP10_CODE in the
@@ -62,6 +62,14 @@ class SolarRoofSegment:
     azimuth_degrees: float
     pitch_degrees: float
     yearly_energy_dc_kwh: float
+    # Per-segment centre + roof-plane area, enriched from the top-level
+    # `roofSegmentStats` (keyed by `segmentIndex`) — the per-config
+    # `roofSegmentSummaries` omit them. Used by the Dwelling-Roof Cap
+    # (ADR-0038) to rank segments by distance from the dwelling and bound the
+    # array by usable roof area. None when the stats block lacks the segment.
+    center_latitude: Optional[float] = None
+    center_longitude: Optional[float] = None
+    area_m2: Optional[float] = None
 
     @property
     def sap_orientation(self) -> int:
@@ -94,24 +102,72 @@ class SolarPotential:
     panel_capacity_watts: float
     max_array_panels_count: int
     configurations: tuple[SolarPanelConfiguration, ...]
+    # Physical panel footprint (Google `panelHeightMeters` / `panelWidthMeters`)
+    # — the Dwelling-Roof Cap (ADR-0038) converts a usable roof-area budget into
+    # a panel count via this. None for partial blocks lacking the fields.
+    panel_height_m: Optional[float] = None
+    panel_width_m: Optional[float] = None
 
     @classmethod
-    def from_building_insights(cls, insights: Mapping[str, Any]) -> "SolarPotential":
+    def from_building_insights(
+        cls, insights: Mapping[str, Any]
+    ) -> Optional["SolarPotential"]:
         """Project a raw Google ``buildingInsights`` response (as persisted by
-        `SolarRepository`) into a `SolarPotential`."""
+        `SolarRepository`) into a `SolarPotential`, or None when the
+        ``solarPotential`` block lacks the array-level sizing fields
+        (``maxArrayPanelsCount`` / ``panelCapacityWatts``) — Google returns such
+        partial blocks for buildings with no usable solar estimate, which is a
+        "no solar potential" outcome, not a hard error."""
         solar_potential: Mapping[str, Any] = insights["solarPotential"]
+        if (
+            "maxArrayPanelsCount" not in solar_potential
+            or "panelCapacityWatts" not in solar_potential
+        ):
+            return None
+        # Per-segment centre + area live on the top-level `roofSegmentStats`;
+        # the per-config `roofSegmentSummaries` carry only the panel/orientation
+        # fields. `roofSegmentSummaries[].segmentIndex` refers to the POSITION in
+        # `roofSegmentStats` (the entries are positional — Google omits an
+        # explicit `segmentIndex` field on them), so key the lookup by position.
+        stats_by_index: dict[int, Mapping[str, Any]] = {
+            index: stats
+            for index, stats in enumerate(
+                solar_potential.get("roofSegmentStats", [])
+            )
+        }
+
+        def _segment(summary: Mapping[str, Any]) -> SolarRoofSegment:
+            index: int = int(summary["segmentIndex"])
+            stats: Optional[Mapping[str, Any]] = stats_by_index.get(index)
+            center: Mapping[str, Any] = (
+                stats.get("center", {}) if stats is not None else {}
+            )
+            area: Optional[float] = (
+                float(stats["stats"]["areaMeters2"])
+                if stats is not None and "stats" in stats
+                else None
+            )
+            return SolarRoofSegment(
+                segment_index=index,
+                panels_count=int(summary["panelsCount"]),
+                azimuth_degrees=float(summary["azimuthDegrees"]),
+                pitch_degrees=float(summary["pitchDegrees"]),
+                yearly_energy_dc_kwh=float(summary["yearlyEnergyDcKwh"]),
+                center_latitude=(
+                    float(center["latitude"]) if "latitude" in center else None
+                ),
+                center_longitude=(
+                    float(center["longitude"]) if "longitude" in center else None
+                ),
+                area_m2=area,
+            )
+
         configurations: tuple[SolarPanelConfiguration, ...] = tuple(
             SolarPanelConfiguration(
                 panels_count=int(config["panelsCount"]),
                 yearly_energy_dc_kwh=float(config["yearlyEnergyDcKwh"]),
                 segments=tuple(
-                    SolarRoofSegment(
-                        segment_index=int(summary["segmentIndex"]),
-                        panels_count=int(summary["panelsCount"]),
-                        azimuth_degrees=float(summary["azimuthDegrees"]),
-                        pitch_degrees=float(summary["pitchDegrees"]),
-                        yearly_energy_dc_kwh=float(summary["yearlyEnergyDcKwh"]),
-                    )
+                    _segment(summary)
                     for summary in config.get("roofSegmentSummaries", [])
                 ),
             )
@@ -121,4 +177,14 @@ class SolarPotential:
             panel_capacity_watts=float(solar_potential["panelCapacityWatts"]),
             max_array_panels_count=int(solar_potential["maxArrayPanelsCount"]),
             configurations=configurations,
+            panel_height_m=(
+                float(solar_potential["panelHeightMeters"])
+                if "panelHeightMeters" in solar_potential
+                else None
+            ),
+            panel_width_m=(
+                float(solar_potential["panelWidthMeters"])
+                if "panelWidthMeters" in solar_potential
+                else None
+            ),
         )
diff --git a/domain/property/property.py b/domain/property/property.py
index d4652d99c..a22ab46b3 100644
--- a/domain/property/property.py
+++ b/domain/property/property.py
@@ -46,9 +46,10 @@ class Property:
     # neither a lodged EPC nor Site Notes; a real source always wins.
     predicted_epc: Optional[EpcPropertyData] = None
     # Resolved Landlord Overrides as Simulation Overlays, folded onto the lodged
-    # EPC to form the Effective EPC (ADR-0032). Empty when the Property has no
-    # overrides — the EPC is then returned unchanged. Only applied on the
-    # `epc_with_overlay` path; never when Site Notes are the source.
+    # OR neighbour-synthesised EPC to form the Effective EPC (ADR-0032). Empty
+    # when the Property has no overrides — the EPC is then returned unchanged.
+    # Applied on the `epc_with_overlay` and `predicted` paths; never when Site
+    # Notes are the source.
     landlord_overrides: Sequence[EpcSimulation] = field(default_factory=tuple)
     # The current open-market value (a Property Valuation) — externally sourced
     # and mostly absent; feeds the Plan's Valuation Uplift £ forms (ADR-0018).
@@ -59,11 +60,13 @@ class Property:
 
     @property
     def source_path(self) -> SourcePath:
-        """Which of the two disjoint source paths models this Property (ADR-0001).
+        """Which of the three disjoint source paths models this Property (ADR-0001).
 
-        Site Notes alone, or the public EPC (with Landlord Overrides, once that
-        slice lands). When both exist the newer wins (Recency Tie-Break); on an
-        equal date the survey wins, as it reflects on-site observation.
+        Site Notes, or the public EPC (with Landlord Overrides folded on), or —
+        as a last resort when neither real source exists — a neighbour-synthesised
+        EPC (EPC Prediction, ADR-0031). When both Site Notes and an EPC exist the
+        newer wins (Recency Tie-Break); on an equal date the survey wins, as it
+        reflects on-site observation. A real source always beats the prediction.
         """
         if self.site_notes is not None and self.epc is not None:
             epc_date = self.epc.registration_date or self.epc.inspection_date
@@ -81,23 +84,43 @@ class Property:
             "no source path to model from"
         )
 
+    @property
+    def physical_state_changed(self) -> bool:
+        """True when the Effective EPC was assembled from something other than a
+        pristine lodged cert — Site Notes superseded it, Landlord Overrides were
+        folded on, or it was synthesised by EPC Prediction (Rebaselining trigger
+        (b)/(c), CONTEXT.md). The Rebaseliner uses this to adopt the calculator's
+        output over the accredited lodged figure even at SAP >= 10.2. A pristine
+        lodged EPC with no overrides returns False."""
+        path = self.source_path
+        if path == "site_notes" or path == "predicted":
+            return True
+        return bool(self.landlord_overrides)
+
     @property
     def effective_epc(self) -> EpcPropertyData:
         """The EpcPropertyData the modelling pipeline scores against.
 
-        Path 1: the Site Notes' surveyed data. Path 2: the public EPC with any
-        Landlord Overrides folded on as Simulation Overlays (ADR-0032) — returned
-        as-is when there are none. Path 3: a neighbour-synthesised EPC (EPC
-        Prediction gap-fill, ADR-0031), used only when neither real source is
-        present.
+        Path 1: the Site Notes' surveyed data.
+        Path 2: the public EPC with any Landlord Overrides folded on as Simulation Overlays (ADR-0032) — returned
+        as-is when there are none.
+        Path 3: a neighbour-synthesised EPC (EPC Prediction gap-fill, ADR-0031), likewise with any Landlord Overrides
+        folded on: the cohort fills the unknown fields, the landlord's known
+        facts (wall/roof/glazing/heating/age) correct them. Used only when
+        neither real source is present.
         """
         if self.source_path == "site_notes":
             assert self.site_notes is not None
             return self.site_notes.to_epc_property_data()
         if self.source_path == "predicted":
             assert self.predicted_epc is not None
-            return self.predicted_epc
+            return self._with_overrides(self.predicted_epc)
         assert self.epc is not None
+        return self._with_overrides(self.epc)
+
+    def _with_overrides(self, epc: EpcPropertyData) -> EpcPropertyData:
+        """``epc`` with any Landlord Overrides folded on as Simulation Overlays,
+        or unchanged when there are none (ADR-0032)."""
         if self.landlord_overrides:
-            return apply_simulations(self.epc, self.landlord_overrides)
-        return self.epc
+            return apply_simulations(epc, self.landlord_overrides)
+        return epc
diff --git a/domain/property_baseline/calculator_rebaseliner.py b/domain/property_baseline/calculator_rebaseliner.py
index 6ed95c4ec..04558ab75 100644
--- a/domain/property_baseline/calculator_rebaseliner.py
+++ b/domain/property_baseline/calculator_rebaseliner.py
@@ -4,7 +4,11 @@ import logging
 from typing import TYPE_CHECKING, Optional
 
 from domain.property_baseline.performance import Performance
-from domain.property_baseline.rebaseliner import Rebaseliner, RebaselineResult
+from domain.property_baseline.rebaseliner import (
+    Rebaseliner,
+    RebaselineReason,
+    RebaselineResult,
+)
 
 if TYPE_CHECKING:
     from datatypes.epc.domain.epc_property_data import EpcPropertyData
@@ -50,7 +54,12 @@ class CalculatorRebaseliner(Rebaseliner):
         self._calculator = calculator
 
     def rebaseline(
-        self, property_id: int, effective_epc: "EpcPropertyData", lodged: Performance
+        self,
+        property_id: int,
+        effective_epc: "EpcPropertyData",
+        lodged: Performance,
+        *,
+        physical_state_changed: bool = False,
     ) -> RebaselineResult:
         # A raise (UnmappedSapCode, etc.) propagates: the calculator is
         # load-bearing, so the batch aborts and the cert is fixed at once. The
@@ -58,10 +67,24 @@ class CalculatorRebaseliner(Rebaseliner):
         # regardless of whether lodged or calculated figures win (ADR-0013/0014).
         result: SapResult = self._calculator.calculate(effective_epc)
         sap_version: Optional[float] = effective_epc.sap_version
-        if sap_version is not None and sap_version < _MIN_TRUSTED_SAP_VERSION:
+        pre_sap10 = sap_version is not None and sap_version < _MIN_TRUSTED_SAP_VERSION
+        # The calculator output IS Effective Performance whenever a Rebaselining
+        # trigger fired: (a) a superseded methodology (pre-SAP10), or (b)/(c) the
+        # physical state was changed by Landlord Overrides / Prediction. Only a
+        # pristine lodged SAP >= 10.2 cert keeps its accredited figure — that is
+        # the *only* case where the calculator runs purely to validate (and where
+        # its known divergence from the accredited register would mislead).
+        if pre_sap10 or physical_state_changed:
+            reason: RebaselineReason = (
+                "both"
+                if pre_sap10 and physical_state_changed
+                else "pre_sap10"
+                if pre_sap10
+                else "physical_state_changed"
+            )
             return RebaselineResult(
                 effective=Performance.from_sap_result(result),
-                reason="pre_sap10",
+                reason=reason,
                 sap_result=result,
             )
         self._log_divergence(
diff --git a/domain/property_baseline/rebaseliner.py b/domain/property_baseline/rebaseliner.py
index e5d94d3f2..9171b4bf6 100644
--- a/domain/property_baseline/rebaseliner.py
+++ b/domain/property_baseline/rebaseliner.py
@@ -59,8 +59,20 @@ class Rebaseliner(ABC):
 
     @abstractmethod
     def rebaseline(
-        self, property_id: int, effective_epc: EpcPropertyData, lodged: Performance
-    ) -> RebaselineResult: ...
+        self,
+        property_id: int,
+        effective_epc: EpcPropertyData,
+        lodged: Performance,
+        *,
+        physical_state_changed: bool = False,
+    ) -> RebaselineResult:
+        """Produce Effective Performance. ``physical_state_changed`` is True when
+        the Effective EPC was assembled from something other than a pristine
+        lodged cert — Landlord Overrides, Site Notes, or EPC Prediction moved the
+        physical picture (Rebaselining trigger (b)/(c)) — so the accredited lodged
+        figure no longer describes the dwelling and the calculator output wins
+        even at SAP >= 10.2."""
+        ...
 
 
 class StubRebaseliner(Rebaseliner):
@@ -76,7 +88,12 @@ class StubRebaseliner(Rebaseliner):
     """
 
     def rebaseline(
-        self, property_id: int, effective_epc: EpcPropertyData, lodged: Performance
+        self,
+        property_id: int,
+        effective_epc: EpcPropertyData,
+        lodged: Performance,
+        *,
+        physical_state_changed: bool = False,
     ) -> RebaselineResult:
         sap_version = effective_epc.sap_version
         if sap_version is not None and sap_version < _SAP10_FLOOR:
@@ -84,4 +101,11 @@ class StubRebaseliner(Rebaseliner):
                 f"Property needs rebaselining (pre-SAP10 cert, sap_version="
                 f"{sap_version}); this stub does not run the calculator"
             )
+        # A physical-state change needs the calculator this stub does not run;
+        # raise rather than fabricate a "none" that ignores the overrides.
+        if physical_state_changed:
+            raise RebaselineNotImplemented(
+                "Property needs rebaselining (physical state changed by overrides "
+                "/ prediction); this stub does not run the calculator"
+            )
         return RebaselineResult(effective=lodged, reason="none", sap_result=None)
diff --git a/domain/sap10_calculator/calculator.py b/domain/sap10_calculator/calculator.py
index f7099f182..c30234a7c 100644
--- a/domain/sap10_calculator/calculator.py
+++ b/domain/sap10_calculator/calculator.py
@@ -42,7 +42,7 @@ Appendix L + U. RdSAP10 Table 32 (p.95) for fuel prices/CO2/PE factors.
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from dataclasses import dataclass, field
+from dataclasses import dataclass, field, replace
 from typing import Final, Optional, TYPE_CHECKING
 
 from domain.sap10_calculator.climate.appendix_u import external_temperature_c
@@ -301,6 +301,13 @@ class CalculatorInputs:
     secondary_heating_fraction: float = 0.0
     secondary_heating_efficiency: float = 1.0
     secondary_heating_fuel_cost_gbp_per_kwh: float = 0.0
+    # Main heating system 2's fuel cost per kWh (legacy/off-peak scalar path).
+    # main system 2 may burn a DIFFERENT fuel from main 1 (e.g. wood logs vs
+    # electric room heaters) — pricing its kWh at main 1's rate grossly mis-
+    # costs it. Defaults to 0.0; cert_to_inputs sets it to main 2's own rate
+    # when a second main is lodged (the term is multiplied by main 2's kWh,
+    # which is 0 when no second main exists, so the default is inert).
+    main_2_heating_fuel_cost_gbp_per_kwh: float = 0.0
     # SAP10.2 (107)m — space cooling requirement kWh per month from §8c
     # orchestrator `space_cooling_monthly_kwh`. Includes spec Jun-Aug
     # inclusion mask + 1-kWh clamp. Default (0,)*12 for backwards
@@ -348,6 +355,21 @@ class CalculatorInputs:
     main_2_heating_fuel_code: Optional[int] = None
     secondary_heating_fuel_code: Optional[int] = None
     hot_water_fuel_code: Optional[int] = None
+    # Off-Peak Meter day/night billing metadata for ADR-0014 Bill Derivation —
+    # output-only (NOT fed into cost / CO2 / PE / sap_score, already priced via
+    # the per-end-use cost factor fields above). `is_off_peak_meter` routes every
+    # electric end use to the off-peak carrier; the per-end-use High-Rate
+    # Fractions (SAP 10.2 Table 12a) drive the day/night split. cert_to_inputs
+    # supplies them from the same Table-12a helpers the cost cascade uses;
+    # defaults (`False` + 1.0) keep synthetic / standard-tariff constructions a
+    # no-op. They thread byte-identical onto `SapResult`.
+    is_off_peak_meter: bool = False
+    main_heating_high_rate_fraction: float = 1.0
+    main_2_heating_high_rate_fraction: float = 1.0
+    secondary_heating_high_rate_fraction: float = 1.0
+    hot_water_high_rate_fraction: float = 1.0
+    pumps_fans_high_rate_fraction: float = 1.0
+    other_electricity_high_rate_fraction: float = 1.0
 
 
 @dataclass(frozen=True)
@@ -415,6 +437,24 @@ class SapResult:
     primary_energy_kwh_per_m2: float
     monthly: tuple[MonthlyEntry, ...]
     intermediate: dict[str, float]
+    # Off-Peak Meter day/night billing metadata for ADR-0014 Bill Derivation
+    # (output-only — NOT fed into ecf / cost / CO2 / PE / sap_score, which the
+    # rating cascade already prices via the per-end-use cost factors). When the
+    # dwelling is on an off-peak meter, EVERY electric end use bills on it, each
+    # split day/night by its own **High-Rate Fraction** (SAP 10.2 Table 12a — the
+    # share billed at the day/high rate). The fractions are the calculator's own
+    # Table-12a values, surfaced so the bill reuses them rather than re-deriving
+    # a second day/night model. Defaults (`False` + 1.0) make a standard-tariff
+    # dwelling a no-op: the carrier stays `ELECTRICITY` and nothing splits.
+    is_off_peak_meter: bool = False
+    main_heating_high_rate_fraction: float = 1.0
+    main_2_heating_high_rate_fraction: float = 1.0
+    secondary_heating_high_rate_fraction: float = 1.0
+    hot_water_high_rate_fraction: float = 1.0
+    pumps_fans_high_rate_fraction: float = 1.0
+    # Lighting / appliances / cooking / cooling — the Grid 2 ALL_OTHER_USES split
+    # (appliances + cooking inherit it; SAP does not rate those unregulated loads).
+    other_electricity_high_rate_fraction: float = 1.0
 
 
 def _time_constant_h(*, tmp_kj_per_m2_k: float, tfa_m2: float, hlc_w_per_k: float) -> float:
@@ -579,7 +619,18 @@ def calculate_sap_from_inputs(inputs: CalculatorInputs) -> SapResult:
                 inputs.pv_generation_kwh_per_yr
                 * inputs.pv_export_credit_gbp_per_kwh
             )
-        main_heating_cost = main_fuel_kwh * inputs.space_heating_fuel_cost_gbp_per_kwh
+        # `main_fuel_kwh` aggregates main systems 1 and 2 (see (211)+(213)
+        # above). Bill main 2 at ITS OWN fuel rate, not main 1's — a dual-fuel
+        # pair (e.g. electric room heaters + wood logs) is mis-costed otherwise
+        # (the §10a standard path already splits these; this is the legacy/
+        # off-peak scalar path). main 2's kWh is 0 when no second main is
+        # lodged, so the default 0.0 rate is inert.
+        main_2_fuel_kwh = inputs.energy_requirements.main_2_fuel_kwh_per_yr
+        main_1_fuel_kwh = main_fuel_kwh - main_2_fuel_kwh
+        main_heating_cost = (
+            main_1_fuel_kwh * inputs.space_heating_fuel_cost_gbp_per_kwh
+            + main_2_fuel_kwh * inputs.main_2_heating_fuel_cost_gbp_per_kwh
+        )
         secondary_heating_cost = (
             secondary_fuel_kwh * inputs.secondary_heating_fuel_cost_gbp_per_kwh
         )
@@ -617,7 +668,13 @@ def calculate_sap_from_inputs(inputs: CalculatorInputs) -> SapResult:
         )
     ecf = energy_cost_factor(total_cost_gbp=total_cost, total_floor_area_m2=tfa)
     sap_int = sap_rating_integer(ecf=ecf)
-    sap_cont = sap_rating(ecf=ecf)
+    # SAP 10.2 §13 / RdSAP 10 §13: the SAP rating is floored at 1 ("if the
+    # result of the calculation is less than 1, the rating is 1"). Apply the
+    # same floor to the continuous value so it stays a valid rating — the
+    # un-rounded part is for sensitivity NEAR real ratings, not for emitting
+    # a physically impossible negative SAP on a degenerate dwelling (e.g. a
+    # cert lodged at the floor of 1). Mirrors `sap_rating_integer`'s max(1,…).
+    sap_cont = max(1.0, sap_rating(ecf=ecf))
     co2_factor = inputs.co2_factor_kg_per_kwh
     # Per-end-use effective CO2 factors (Table 12d monthly cascade for
     # electricity, annual for gas). cert_to_inputs supplies these from
@@ -833,6 +890,13 @@ def calculate_sap_from_inputs(inputs: CalculatorInputs) -> SapResult:
         primary_energy_kwh_per_m2=primary_energy_per_m2,
         monthly=monthly,
         intermediate=intermediate,
+        is_off_peak_meter=inputs.is_off_peak_meter,
+        main_heating_high_rate_fraction=inputs.main_heating_high_rate_fraction,
+        main_2_heating_high_rate_fraction=inputs.main_2_heating_high_rate_fraction,
+        secondary_heating_high_rate_fraction=inputs.secondary_heating_high_rate_fraction,
+        hot_water_high_rate_fraction=inputs.hot_water_high_rate_fraction,
+        pumps_fans_high_rate_fraction=inputs.pumps_fans_high_rate_fraction,
+        other_electricity_high_rate_fraction=inputs.other_electricity_high_rate_fraction,
     )
 
 
@@ -863,6 +927,25 @@ class Sap10Calculator(SapCalculator):
     """
 
     def calculate(self, epc: "EpcPropertyData") -> SapResult:
-        from domain.sap10_calculator.rdsap.cert_to_inputs import cert_to_inputs
+        # SAP 10.2 Appendix U paragraph 1 (p.124): the SAP and EI ratings are
+        # computed on UK-average climate (so ratings are nationally
+        # comparable), but "other calculations (such as for energy use and
+        # costs on EPCs) are done using local weather" — the EPC-displayed
+        # CO2 emissions and primary energy use postcode-district weather from
+        # the PCDB. So we run two climate cascades and graft the demand
+        # cascade's CO2/PE onto the rating cascade's SAP result. (Worked
+        # example: simulated case 45 — rating SAP 60.53/CO2 692.13 on
+        # UK-average; demand CO2 626.78/PE 6581.59 on the W6 postcode.)
+        from domain.sap10_calculator.rdsap.cert_to_inputs import (
+            cert_to_demand_inputs,
+            cert_to_inputs,
+        )
 
-        return calculate_sap_from_inputs(cert_to_inputs(epc))
+        rating = calculate_sap_from_inputs(cert_to_inputs(epc))
+        demand = calculate_sap_from_inputs(cert_to_demand_inputs(epc))
+        return replace(
+            rating,
+            co2_kg_per_yr=demand.co2_kg_per_yr,
+            primary_energy_kwh_per_yr=demand.primary_energy_kwh_per_yr,
+            primary_energy_kwh_per_m2=demand.primary_energy_kwh_per_m2,
+        )
diff --git a/domain/sap10_calculator/docs/SAP_CALCULATOR.md b/domain/sap10_calculator/docs/SAP_CALCULATOR.md
index 7e78d99ce..68555fdad 100644
--- a/domain/sap10_calculator/docs/SAP_CALCULATOR.md
+++ b/domain/sap10_calculator/docs/SAP_CALCULATOR.md
@@ -427,12 +427,25 @@ secondary heating (1.5715) on the same certs, but flat Table 12 for the
 "low-rate cost" line items (SH main 1 + HW). It's an Elmhurst
 implementation choice, not a documented spec exception.
 
-**Cascade rule (post-S0380.163):**
+**Cascade rule (post-S0380.163, refined for whc-903 immersion):**
 
-| Tariff | HW PE / CO2 factor source |
-|---|---|
-| STANDARD | Table 12e / 12d monthly, weighted by HW demand seasonality (per spec literal) |
-| 7-hour / 10-hour / 18-hour / 24-hour | Table 12 annual flat (1.501 PE / 0.136 CO2) |
+| Tariff | HW system | HW PE / CO2 factor source |
+|---|---|---|
+| STANDARD | any | Table 12e / 12d monthly, weighted by HW demand seasonality (per spec literal) |
+| 7-hour / 10-hour | whc-903 electric immersion (Table 13 split) | Table 12d/12e high- + low-rate codes (32/31 or 34/33), kWh-weighted, blended by the Table 13 high-rate fraction — the SAME split the cost path applies |
+| 7-hour / 10-hour / 18-hour / 24-hour | all other (HW-from-main "low-rate cost", or 18h/24h immersion) | Table 12 annual flat (1.501 PE / 0.136 CO2) |
+
+**whc-903 immersion carve-out (simulated case 50).** The original S0380.163
+rule applied flat annual 0.136/1.501 to *every* dual-rate electric HW. That
+was validated only against HW-from-main "low-rate cost" certs (100% low, no
+high-rate split). The hand-built **case-50** worksheet (whc-903 dual electric
+immersion, 7-hour) bills HW CO2/PE as a split — "Water heating - high rate
+cost" (CO2 0.1475 / PE 1.5514, code 32) + "low rate cost" (CO2 0.1238 / PE
+1.4429, code 31), weighted by the Table 13 fraction 0.1009 — NOT flat 0.136.
+So flat-0.136 for immersion HW was a *spec gap on our side*, not an Elmhurst
+divergence. `_electric_immersion_hw_high_rate_fraction` threads the Table 13
+fraction into the CO2/PE helpers; the flat rule still holds for everything
+else (the 41-variant cases below are unaffected — they are HW-from-main).
 
 The SH main factor (`_main_heating_primary_factor`) already
 matches Elmhurst by accident: for dual-rate tariffs the
diff --git a/domain/sap10_calculator/exceptions.py b/domain/sap10_calculator/exceptions.py
index a91bd9cd6..374f65454 100644
--- a/domain/sap10_calculator/exceptions.py
+++ b/domain/sap10_calculator/exceptions.py
@@ -61,3 +61,26 @@ class MissingMainFuelType(ValueError):
         )
         self.value = value
         self.sap_main_heating_code = sap_main_heating_code
+
+
+class UnpricedFuelCode(ValueError):
+    """A concrete (non-None) fuel code reached the Table 32 unit-price
+    lookup but resolves to neither a Table 32 price code nor a gov-API
+    enum that translates to one.
+
+    Raised instead of silently falling back to the mains-gas price
+    (3.48 p/kWh): an unrecognised fuel billed at the gas rate produces a
+    misleading cost (e.g. the dual-main wood-vs-electric over-cost on
+    cert 10032957680). Surface the gap at the price boundary so the fuel
+    is either added to `UNIT_PRICE_P_PER_KWH` / `API_FUEL_TO_TABLE_32`
+    or canonicalised upstream. A `None` code (no fuel lodged) is NOT an
+    error — callers resolve "no system" before pricing.
+    """
+
+    def __init__(self, fuel_code: object) -> None:
+        super().__init__(
+            f"no Table 32 unit price for fuel code {fuel_code!r}; add it to "
+            f"UNIT_PRICE_P_PER_KWH or API_FUEL_TO_TABLE_32, or canonicalise "
+            f"the code upstream before pricing"
+        )
+        self.fuel_code = fuel_code
diff --git a/domain/sap10_calculator/rdsap/cert_to_inputs.py b/domain/sap10_calculator/rdsap/cert_to_inputs.py
index 60da4ce17..1cdfd98e7 100644
--- a/domain/sap10_calculator/rdsap/cert_to_inputs.py
+++ b/domain/sap10_calculator/rdsap/cert_to_inputs.py
@@ -52,7 +52,7 @@ from __future__ import annotations
 import math
 from dataclasses import dataclass, replace
 from decimal import ROUND_HALF_UP, Decimal
-from typing import Callable, Final, Literal, Optional
+from typing import Callable, Final, Literal, Optional, Union
 
 from datatypes.epc.domain.epc_property_data import (
     EpcPropertyData,
@@ -75,10 +75,13 @@ from domain.sap10_calculator.tables.pcdb import (
     gas_oil_boiler_record,
     heat_pump_record,
     mv_in_use_factors_record,
+    mvhr_record,
 )
 from domain.sap10_calculator.tables.pcdb.parser import (
     GasOilBoilerRecord,
     HeatPumpRecord,
+    MvhrDataPoint,
+    MvhrRecord,
 )
 from domain.sap10_calculator.tables.pcdb.postcode_weather import (
     PostcodeClimate,
@@ -197,6 +200,7 @@ from domain.sap10_calculator.worksheet.water_heating import (
     PIPEWORK_INSULATED_UNINSULATED,
     TABLE_J1_TCOLD_FROM_MAINS_C,
     WaterHeatingResult,
+    combi_loss_monthly_kwh_table_3a_keep_hot_time_clock,
     combi_loss_monthly_kwh_table_3a_row_1_no_keep_hot,
     combi_loss_monthly_kwh_table_3a_row_4_keep_hot_no_time_clock,
     combi_loss_monthly_kwh_table_3b_row_1_instantaneous,
@@ -525,6 +529,9 @@ def _table_4f_additive_components(epc: EpcPropertyData) -> float:
     """
     total = 0.0
     total += _mev_decentralised_kwh_per_yr_from_cert(epc)
+    # (230a) balanced MVHR fan electricity — SFP × 1.22 × V (SAP 10.2
+    # §2.6.6). Costed here but kept out of the Table 5a gains.
+    total += _mvhr_fan_kwh_per_yr_from_cert(epc)
     details = epc.sap_heating.main_heating_details if epc.sap_heating else []
     if details:
         main_1 = details[0]
@@ -709,6 +716,106 @@ def _mev_decentralised_kwh_per_yr_from_cert(epc: EpcPropertyData) -> float:
         sfp_av_w_per_l_per_s=sfp_av,
         dwelling_volume_m3=dimensions.volume_m3,
     )
+
+
+# PCDB Table 329 / 323 system_type 3 = balanced whole-house MV (with or
+# without heat recovery).
+_MV_BALANCED_SYSTEM_TYPE: Final[int] = 3
+# SAP 10.2 Table 4g (PDF p.176) defaults for an MVHR system NOT in the
+# PCDB: raw heat-recovery efficiency 66% + raw SFP 2.0 W/(l/s). Each is
+# then multiplied by the default-data in-use factor (Table 329
+# system_type 10 — efficiency 0.70 inside the envelope, SFP 2.5).
+_TABLE_4G_DEFAULT_MVHR_EFFICIENCY_PCT: Final[float] = 66.0
+_TABLE_4G_DEFAULT_MVHR_SFP_W_PER_L_PER_S: Final[float] = 2.0
+
+
+@dataclass(frozen=True)
+class _MvhrSystemValues:
+    """In-use SFP + heat-recovery efficiency for an MVHR dwelling, with
+    the PCDB Table 329 in-use factors already folded in."""
+
+    in_use_sfp_w_per_l_per_s: float
+    in_use_efficiency_pct: float
+
+
+def _select_mvhr_data_point(record: MvhrRecord, wet_rooms_count: int) -> MvhrDataPoint:
+    """SAP 10.2 §2.6.4: select the MVHR data point by the dwelling's
+    wet-room count (each Table 323 group is keyed by wet rooms). Exact
+    match where lodged; otherwise clamp to the tested range. Falls back
+    to the smallest-wet-room group when the cert lodges 0 (unlodged)."""
+    points = sorted(record.data_points, key=lambda p: p.num_wet_rooms)
+    target = wet_rooms_count if wet_rooms_count > 0 else points[0].num_wet_rooms
+    for point in points:
+        if point.num_wet_rooms == target:
+            return point
+    if target < points[0].num_wet_rooms:
+        return points[0]
+    return points[-1]
+
+
+def _mvhr_system_values(epc: EpcPropertyData) -> Optional[_MvhrSystemValues]:
+    """Resolve the in-use SFP + heat-recovery efficiency for an MVHR
+    dwelling, or None when the cert is not MVHR.
+
+    PCDB path (index lodged + Table 323 hit): select the data point whose
+    wet-room count matches the lodgement, then apply the Table 329
+    system_type-3 in-use factors — SFP per the lodged duct type (rigid
+    1.4 / flexible 1.7); heat-recovery efficiency for ducts inside the
+    heated envelope (0.90). Worksheet-proven on simulated case 49 (000565,
+    2 wet rooms, Vent Axia 500140 → raw SFP 0.88 × 1.4 = 1.232; raw
+    efficiency 91 × 0.90 = 81.9% = worksheet (23c)).
+
+    Default path (no PCDB record, e.g. an MVHR lodged with no PCDF index):
+    SAP 10.2 Table 4g raw SFP 2.0 / efficiency 66%, × the default-data
+    in-use factors (Table 329 system_type 10 — SFP 2.5, efficiency 0.70).
+
+    Duct type defaults to rigid when unlodged (the Elmhurst Summary path
+    captures it but not all sources do); semi-rigid maps to rigid per
+    SAP 10.2 §2.6.8. Only the ducts-inside-envelope efficiency factor is
+    worksheet-validated (all corpus + worksheet MVHR certs lodge it).
+    """
+    sv = epc.sap_ventilation
+    if sv is None or sv.mechanical_ventilation_kind != MechanicalVentilationKind.MVHR.name:
+        return None
+    pcdf_id = epc.mechanical_ventilation_index_number
+    record = mvhr_record(pcdf_id) if pcdf_id is not None else None
+    if record is not None and record.data_points:
+        point = _select_mvhr_data_point(record, epc.wet_rooms_count)
+        raw_sfp = point.sfp_w_per_l_per_s
+        raw_efficiency_pct = point.efficiency_pct
+        iuf_record = mv_in_use_factors_record(_MV_BALANCED_SYSTEM_TYPE)
+    else:
+        raw_sfp = _TABLE_4G_DEFAULT_MVHR_SFP_W_PER_L_PER_S
+        raw_efficiency_pct = _TABLE_4G_DEFAULT_MVHR_EFFICIENCY_PCT
+        iuf_record = mv_in_use_factors_record(_MEV_DEFAULT_DATA_SYSTEM_TYPE)
+    if iuf_record is None or raw_sfp is None or raw_efficiency_pct is None:
+        return None
+    if epc.mechanical_vent_duct_type == _MV_DUCT_TYPE_FLEXIBLE:
+        sfp_iuf = iuf_record.sfp_iuf_flexible_no_scheme
+    else:
+        sfp_iuf = iuf_record.sfp_iuf_rigid_no_scheme
+    efficiency_iuf = iuf_record.mvhr_efficiency_iuf_inside_no_scheme
+    if sfp_iuf is None or efficiency_iuf is None:
+        return None
+    return _MvhrSystemValues(
+        in_use_sfp_w_per_l_per_s=raw_sfp * sfp_iuf,
+        in_use_efficiency_pct=raw_efficiency_pct * efficiency_iuf,
+    )
+
+
+def _mvhr_fan_kwh_per_yr_from_cert(epc: EpcPropertyData) -> float:
+    """SAP 10.2 §5 Table 4f line (230a) annual fan electricity for an
+    MVHR dwelling: in-use SFP × 1.22 × V (the same (230a) shape as
+    decentralised MEV). Returns 0.0 when the cert is not MVHR. Per SAP
+    10.2 §2.6.6 this electricity is costed but NOT added to the Table 5a
+    gains (its effect is already in the heat-recovery efficiency)."""
+    values = _mvhr_system_values(epc)
+    if values is None:
+        return 0.0
+    return mev_decentralised_kwh_per_yr(
+        sfp_av_w_per_l_per_s=values.in_use_sfp_w_per_l_per_s,
+        dwelling_volume_m3=dimensions_from_cert(epc).volume_m3,
+    )
 # SAP10.2 Table 6d note 1: "average or unknown" overshading is the
 # default for existing dwellings. RdSAP doesn't lodge a per-dwelling
 # overshading code so §5 always uses AVERAGE → Z_L = 0.83.
@@ -888,6 +995,8 @@ _SECONDARY_HEATING_FRACTION_BY_CATEGORY: Final[dict[int, float]] = {
                # p.188). Cert 0380 (warm air mains gas, code 506, +
                # electric room-heater secondary) raised here before.
     10: 0.20,
+    11: 0.10,   # Electric ceiling heating (SAP code 701): direct-acting
+                # electric, SAP 10.2 Table 11 "Other electric systems" row.
 }
 _SECONDARY_HEATING_FRACTION_DEFAULT: Final[float] = 0.10
 
@@ -1533,7 +1642,62 @@ from domain.sap10_calculator.exceptions import (
 
 
 
-def _dwelling_exposure(dwelling_type: Optional[str]) -> DwellingExposure:
+def _roof_insulation_location_is_determined(
+    value: Optional[Union[int, str]]
+) -> bool:
+    """Whether a building part lodges a *determined* roof-insulation
+    location — an RdSAP integer code (1-7: at-rafters, loft, flat-roof, …),
+    meaning the unit has an exposed roof to insulate. The gov-EPC API lodges
+    the string "ND" (Not Defined) when there is no exposed roof: the ceiling
+    is a party surface (another dwelling above), so there is nowhere to put
+    roof insulation. `None`/empty is likewise "no signal".
+    """
+    if isinstance(value, int):
+        return True
+    if isinstance(value, str):
+        return value.strip().upper() not in ("", "ND")
+    return False
+
+
+def _cert_lodges_exposed_roof(parts: list[SapBuildingPart]) -> bool:
+    """Whether the main building part lodges a genuine exposed (heat-loss)
+    roof — keyed on the structured `roof_insulation_location` field, NOT a
+    description string or `roof_construction`.
+
+    The gov-EPC API lodges the *building's* `roof_construction` on every
+    unit (incl. mid-floor ones whose ceiling is party), so it is not a
+    per-unit exposure signal. `roof_insulation_location`, by contrast, is
+    "ND" (Not Defined) exactly when the unit's ceiling is a party surface
+    (no roof to insulate) and a real RdSAP location code when the roof is
+    exposed. On the RdSAP-21.0.1 corpus this separates the two classes with
+    zero disagreement: all 190 party-ceiling flats lodge "ND"; every
+    mid/ground-floor flat with a determined location is genuinely top-storey.
+
+    Motivating cases (gov-API certs lodge `dwelling_type` as the raw
+    assessor label, which can contradict the fabric): property 715363
+    (uprn 6027561, location code 6 = flat roof) + sibling 715395 lodge
+    "Mid-floor flat" yet have their own exposed roof over a dwelling below
+    — top-floor flats mislabelled mid-floor; the correctly labelled
+    top-floor sibling 715871 (same block, same roof) computes the lodged
+    SAP 74. Dropping the roof under-read space-heating demand ~32% /
+    over-read SAP +7. Of the corpus mid/ground-floor flats this exposes,
+    4/4 move toward the lodged SAP, 0 away.
+
+    Reads the MAIN part (parts[0]): a flat's storey position is a
+    whole-dwelling property, and `DwellingExposure` is a single global flag
+    that `heat_transmission` applies to every part — so a multi-part flat
+    whose main ceiling is party (e.g. only an extension has an exposed roof)
+    correctly stays party rather than over-counting the main party ceiling.
+    """
+    if not parts:
+        return False
+    return _roof_insulation_location_is_determined(parts[0].roof_insulation_location)
+
+
+def _dwelling_exposure(
+    dwelling_type: Optional[str],
+    parts: Optional[list[SapBuildingPart]] = None,
+) -> DwellingExposure:
     """Map `EpcPropertyData.dwelling_type` to which envelope surfaces are
     party (not heat-loss). Mid-floor flats/maisonettes lose both floor +
     roof; top-floor lose floor only; ground-floor lose roof only. Houses
@@ -1542,7 +1706,23 @@ def _dwelling_exposure(dwelling_type: Optional[str]) -> DwellingExposure:
     RdSAP 10 §3 lists flat-prefix dwelling types ("Top-floor flat",
     "Mid-floor maisonette", etc.); matching is prefix-based and
     case-insensitive so site-notes capitalisation drift doesn't break it.
+
+    The lodged fabric overrides a contradictory label: when the main part
+    lodges a determined roof-insulation location (`_cert_lodges_exposed_roof`),
+    the roof is heat-loss even if the label suppressed it (a top-floor flat
+    lodged as "Mid-floor"). The override is additive — it only ever
+    *exposes* a roof the label dropped, never hides a lodged party ceiling —
+    so a true mid-floor flat (roof_insulation_location "ND") is unaffected.
     """
+    base = _dwelling_exposure_from_type(dwelling_type)
+    if not base.has_exposed_roof and parts and _cert_lodges_exposed_roof(parts):
+        return replace(base, has_exposed_roof=True)
+    return base
+
+
+def _dwelling_exposure_from_type(dwelling_type: Optional[str]) -> DwellingExposure:
+    """The `dwelling_type`-label-only exposure map (RdSAP 10 §3 prefixes).
+    `_dwelling_exposure` layers the lodged-fabric override on top."""
     if not dwelling_type:
         return DwellingExposure(has_exposed_floor=True, has_exposed_roof=True)
     dt = dwelling_type.lower()
@@ -1741,12 +1921,24 @@ def _rdsap_tariff(epc: EpcPropertyData) -> Tariff:
             and heat_pump_record(detail.main_heating_index_number) is not None
         )
 
+    # §12 Unknown-meter exception: "water heating ... intended to run off an
+    # off-peak tariff" via the text-box "dual electric immersion" system —
+    # whc 903 (HW from a separate electric immersion) lodged as dual
+    # (`_immersion_is_single` is False). This makes an Unknown-meter dwelling
+    # "dual" even when the main is a single-rate-capable system (e.g. room
+    # heaters), per RdSAP 10 §12 (PDF p.62).
+    water_dual_immersion = (
+        _int_or_none(epc.sap_heating.water_heating_code) == _WHC_ELECTRIC_IMMERSION
+        and _immersion_is_single(epc) is False
+    )
+
     return rdsap_tariff_for_cert(
         epc.sap_energy_source.meter_type,
         main_1_sap_code=main_1.sap_main_heating_code if main_1 else None,
         main_2_sap_code=main_2.sap_main_heating_code if main_2 else None,
         main_1_is_heat_pump_database=_hp_db(main_1),
         main_2_is_heat_pump_database=_hp_db(main_2),
+        water_is_off_peak_dual_immersion=water_dual_immersion,
     )
 
 
@@ -2401,6 +2593,25 @@ _ELECTRIC_ROOM_HEATER_SAP_CODES: Final[frozenset[int]] = frozenset(
     {691, 692, 693, 694, 699}
 )
 
+# SAP 10.2 Table 4a electric boilers (PDF p.170, codes 191-196) → their
+# Table 12a Grid 1 SH rows (PDF p.191). NOTE the boiler families do NOT all
+# share a row — read the spec exactly:
+#   191  Direct-acting electric boiler        → "Direct-acting electric boiler
+#        (a)" row: 7-hour 0.90, 10-hour 0.50  (NOT the "Other direct-acting
+#        electric heating" 1.00/0.50 room-heater row).
+#   192  Electric CPSU                        → "Electric CPSU" row: Appendix F
+#        (no flat Table 12a fraction — left as a documented gap, see below).
+#   193/194  Electric dry core storage boiler → "Electric dry core or water
+#   195/196  Electric water storage boiler      storage boiler" row: 7-hour
+#        0.00 (charged wholly off-peak — identical to the 100%-low-rate the
+#        None fallback already gave; mapped EXPLICITLY so the spec-correct
+#        0.00 is pinned and can't be "fixed" up to a wrong direct-acting 1.00).
+_DIRECT_ACTING_ELECTRIC_BOILER_CODES: Final[frozenset[int]] = frozenset({191})
+_ELECTRIC_STORAGE_BOILER_CODES: Final[frozenset[int]] = frozenset(
+    {193, 194, 195, 196}
+)
+_ELECTRIC_CPSU_CODES: Final[frozenset[int]] = frozenset({192})
+
 
 def _table_12a_system_for_main(
     main: Optional[MainHeatingDetail],
@@ -2420,8 +2631,9 @@ def _table_12a_system_for_main(
     - Storage heaters (cat 7): 408 → INTEGRATED_STORAGE_DIRECT (0.20),
       all others → OTHER_STORAGE_HEATERS (0.00) — wired
     - Underfloor heating (421-422) — TODO
-    - Direct-acting electric (191) / CPSU (192) / electric storage
-      boiler (193, 195) — TODO
+    - Direct-acting electric boiler (191) → 0.90/0.50; electric storage
+      boilers (193/194/195/196) → 0.00 — wired
+    - Electric CPSU (192) — Appendix F high-rate cascade still TODO
     """
     if main is None:
         return None
@@ -2482,6 +2694,19 @@ def _table_12a_system_for_main(
         if code == 408:
             return Table12aSystem.INTEGRATED_STORAGE_DIRECT
         return Table12aSystem.OTHER_STORAGE_HEATERS
+    # Electric boilers (Table 4a codes 191-196) — resolve the misleading TODO
+    # that lumped them as one "direct-acting" family. They split across THREE
+    # distinct Table 12a Grid 1 rows (see `_DIRECT_ACTING_ELECTRIC_BOILER_CODES`
+    # et al). 191 alone is direct-acting (0.90/0.50); 193-196 are storage
+    # boilers (0.00 = 100% low, the spec-correct value the None fallback gave —
+    # so this is a forward guard, not a corpus mover); 192 CPSU needs Appendix F
+    # and is left to fall through to None (the off-peak-low fallback) until the
+    # Appendix-F high-rate cascade is implemented.
+    if code is not None and _is_electric_main(main):
+        if code in _DIRECT_ACTING_ELECTRIC_BOILER_CODES:
+            return Table12aSystem.DIRECT_ACTING_ELECTRIC_BOILER
+        if code in _ELECTRIC_STORAGE_BOILER_CODES:
+            return Table12aSystem.ELECTRIC_DRY_CORE_OR_WATER_STORAGE
     return None
 
 
@@ -2511,6 +2736,33 @@ def _space_heating_fuel_cost_gbp_per_kwh(
     return blended * _PENCE_TO_GBP
 
 
+def _main_2_space_heating_fuel_cost_gbp_per_kwh(
+    epc: EpcPropertyData,
+    tariff: Tariff,
+    prices: PriceTable,
+) -> float:
+    """Main heating system 2's space-heating fuel rate (£/kWh) for the
+    legacy/off-peak scalar cost path. Keyed on main 2's OWN fuel via the same
+    `_space_heating_fuel_cost_gbp_per_kwh` logic (off-peak Table 12a split when
+    main 2 is electric, flat Table 32 rate otherwise) — so a wood-log or other
+    non-electric second main is not billed at main 1's electric rate. Returns
+    0.0 when no second main is lodged (multiplied by main 2's 0 kWh).
+
+    Scoped to a NON-electric second main (the unambiguous correction): a wood/
+    oil/coal second main billed at main 1's rate is plainly wrong. An ELECTRIC
+    second main keeps main 1's space-heating scalar — its off-peak Table 12a
+    high/low split is the deferred §10a off-peak slice, and applying the split
+    per-system here regresses the off-peak electric cohort (certs 13 Parkers
+    Hill / 34 Dunley Road)."""
+    details = epc.sap_heating.main_heating_details if epc.sap_heating else None
+    if not details or len(details) < 2:
+        return 0.0
+    main_2 = details[1]
+    if _is_electric_main(main_2):
+        return _space_heating_fuel_cost_gbp_per_kwh(details[0], tariff, prices)
+    return _space_heating_fuel_cost_gbp_per_kwh(main_2, tariff, prices)
+
+
 def _main_space_heating_high_rate_fraction(
     main: Optional[MainHeatingDetail],
     tariff: Tariff,
@@ -2579,9 +2831,13 @@ def _hot_water_fuel_cost_gbp_per_kwh(
     billed at the high rate, the remainder at the low rate. Without it
     the immersion HW billed 100% at the off-peak low rate, under-costing
     the dwelling and over-rating it (median +0.98 SAP across the off-peak
-    WHC-903 API cohort). Needs `cylinder_volume_l` + `occupancy_n` +
-    `immersion_single`; absent any of them (no cylinder / volume not
-    resolvable) it falls back to the 100%-low-rate scalar.
+    WHC-903 API cohort). Needs `cylinder_volume_l` + `occupancy_n`; when
+    `immersion_single` is unlodged (None) this branch is on an off-peak /
+    dual meter, so per RdSAP 10 §10.5 (PDF p.54) the immersion is assumed
+    DUAL rather than falling back to the 100%-low-rate scalar (Elmhurst
+    applies the dual blend, e.g. uprn_10022893721 high-rate fraction
+    0.1386). Only an unresolvable cylinder volume / occupancy now falls
+    back to the 100%-low-rate scalar.
 
     `inherit_main_for_community_heating`: per S0380.173, when WHC
     ∈ {901, 902, 914} AND main is a heat network, ignore the cert-
@@ -2610,13 +2866,22 @@ def _hot_water_fuel_cost_gbp_per_kwh(
             water_heating_code == _WHC_ELECTRIC_IMMERSION
             and cylinder_volume_l is not None
             and occupancy_n is not None
-            and immersion_single is not None
         ):
+            # RdSAP 10 §10.5 (PDF p.54): an immersion is assumed DUAL on a dual /
+            # off-peak meter. This branch is only reached on an off-peak tariff
+            # (tariff is not STANDARD ⇒ the meter is dual / Economy-7), so when the
+            # cert does not lodge `immersion_heating_type` default to dual rather
+            # than dropping to the 100%-low-rate fallback. The fallback under-costs
+            # the DHW and over-rates the dwelling, whereas Elmhurst applies the
+            # Table 13 dual blend (e.g. uprn_10022893721 high-rate fraction 0.1386).
+            effective_single = (
+                immersion_single if immersion_single is not None else False
+            )
             high_rate, low_rate = _tariff_high_low_rates_p_per_kwh(tariff)
             high_frac = electric_dhw_high_rate_fraction(
                 cylinder_volume_l=cylinder_volume_l,
                 occupancy_n=occupancy_n,
-                single_immersion=immersion_single,
+                single_immersion=effective_single,
                 tariff=tariff,
             )
             blended = high_frac * high_rate + (1.0 - high_frac) * low_rate
@@ -2627,10 +2892,81 @@ def _hot_water_fuel_cost_gbp_per_kwh(
     return _fuel_cost_gbp_per_kwh(main, prices)
 
 
+def _hot_water_high_rate_fraction(
+    water_heating_fuel: Optional[int],
+    main: Optional[MainHeatingDetail],
+    tariff: Tariff,
+    *,
+    water_heating_code: Optional[int] = None,
+    inherit_main_for_community_heating: bool = False,
+    cylinder_volume_l: Optional[float] = None,
+    occupancy_n: Optional[float] = None,
+    immersion_single: Optional[bool] = None,
+) -> float:
+    """ADR-0014 Bill Derivation — the hot-water High-Rate Fraction (the day/high-
+    rate share) on an Off-Peak Meter, mirroring `_hot_water_fuel_cost_gbp_per_kwh`
+    branch-for-branch so the bill's day/night HW split matches the rating's:
+
+    - community-heating HW inheriting a (non-electric) main, non-electric HW, or
+      STANDARD tariff → 1.0 (single rate, no split);
+    - HP-DHW (the WHC inherits a PCDB Table 362 heat-pump main) → Table 12a Grid 1
+      WH `ASHP_APP_N` fraction (0.70 at 7-/10-hour);
+    - electric immersion (WHC 903) with a known cylinder + occupancy → the Table
+      13 dual-immersion fraction (§10.5 assumes a DUAL immersion on a dual meter);
+    - any other electric off-peak HW (e.g. heated by a storage main) → 0.0 (the
+      timer charges it wholly at the night/low rate)."""
+    if inherit_main_for_community_heating:
+        return 1.0
+    if not _is_electric_water(water_heating_fuel) or tariff is Tariff.STANDARD:
+        return 1.0
+    if (
+        water_heating_code in _WATER_INHERIT_FROM_MAIN_CODES
+        and main is not None
+        and main.main_heating_index_number is not None
+        and heat_pump_record(main.main_heating_index_number) is not None
+    ):
+        return water_heating_high_rate_fraction(Table12aSystem.ASHP_APP_N, tariff)
+    if (
+        water_heating_code == _WHC_ELECTRIC_IMMERSION
+        and cylinder_volume_l is not None
+        and occupancy_n is not None
+    ):
+        effective_single = (
+            immersion_single if immersion_single is not None else False
+        )
+        return electric_dhw_high_rate_fraction(
+            cylinder_volume_l=cylinder_volume_l,
+            occupancy_n=occupancy_n,
+            single_immersion=effective_single,
+            tariff=tariff,
+        )
+    return 0.0
+
+
+def _secondary_high_rate_fraction(epc: EpcPropertyData, tariff: Tariff) -> float:
+    """ADR-0014 Bill Derivation — the secondary-heating High-Rate Fraction on an
+    Off-Peak Meter. Non-electric or standard-tariff secondary → 1.0. Electric
+    secondary heaters are portable/direct-acting (Table 4a room heaters), so they
+    take the Table 12a Grid 1 `OTHER_DIRECT_ACTING_ELECTRIC` row (1.0 at 7-hour,
+    0.50 at 10-hour) — run on demand, mostly at the day/high rate. Tariffs Table
+    12a omits (18-/24-hour) fall back to 1.0 (high)."""
+    if tariff is Tariff.STANDARD:
+        return 1.0
+    if not is_electric_fuel_code(_secondary_fuel_code(epc)):
+        return 1.0
+    try:
+        return space_heating_high_rate_fraction(
+            Table12aSystem.OTHER_DIRECT_ACTING_ELECTRIC, tariff
+        )
+    except NotImplementedError:
+        return 1.0
+
+
 def _secondary_fraction(
     main: Optional[MainHeatingDetail],
     secondary_heating_type: object,
     secondary_lodged: bool = False,
+    unheated_habitable_rooms: bool = False,
 ) -> float:
     """SAP 10.2 Table 11 lookup by main heating category, applied only
     when (a) the cert has a secondary system lodged OR (b) the main
@@ -2672,7 +3008,12 @@ def _secondary_fraction(
     code = main.sap_main_heating_code
     has_lodged_secondary = secondary_heating_type is not None or secondary_lodged
     force = code is not None and code in _FORCE_SECONDARY_FOR_MAIN_CODES
-    if not has_lodged_secondary and not force:
+    # SAP 10.2 Appendix A.2.2 — when the main system does not heat every
+    # habitable room, the unheated rooms are assumed to be served by a
+    # portable-electric secondary heater, so the Table 11 fraction is costed
+    # even with no lodged secondary (the secondary fuel/efficiency cascade
+    # already defaults to portable electric, code 693, when no code lodged).
+    if not has_lodged_secondary and not force and not unheated_habitable_rooms:
         return 0.0
     if (
         code is not None
@@ -2682,6 +3023,26 @@ def _secondary_fraction(
     return _secondary_heating_fraction_for_category(main.main_heating_category)
 
 
+def _has_unheated_habitable_rooms(epc: EpcPropertyData) -> bool:
+    """SAP 10.2 Appendix A.2.2 — the main heating system does not heat every
+    habitable room (heated rooms < habitable rooms), so the unheated rooms
+    take an assumed portable-electric secondary heater.
+
+    Prefers the lodged `any_unheated_rooms` flag (set on both the gov-API and
+    Elmhurst paths). Falls back to the heated/habitable room-count comparison
+    only when the heated count is a real positive value — a lodged
+    `heated_rooms_count == 0` is the "not provided" sentinel on the gov-API
+    path, not literally zero heated rooms, so it must not spuriously trigger
+    the assumed secondary."""
+    if epc.any_unheated_rooms is not None:
+        return epc.any_unheated_rooms
+    return (
+        epc.heated_rooms_count > 0
+        and epc.habitable_rooms_count > 0
+        and epc.heated_rooms_count < epc.habitable_rooms_count
+    )
+
+
 def _has_lodged_secondary_description(epc: EpcPropertyData) -> bool:
     """True when the cert lodges a secondary-heating DESCRIPTION (the
     gov-API path surfaces the secondary as `secondary_heating.description`,
@@ -2772,7 +3133,11 @@ def _secondary_fuel_cost_gbp_per_kwh(
         meter_type, fuel_is_electric=True
     ):
         return _secondary_off_peak_rate_gbp_per_kwh(meter_type)
-    return prices.unit_price_p_per_kwh(sec_fuel) * _PENCE_TO_GBP
+    # Normalise colliding gov-API enum codes (e.g. 9 dual fuel, whose
+    # value collides with Table-32 9 = LPG SC11F) before the price lookup,
+    # exactly as the main-fuel boundary does — otherwise the same-value
+    # Table lookup mis-prices the secondary at the colliding fuel's rate.
+    return prices.unit_price_p_per_kwh(canonical_fuel_code(sec_fuel)) * _PENCE_TO_GBP
 
 
 def _pv_array_generation_kwh_per_yr(
@@ -2791,6 +3156,42 @@ def _pv_array_generation_kwh_per_yr(
     return _PV_MODULE_EFFICIENCY_FACTOR * array.peak_power * s * z
 
 
+# gov-API `sap_energy_source.pv_connection` enum (RdSAP 10 §11.1 /
+# SAP 10.2 Appendix M — "PV is included in the dwelling's assessment only
+# if connected to the dwelling's electricity meter"):
+#   0 = no PV
+#   1 = PV present but NOT connected to the dwelling's own meter
+#   2 = PV connected to the dwelling's own meter
+# Validated on the RdSAP-21.0.1 corpus (57 PV certs): pv_connection=1 certs
+# reconcile to the lodged SAP only WITHOUT a credit (MAE 4.48→1.22, 0/5 need
+# it); pv_connection=2 certs need it (MAE 0.98 vs 10.29 without). Accredited
+# Elmhurst proof: identical dwelling = SAP 87 connected vs SAP 74 not.
+_PV_CONNECTION_CONNECTED_TO_DWELLING_METER: Final[int] = 2
+
+
+def _pv_connected_to_dwelling_meter(epc: EpcPropertyData) -> bool:
+    """Whether a lodged PV array may be credited to this dwelling's SAP, i.e.
+    whether it is connected to the dwelling's own electricity meter.
+
+    Keyed on the gov-API integer `pv_connection`: only value 2 ("connected")
+    earns a credit; value 1 ("present but not connected" — a communal /
+    separately-metered array) contributes nothing to the dwelling's energy
+    cost, CO2 or primary energy, per RdSAP 10 §11.1 / SAP 10.2 Appendix M.
+
+    A non-integer `pv_connection` (None, or the site-notes `str` form which
+    does not yet capture the connection flag) is NOT a determinate
+    "not connected" signal, so it preserves the existing credit-if-array
+    behaviour — no regression on the Elmhurst/Summary path or synthetic
+    CalculatorInputs. The Elmhurst extractor parses "Connected to the
+    dwelling's meter" today only as a parse stop-token; capturing its value
+    is a follow-up that would let this gate apply to that path too.
+    """
+    pv_connection = epc.sap_energy_source.pv_connection
+    if isinstance(pv_connection, int):
+        return pv_connection == _PV_CONNECTION_CONNECTED_TO_DWELLING_METER
+    return True
+
+
 def _pv_generation_kwh_per_yr(
     epc: EpcPropertyData,
     climate: "int | PostcodeClimate",
@@ -2805,7 +3206,13 @@ def _pv_generation_kwh_per_yr(
     roof area" PV figure (no detailed kWp): synthesize a single PV
     array with kWp = 0.12 × PV area, South orientation, 30° pitch,
     Modest overshading.
+
+    Returns 0 when the array is not connected to the dwelling's own meter
+    (`_pv_connected_to_dwelling_meter` — gov-API `pv_connection=1`), per
+    RdSAP 10 §11.1 / SAP 10.2 Appendix M.
     """
+    if not _pv_connected_to_dwelling_meter(epc):
+        return 0.0
     arrays = epc.sap_energy_source.photovoltaic_arrays
     if not arrays:
         arrays = _synthesize_pv_arrays_from_percent_roof_area(epc)
@@ -2852,7 +3259,13 @@ def _pv_monthly_generation_kwh(
 ) -> tuple[float, ...]:
     """SAP 10.2 Appendix M1 §2 (p.92) — monthly E_PV summed across all
     PV arrays. Annual sum matches `_pv_generation_kwh_per_yr` to
-    float precision."""
+    float precision.
+
+    Returns all-zero when the array is not connected to the dwelling's own
+    meter (`_pv_connected_to_dwelling_meter`), so the §10a cost split and the
+    CO2 / PE cascades all see no PV — mirroring the annual helper's gate."""
+    if not _pv_connected_to_dwelling_meter(epc):
+        return (0.0,) * 12
     arrays = epc.sap_energy_source.photovoltaic_arrays
     if not arrays:
         arrays = _synthesize_pv_arrays_from_percent_roof_area(epc)
@@ -3186,6 +3599,27 @@ def _other_fuel_cost_gbp_per_kwh(
     return blended * _PENCE_TO_GBP
 
 
+def _other_uses_high_rate_fraction(tariff: Tariff) -> float:
+    """ADR-0014 Bill Derivation — the ALL_OTHER_USES High-Rate Fraction (the
+    day/high-rate share) for lighting / appliances / cooking / pumps on an
+    Off-Peak Meter, mirroring `_other_fuel_cost_gbp_per_kwh`'s tariff handling so
+    the bill's split matches the rating's: STANDARD → 1.0 (single rate); 7-/10-
+    hour → SAP 10.2 Table 12a Grid 2; 18-hour → 1.0 (all other uses bill at the
+    high rate per SAP 10.2 Appendix F2); 24-hour → 1.0 (a heating-only tariff —
+    the Fuel Rates snapshot carries no separate non-heating rate, so other uses
+    bill at the off-peak day rate, a documented approximation for a rare tariff).
+
+    Pumps/fans reuse this fraction; the Table 12a Grid 2 MEV/MVHR `FANS_FOR_MECH_
+    VENT` distinction the SAP cost path applies is a small second-order effect on
+    a small load and is deferred for the bill."""
+    if tariff is Tariff.STANDARD:
+        return 1.0
+    try:
+        return other_use_high_rate_fraction(OtherUse.ALL_OTHER_USES, tariff)
+    except NotImplementedError:
+        return 1.0
+
+
 def _pumps_fans_fuel_cost_gbp_per_kwh(
     *,
     tariff: Tariff,
@@ -3771,6 +4205,8 @@ def _hot_water_co2_factor_kg_per_kwh(
     epc: EpcPropertyData,
     hw_monthly_kwh: tuple[float, ...],
     tariff: Tariff,
+    *,
+    immersion_high_rate_fraction: Optional[float] = None,
 ) -> float:
     """SAP 10.2 Table 12 / 12d (p.195) per-end-use CO2 factor for the
     cert's lodged water-heating fuel.
@@ -3834,6 +4270,25 @@ def _hot_water_co2_factor_kg_per_kwh(
         else _table_12_factor_fuel_code(fuel)
     )
     if tariff is not Tariff.STANDARD:
+        # whc-903 electric IMMERSION with a Table 13 high-rate split: the
+        # Elmhurst worksheet bills HW CO2 as two lines — "Water heating -
+        # high rate cost" at the Table 12d high-rate code + "low rate cost"
+        # at the low-rate code, weighted by the SAME Table 13 fraction the
+        # COST path uses (simulated case 50: high 0.1475 + low 0.1238,
+        # frac 0.1009). The flat-annual S0380.163 rule below was validated
+        # only on HW-from-main "low-rate cost" certs (100% low) where no
+        # high-rate split exists; it does NOT hold for the immersion split.
+        if immersion_high_rate_fraction is not None:
+            codes = _TARIFF_HIGH_LOW_FUEL_CODES_TABLE_12.get(tariff)
+            if codes is not None:
+                high_code, low_code = codes
+                f_high = _effective_monthly_co2_factor(hw_monthly_kwh, high_code)
+                f_low = _effective_monthly_co2_factor(hw_monthly_kwh, low_code)
+                if f_high is not None and f_low is not None:
+                    return (
+                        immersion_high_rate_fraction * f_high
+                        + (1.0 - immersion_high_rate_fraction) * f_low
+                    )
         return co2_factor_kg_per_kwh(table_12_code)
     monthly = _effective_monthly_co2_factor(hw_monthly_kwh, table_12_code)
     if monthly is not None:
@@ -3845,6 +4300,8 @@ def _hot_water_primary_factor(
     epc: EpcPropertyData,
     hw_monthly_kwh: tuple[float, ...],
     tariff: Tariff,
+    *,
+    immersion_high_rate_fraction: Optional[float] = None,
 ) -> float:
     """SAP 10.2 Table 12 / 12e (p.196) per-end-use PE factor for the
     cert's lodged water-heating fuel. PE-side mirror of
@@ -3898,6 +4355,21 @@ def _hot_water_primary_factor(
         else _table_12_factor_fuel_code(fuel)
     )
     if tariff is not Tariff.STANDARD:
+        # whc-903 immersion Table 13 split — PE mirror of the CO2 helper.
+        # Elmhurst splits HW PE into Table 12e high-/low-rate electricity
+        # weighted by the Table 13 fraction; the flat-annual S0380.163 rule
+        # only holds for HW-from-main "low-rate cost" certs (no split).
+        if immersion_high_rate_fraction is not None:
+            codes = _TARIFF_HIGH_LOW_FUEL_CODES_TABLE_12.get(tariff)
+            if codes is not None:
+                high_code, low_code = codes
+                f_high = _effective_monthly_pe_factor(hw_monthly_kwh, high_code)
+                f_low = _effective_monthly_pe_factor(hw_monthly_kwh, low_code)
+                if f_high is not None and f_low is not None:
+                    return (
+                        immersion_high_rate_fraction * f_high
+                        + (1.0 - immersion_high_rate_fraction) * f_low
+                    )
         return primary_energy_factor(table_12_code)
     monthly = _effective_monthly_pe_factor(hw_monthly_kwh, table_12_code)
     if monthly is not None:
@@ -3905,6 +4377,43 @@ def _hot_water_primary_factor(
     return primary_energy_factor(fuel)
 
 
+def _electric_immersion_hw_high_rate_fraction(
+    epc: EpcPropertyData,
+    tariff: Tariff,
+    *,
+    cylinder_volume_l: Optional[float],
+    occupancy_n: Optional[float],
+    immersion_single: Optional[bool],
+) -> Optional[float]:
+    """SAP 10.2 Table 13 HW high-rate fraction for a whc-903 electric
+    immersion on a 7-/10-hour off-peak tariff — the SAME split the cost
+    path (`_hot_water_fuel_cost_gbp_per_kwh`) applies. The CO2/PE factor
+    helpers blend the Table 12d/12e high- and low-rate electricity factors
+    by this fraction, mirroring the worksheet's split "Water heating -
+    high/low rate cost" lines (simulated case 50). Returns None when not a
+    dual-rate immersion, when the cylinder/occupancy data Table 13 needs is
+    missing, or on 18-/24-hour tariffs (no Table 12d/12e high/low split) —
+    callers then keep the flat-annual S0380.163 factor."""
+    if tariff is Tariff.STANDARD:
+        return None
+    if epc.sap_heating.water_heating_code != _WHC_ELECTRIC_IMMERSION:
+        return None
+    if (
+        cylinder_volume_l is None
+        or occupancy_n is None
+        or immersion_single is None
+    ):
+        return None
+    if _TARIFF_HIGH_LOW_FUEL_CODES_TABLE_12.get(tariff) is None:
+        return None
+    return electric_dhw_high_rate_fraction(
+        cylinder_volume_l=cylinder_volume_l,
+        occupancy_n=occupancy_n,
+        single_immersion=immersion_single,
+        tariff=tariff,
+    )
+
+
 def _secondary_fuel_code(epc: EpcPropertyData) -> int:
     """SAP 10.2 secondary fuel code, resolved through the API mapper's
     Appendix M Table 4a spec-fuel routing. When no `secondary_fuel_type`
@@ -3927,6 +4436,10 @@ def _secondary_fuel_code(epc: EpcPropertyData) -> int:
     code = _int_or_none(epc.sap_heating.secondary_fuel_type)
     if code is None:
         return _STANDARD_ELECTRICITY_FUEL_CODE
+    # Normalise colliding gov-API enum codes (e.g. 9 dual fuel, whose value
+    # collides with the LPG Table code) so the CO2/PE factor lookups resolve
+    # to the lodged fuel — mirrors the main-fuel boundary + the cost side.
+    code = canonical_fuel_code(code) or code
     if code in CO2_KG_PER_KWH:
         return code
     return _table_12_factor_fuel_code(code)
@@ -4163,7 +4676,7 @@ def heat_transmission_section_from_cert(epc: EpcPropertyData) -> HeatTransmissio
     PDF.
     """
     window_total_area, window_avg_u = _window_total_area_and_avg_u(epc.sap_windows)
-    exposure = _dwelling_exposure(epc.dwelling_type)
+    exposure = _dwelling_exposure(epc.dwelling_type, epc.sap_building_parts)
     return heat_transmission_from_cert(
         epc,
         window_total_area_m2=window_total_area,
@@ -4727,6 +5240,7 @@ def energy_requirements_section_from_cert(
         main,
         epc.sap_heating.secondary_heating_type if epc.sap_heating else None,
         secondary_lodged=_has_lodged_secondary_description(epc),
+        unheated_habitable_rooms=_has_unheated_habitable_rooms(epc),
     )
     # When no secondary system is lodged the worksheet displays (208) = 0;
     # the per-system fuel formula already collapses to 0 via fraction_201 = 0
@@ -4952,16 +5466,23 @@ def ventilation_from_cert(
     storeys = max(1, dim.storey_count)
     vc = _ventilation_counts(epc.sap_ventilation)
     sv = epc.sap_ventilation
-    # RdSAP 10 §4.1 Table 5 (PDF p.28) — extract-fans default when the
-    # lodged count is below the age-band minimum. The Elmhurst Summary
-    # renders "0" as the form for unknown; the worksheet applies the
-    # default via `max(lodged, table_5_default)`.
+    # RdSAP 10 §4.1 Table 5 (PDF p.28) — extract fans: "Number of extract
+    # fans if known; if number is unknown: [age-band default]." The default
+    # is an UNKNOWN-fallback, NOT a floor: a genuinely-lodged count is used
+    # as-is even when it is below the age-band default (e.g. a band H-M
+    # dwelling lodging 2 fans is NOT bumped to the 3-fan default). The
+    # Elmhurst Summary / RdSAP convention renders "0" as the form for
+    # unknown, so a lodged 0 falls back to the default; any positive count
+    # is taken literally. (Was `max(lodged, default)`, which over-applied
+    # the default as a minimum and over-counted ventilation.)
     age_band = _dwelling_age_band(epc) or ""
     is_park_home = (epc.property_type or "").strip().lower() == "park home"
     table_5_fan_default = _rdsap_extract_fans_default(
         age_band, epc.habitable_rooms_count, is_park_home=is_park_home,
     )
-    intermittent_fans = max(vc.intermittent_fans, table_5_fan_default)
+    intermittent_fans = (
+        vc.intermittent_fans if vc.intermittent_fans > 0 else table_5_fan_default
+    )
     wind_kwargs: dict[str, tuple[float, ...]] = (
         {"monthly_wind_speed_m_s": postcode_climate.monthly_wind_speed_m_per_s}
         if postcode_climate is not None else {}
@@ -5009,6 +5530,34 @@ def ventilation_from_cert(
             # can override via a future plumbing slice; the spec default
             # is what every MEV / MV / MVHR cohort cert lodges today.
             mv_system_ach = 0.5
+            # For a whole-house mechanical EXTRACT (MEV / dMEV) OR balanced-
+            # with-heat-recovery (MVHR) system the lodged intermittent extract-
+            # fan count (7a) is taken AS-IS — the Table 5 age-band default must
+            # NOT be substituted for a lodged 0. On such a dwelling the fan
+            # count is explicit (the mechanical system IS the ventilation), so
+            # 0 means 0, not "unknown". Worksheet-proven on three 000565 builds:
+            # "case 48" (dMEV) lodges (7a)=0 → SAP 57 exact; "case 49" (MVHR,
+            # Vent Axia 500140) lodges (7a)=0 → the worksheet (8) openings line
+            # is 0.0000 (our default had added 20 m³/h = 0.0723 ach, inflating
+            # (22b)/(25)/(38) and the demand). The original 000565 fixture
+            # lodges (7a)=2 → unchanged. MV-without-HR (mechanical_ventilation
+            # =1) is EXCLUDED: forcing its lodged 0 regressed 47 Howsman / 18
+            # Jutland and is not worksheet-validated.
+            if mv_kind in (
+                MechanicalVentilationKind.EXTRACT_OR_PIV_OUTSIDE,
+                MechanicalVentilationKind.MVHR,
+            ):
+                intermittent_fans = vc.intermittent_fans
+    # SAP 10.2 §2.6.6 equation (2): the (24a) MVHR effective-air-change
+    # credit needs the in-use heat-recovery efficiency (23c) = raw PCDB
+    # efficiency × Table 329 in-use factor (or the Table 4g default when
+    # no PCDB record). None for non-MVHR kinds → ventilation_from_inputs
+    # leaves the heat-recovery term at zero.
+    mvhr_efficiency_pct: Optional[float] = None
+    if mv_kind is MechanicalVentilationKind.MVHR:
+        mvhr_values = _mvhr_system_values(epc)
+        if mvhr_values is not None:
+            mvhr_efficiency_pct = mvhr_values.in_use_efficiency_pct
     return ventilation_from_inputs(
         volume_m3=vol,
         storey_count=storeys,
@@ -5031,6 +5580,7 @@ def ventilation_from_cert(
         air_permeability_ap4=ap4,
         mv_kind=mv_kind,
         mv_system_ach=mv_system_ach,
+        mvhr_efficiency_pct=mvhr_efficiency_pct,
         **wind_kwargs,
     )
 
@@ -5169,10 +5719,11 @@ def pcdb_combi_loss_override(
             )
         if kh == 1:
             if timer == 1:
-                # SAP 10.2 Table 3a row 3: 600 × n_m / 365. Cascade's
-                # `water_heating_from_cert` default — return None so the
-                # default fires.
-                return None
+                # SAP 10.2 Table 3a row 3: 600 × n_m / 365 (keep-hot, time
+                # clock). Returned EXPLICITLY — the cascade default is now
+                # the "without keep-hot" row, so the keep-hot value must be
+                # delivered here rather than leaned on the default.
+                return combi_loss_monthly_kwh_table_3a_keep_hot_time_clock()
             # SAP 10.2 Table 3a row 4: 900 × n_m / 365 (no time-clock).
             return combi_loss_monthly_kwh_table_3a_row_4_keep_hot_no_time_clock()
         # kh ∈ {2, 3} — electric or mixed keep-hot. Table 3a Note 2 routes
@@ -6324,11 +6875,14 @@ def _water_heating_worksheet_and_gains(
         main
     ):
         # SAP 10.2 §4 line 7702 fallback: non-combi main heating → (61)m
-        # = 0. Without this gate the cascade falls through to `combi_
-        # loss_monthly_kwh_table_3a_keep_hot_time_clock()` (600 kWh/yr)
-        # on every cert lacking a PCDB Table 105 boiler record —
-        # including all heat pump certs.
+        # = 0. Without this gate the cascade falls through to the Table 3a
+        # "without keep-hot" default on every cert lacking a PCDB Table
+        # 105 boiler record — including all heat pump certs.
         combi_loss_override = zero_monthly
+    # A non-PCDB combi (override still None here) has no PCDB-declared
+    # keep-hot facility → `water_heating_from_cert` applies the Table 3a
+    # "without keep-hot" row (600 × fu × n/365). Keep-hot rides only on the
+    # PCDB boiler record, resolved above by `pcdb_combi_loss_override`.
     # SAP 10.2 §4 lines 7670-7693 + Tables 2/2a/2b — cylinder storage loss
     # (56)m. Spec p.135 instructs entering 0 in (47) for instantaneous /
     # combi systems, so the override is only built when the cert explicitly
@@ -6885,6 +7439,26 @@ def _fuel_cost(
     main_1_high_rate_gbp_per_kwh = (
         table_32_unit_price_p_per_kwh(main_fuel_code) * _PENCE_TO_GBP
     )
+    # Main heating system 2 is costed at ITS OWN fuel price (SAP 10.2 §10a
+    # worksheet line (213) bills main system 2's fuel separately from main 1's
+    # (211)) — Table 32 unit price keyed on main 2's fuel code. Pre-fix this
+    # column reused `main_1_high_rate_gbp_per_kwh`, charging a dual-fuel second
+    # main (e.g. wood logs SAP code 633, fuel 6 @ 4.23 p/kWh) at the main-1
+    # electric rate (13.19 p/kWh), grossly over-costing electric+wood
+    # room-heater dwellings (cert 10032957680 "Copse Cottage" +£850/yr ->
+    # SAP -23). Falls back to main 1's price only when no second main is lodged.
+    main_2_detail = (
+        epc.sap_heating.main_heating_details[1]
+        if epc.sap_heating
+        and len(epc.sap_heating.main_heating_details or []) >= 2
+        else None
+    )
+    main_2_fuel_code = _main_fuel_code(main_2_detail)
+    main_2_high_rate_gbp_per_kwh = (
+        table_32_unit_price_p_per_kwh(main_2_fuel_code) * _PENCE_TO_GBP
+        if main_2_fuel_code is not None
+        else main_1_high_rate_gbp_per_kwh
+    )
     water_high_rate_gbp_per_kwh = (
         table_32_unit_price_p_per_kwh(water_heating_fuel_code)
         * _PENCE_TO_GBP
@@ -6934,7 +7508,7 @@ def _fuel_cost(
         main_1_low_rate_gbp_per_kwh=0.0,
         main_1_high_rate_fraction=1.0,
         main_2_kwh_per_yr=main_2_kwh,
-        main_2_high_rate_gbp_per_kwh=main_1_high_rate_gbp_per_kwh,
+        main_2_high_rate_gbp_per_kwh=main_2_high_rate_gbp_per_kwh,
         main_2_low_rate_gbp_per_kwh=0.0,
         main_2_high_rate_fraction=1.0 if main_2_kwh > 0.0 else 0.0,
         secondary_kwh_per_yr=secondary_kwh,
@@ -7044,10 +7618,21 @@ def cert_to_inputs(
             pumps_fans_kwh += _table_4f_circulation_pump_kwh(_pumps_main_2)
     pumps_fans_kwh += _table_4f_additive_components(epc)
     # Track the MEV/MVHR-fan portion separately so the cost cascade can
-    # apply Table 12a Grid 2 `FANS_FOR_MECH_VENT` (0.58 high-frac on
-    # 10-hour) instead of `ALL_OTHER_USES` (0.80) — see
-    # `_pumps_fans_fuel_cost_gbp_per_kwh`. Zero when no MEV is lodged.
-    mev_kwh_for_cost_split = _mev_decentralised_kwh_per_yr_from_cert(epc)
+    # apply Table 12a Grid 2 `FANS_FOR_MECH_VENT` (0.71 high-frac on
+    # 7-hour, 0.58 on 10-hour) instead of `ALL_OTHER_USES` (0.90 / 0.80)
+    # — see `_pumps_fans_fuel_cost_gbp_per_kwh`. Must mirror the
+    # mechanical-ventilation fan terms summed into the total pumps/fans
+    # at `_table_4f_additive_components` (230b decentralised MEV/extract)
+    # + the (230a) MVHR fan: both are "Fans for mechanical ventilation
+    # systems" in Grid 2, while flue fans / circulation pumps / solar HW
+    # pump are "All other uses". The MVHR term was omitted when MVHR
+    # landed, so an MVHR dwelling on off-peak billed its fan electricity
+    # at 0.90 instead of 0.71 (case 50: +£5.87/yr, -0.23 SAP). Zero when
+    # no mechanical-ventilation fan is lodged.
+    mev_kwh_for_cost_split = (
+        _mev_decentralised_kwh_per_yr_from_cert(epc)
+        + _mvhr_fan_kwh_per_yr_from_cert(epc)
+    )
     primary_age = _dwelling_age_band(epc)
 
     # SAP 10.2 Appendix D2.1: if the cert lodges a PCDB index number that
@@ -7218,7 +7803,21 @@ def cert_to_inputs(
         epc=epc,
     )
     if apm_efficiencies is not None:
-        eff, water_eff = apm_efficiencies
+        # η_space (N3.6) always replaces the Table 4a default — the heat
+        # pump is the space main. η_water (N3.7a) applies ONLY when the DHW
+        # is actually heated by that main (WHC "from main": 901/902/914). A
+        # separate electric immersion (WHC 903) or other independent DHW
+        # source keeps its own water efficiency (immersion = 100%), not the
+        # HP's water SCOP — otherwise a HP-space + immersion-DHW dwelling
+        # under-counts its hot-water fuel (case 45: water 2130 -> 1894 kWh,
+        # +1.5 SAP, because 187.5% × 0.6 in-use = 112.5% was applied where
+        # the worksheet (216) uses 100%).
+        eff, apm_water_eff = apm_efficiencies
+        if (
+            epc.sap_heating.water_heating_code
+            in _WATER_INHERIT_FROM_MAIN_CODES
+        ):
+            water_eff = apm_water_eff
     if (
         _is_heat_network_main(main)
         and epc.sap_heating.water_heating_code in _WATER_INHERIT_FROM_MAIN_CODES
@@ -7250,6 +7849,7 @@ def cert_to_inputs(
         main,
         epc.sap_heating.secondary_heating_type,
         secondary_lodged=_has_lodged_secondary_description(epc),
+        unheated_habitable_rooms=_has_unheated_habitable_rooms(epc),
     )
     # SAP10.2 §4 — compute the worksheet (45..65) values now (they only
     # depend on the cert dwelling shape, not on water_efficiency). The
@@ -7727,11 +8327,22 @@ def cert_to_inputs(
             occupancy_n=wh_result.occupancy if wh_result is not None else None,
             immersion_single=_immersion_is_single(epc),
         )
+        # whc-903 immersion Table 13 high-rate fraction — same split the
+        # cost path applies above; threaded into the CO2/PE factor helpers
+        # so the worksheet's high/low HW lines reconcile (simulated case 50).
+        _hw_immersion_high_frac = _electric_immersion_hw_high_rate_fraction(
+            epc, _rdsap_tariff(epc),
+            cylinder_volume_l=_hot_water_cylinder_volume_l(epc),
+            occupancy_n=wh_result.occupancy if wh_result is not None else None,
+            immersion_single=_immersion_is_single(epc),
+        )
         hw_co2_factor = _hot_water_co2_factor_kg_per_kwh(
             epc, hw_monthly_kwh_for_factors, _rdsap_tariff(epc),
+            immersion_high_rate_fraction=_hw_immersion_high_frac,
         )
         hw_pe_factor = _hot_water_primary_factor(
             epc, hw_monthly_kwh_for_factors, _rdsap_tariff(epc),
+            immersion_high_rate_fraction=_hw_immersion_high_frac,
         )
         _hw_extra_standing = 0.0
     _heat_network_standing = _heat_network_standing_charge_gbp(epc, main)
@@ -7755,6 +8366,39 @@ def cert_to_inputs(
         eff,
     )
 
+    # ADR-0014 Bill Derivation — Off-Peak Meter day/night billing metadata.
+    # The off-peak `_fuel_cost` path returns the zero `FuelCostResult` (deferring
+    # to the legacy scalar rates), so the bill's per-end-use High-Rate Fractions
+    # are sourced here from the SAME Table 12a helpers the scalar cost path uses,
+    # keeping the bill's day/night split identical to the rating's.
+    _billing_tariff = _rdsap_tariff(epc)
+    _is_off_peak_meter = _billing_tariff is not Tariff.STANDARD
+    _main_high_rate_fraction = _main_space_heating_high_rate_fraction(
+        main, _billing_tariff
+    )
+    _main_2_detail = (
+        epc.sap_heating.main_heating_details[1]
+        if epc.sap_heating and len(epc.sap_heating.main_heating_details) > 1
+        else None
+    )
+    _main_2_high_rate_fraction = _main_space_heating_high_rate_fraction(
+        _main_2_detail, _billing_tariff
+    )
+    _secondary_high_rate_frac = _secondary_high_rate_fraction(epc, _billing_tariff)
+    _hw_high_rate_fraction = _hot_water_high_rate_fraction(
+        _water_heating_fuel_code(epc),
+        _water_heating_main(epc),
+        _billing_tariff,
+        water_heating_code=(
+            epc.sap_heating.water_heating_code if epc.sap_heating else None
+        ),
+        inherit_main_for_community_heating=_is_community_heating_hw_from_main(epc),
+        cylinder_volume_l=_hot_water_cylinder_volume_l(epc),
+        occupancy_n=wh_result.occupancy if wh_result is not None else None,
+        immersion_single=_immersion_is_single(epc),
+    )
+    _other_uses_fraction = _other_uses_high_rate_fraction(_billing_tariff)
+
     return CalculatorInputs(
         dimensions=dim,
         heat_transmission=ht,
@@ -7819,9 +8463,21 @@ def cert_to_inputs(
         ),
         secondary_heating_fuel_code=_secondary_fuel_code(epc),
         hot_water_fuel_code=_water_heating_fuel_code(epc),
+        is_off_peak_meter=_is_off_peak_meter,
+        main_heating_high_rate_fraction=_main_high_rate_fraction,
+        main_2_heating_high_rate_fraction=_main_2_high_rate_fraction,
+        secondary_heating_high_rate_fraction=_secondary_high_rate_frac,
+        hot_water_high_rate_fraction=_hw_high_rate_fraction,
+        pumps_fans_high_rate_fraction=_other_uses_fraction,
+        other_electricity_high_rate_fraction=_other_uses_fraction,
         space_heating_fuel_cost_gbp_per_kwh=_space_heating_fuel_cost_gbp_per_kwh(
             main, _rdsap_tariff(epc), prices
         ),
+        main_2_heating_fuel_cost_gbp_per_kwh=(
+            _main_2_space_heating_fuel_cost_gbp_per_kwh(
+                epc, _rdsap_tariff(epc), prices
+            )
+        ),
         hot_water_fuel_cost_gbp_per_kwh=hw_cost_rate,
         other_fuel_cost_gbp_per_kwh=_other_fuel_cost_gbp_per_kwh(
             _rdsap_tariff(epc), prices
diff --git a/domain/sap10_calculator/tables/pcdb/__init__.py b/domain/sap10_calculator/tables/pcdb/__init__.py
index 017d98e11..6fd2991e8 100644
--- a/domain/sap10_calculator/tables/pcdb/__init__.py
+++ b/domain/sap10_calculator/tables/pcdb/__init__.py
@@ -32,7 +32,10 @@ from domain.sap10_calculator.tables.pcdb.parser import (
     GasOilBoilerRecord,
     HeatPumpRecord,
     MevFanConfig,
+    MvhrDataPoint,
+    MvhrRecord,
     MvInUseFactorsRecord,
+    parse_centralised_mv_row,
     parse_decentralised_mev_row,
     parse_heat_pump_row_raw,
     parse_mv_in_use_factors_row,
@@ -43,11 +46,14 @@ __all__ = [
     "GasOilBoilerRecord",
     "HeatPumpRecord",
     "MevFanConfig",
+    "MvhrDataPoint",
+    "MvhrRecord",
     "MvInUseFactorsRecord",
     "decentralised_mev_record",
     "gas_oil_boiler_record",
     "heat_pump_record",
     "mv_in_use_factors_record",
+    "mvhr_record",
 ]
 
 
@@ -58,6 +64,9 @@ _TABLE_105_JSONL: Final[Path] = (
 _TABLE_322_JSONL: Final[Path] = (
     _PCDB_DATA_DIR / "pcdb_table_322_decentralised_mev.jsonl"
 )
+_TABLE_323_JSONL: Final[Path] = (
+    _PCDB_DATA_DIR / "pcdb_table_323_centralised_mev_mvhr.jsonl"
+)
 _TABLE_329_JSONL: Final[Path] = (
     _PCDB_DATA_DIR / "pcdb_table_329_mv_in_use_factors.jsonl"
 )
@@ -181,6 +190,37 @@ def decentralised_mev_record(pcdb_id: int) -> Optional[DecentralisedMevRecord]:
     return _TABLE_322_BY_ID.get(pcdb_id)
 
 
+def _load_table_323() -> dict[int, MvhrRecord]:
+    """Read the Table 323 NDJSON at import time and build a by-pcdb-id
+    dict of typed `MvhrRecord`s (centralised MEV + MVHR). Returns an
+    empty dict when the jsonl is missing (ETL bootstrap concession;
+    production callers always observe the committed file)."""
+    records_by_id: dict[int, MvhrRecord] = {}
+    if not _TABLE_323_JSONL.exists():
+        return records_by_id
+    with _TABLE_323_JSONL.open(encoding="utf-8") as f:
+        for line in f:
+            line = line.strip()
+            if not line:
+                continue
+            data = json.loads(line)
+            raw_fields = tuple(data["raw"])
+            record = parse_centralised_mv_row(",".join(raw_fields))
+            records_by_id[record.pcdb_id] = record
+    return records_by_id
+
+
+_TABLE_323_BY_ID: Final[dict[int, MvhrRecord]] = _load_table_323()
+
+
+def mvhr_record(pcdb_id: int) -> Optional[MvhrRecord]:
+    """Table 323 lookup by `MV PCDF Reference Number` (cert lodgement
+    field) for centralised MEV / MVHR systems. Returns None when the
+    index is not in Table 323 — caller falls back to the SAP 10.2 Table
+    4g default data (MVHR raw SFP 2.0, efficiency 66%)."""
+    return _TABLE_323_BY_ID.get(pcdb_id)
+
+
 def _load_table_329() -> dict[int, MvInUseFactorsRecord]:
     """Read the Table 329 NDJSON at import time and build a by-system-
     type dict of typed `MvInUseFactorsRecord`s. Returns empty when the
diff --git a/domain/sap10_calculator/tables/pcdb/data/pcdb_table_323_centralised_mev_mvhr.jsonl b/domain/sap10_calculator/tables/pcdb/data/pcdb_table_323_centralised_mev_mvhr.jsonl
new file mode 100644
index 000000000..2b7964479
--- /dev/null
+++ b/domain/sap10_calculator/tables/pcdb/data/pcdb_table_323_centralised_mev_mvhr.jsonl
@@ -0,0 +1,822 @@
+{"pcdb_id": 500002, "raw": ["500002", "020002", "0", "2013/Oct/02 17:18", "Vent Axia Ltd", "Vent Axia", "MVDC - MS", "", "", "2012", "", "1", "0", "2", "1", "", "3", "1", "21.0", "0.24", "", "2", "29.0", "0.18", "", "3", "37.0", "0.21"]}
+{"pcdb_id": 500003, "raw": ["500003", "020003", "0", "2007/Oct/18 08:54", "The Nuaire Group", "Nuaire", "ES MEV", "", "2006", "2007", "", "1", "0", "2", "2", "", "3", "1", "21.0", "0.34", "", "2", "29.0", "0.31", "", "3", "37.0", "0.33"]}
+{"pcdb_id": 500004, "raw": ["500004", "020004", "0", "2014/Jun/18 12:30", "Greenwood Air Management Ltd", "Greenwood", "CMFe", "", "", "current", "", "1", "0", "2", "1", "", "3", "1", "21.0", "0.50", "", "2", "29.0", "0.34", "", "3", "37.0", "0.38"]}
+{"pcdb_id": 500005, "raw": ["500005", "020004", "0", "2016/May/18 18:36", "Greenwood Air Management Ltd", "Greenwood", "MVHR 90R", "", "2007", "2013", "", "3", "0", "2", "1", "3", "3", "1", "15.0", "0.78", "81", "2", "21.0", "0.84", "81", "3", "27.0", "0.97", "80"]}
+{"pcdb_id": 500007, "raw": ["500007", "020002", "0", "2015/Nov/11 10:34", "Vent Axia Ltd", "Vent Axia", "HRE 350", "", "", "2010", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.96", "90", "2", "21.0", "0.96", "90", "3", "27.0", "0.99", "86"]}
+{"pcdb_id": 500011, "raw": ["500011", "020083", "0", "2015/Nov/11 10:34", "Applied Energy Products Ltd", "Xpelair", "Xcell 270 DC", "", "", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "1.06", "91", "2", "21.0", "1.34", "91", "3", "27.0", "1.30", "90", "4", "33.0", "1.84", "89"]}
+{"pcdb_id": 500012, "raw": ["500012", "020004", "0", "2016/May/18 18:34", "Greenwood Air Management Ltd", "Greenwood", "Fusion HRV1", "", "2007", "2013", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "0.72", "63", "2", "21.0", "0.78", "63"]}
+{"pcdb_id": 500013, "raw": ["500013", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "NU-MVHR 70", "", "2007", "2007", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.79", "69", "2", "21.0", "0.89", "69", "3", "27.0", "1.07", "65"]}
+{"pcdb_id": 500021, "raw": ["500021", "020008", "0", "2016/Jul/14 15:48", "Passivent Ltd", "Passivent", "A151 DC", "", "2007", "2013", "", "1", "0", "2", "1", "", "3", "1", "21.0", "0.36", "", "2", "29.0", "0.30", "", "3", "37.0", "0.29"]}
+{"pcdb_id": 500022, "raw": ["500022", "020007", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Titon", "WHR 350", "", "2007", "2007", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "1.10", "89", "2", "21.0", "1.16", "89", "3", "27.0", "1.30", "87", "4", "33.0", "1.48", "86", "5", "39.0", "1.68", "85", "6", "45.0", "1.89", "83"]}
+{"pcdb_id": 500023, "raw": ["500023", "020002", "0", "2015/Nov/11 10:34", "Vent Axia Ltd", "Vent Axia", "LoWatt HR204", "", "", "2011", "", "3", "0", "2", "2", "1", "1", "1", "15.0", "1.05", "57"]}
+{"pcdb_id": 500024, "raw": ["500024", "020009", "0", "2013/Oct/24 09:06", "Vortice Ltd", "Vortice", "CVE ECO 2", "", "2007", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.22", "", "2", "29.0", "0.20", "", "3", "37.0", "0.21", "", "4", "45.0", "0.24"]}
+{"pcdb_id": 500025, "raw": ["500025", "020009", "0", "2015/Nov/11 10:34", "Vortice Ltd", "Vortice", "HRU ECO 3 RF", "", "", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.56", "92", "2", "21.0", "0.62", "93", "3", "27.0", "0.72", "88", "4", "33.0", "0.86", "87", "5", "39.0", "1.00", "85", "6", "45.0", "1.16", "84"]}
+{"pcdb_id": 500026, "raw": ["500026", "020078", "0", "2015/Nov/11 10:34", "Villavent Ltd", "Villavent", "VM2", "", "", "current", "", "3", "0", "2", "1", "1", "4", "2", "21.0", "0.91", "84", "3", "27.0", "0.91", "84", "4", "33.0", "1.02", "82", "5", "39.0", "1.18", "83"]}
+{"pcdb_id": 500027, "raw": ["500027", "020003", "0", "2007/Oct/18 08:53", "The Nuaire Group", "Nuaire", "MEVDC-ES", "", "2007", "current", "", "1", "0", "2", "2", "", "3", "1", "21.0", "0.34", "", "2", "29.0", "0.31", "", "3", "37.0", "0.33"]}
+{"pcdb_id": 500028, "raw": ["500028", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX70", "", "2007", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.79", "69", "2", "21.0", "0.89", "69", "3", "27.0", "1.07", "65"]}
+{"pcdb_id": 500029, "raw": ["500029", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX90L", "", "2007", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "1.12", "89", "2", "21.0", "1.13", "89", "3", "27.0", "1.26", "86", "4", "33.0", "1.44", "85", "5", "39.0", "1.65", "85"]}
+{"pcdb_id": 500030, "raw": ["500030", "020007", "0", "2016/Feb/22 15:19", "Titon Hardware Ltd", "Titon", "Q Plus WCME 100", "", "2007", "2009", "", "1", "0", "2", "1", "", "3", "1", "21.0", "0.20", "", "2", "29.0", "0.18", "", "3", "37.0", "0.18"]}
+{"pcdb_id": 500031, "raw": ["500031", "020011", "3", "2022/Jan/27 07:28", "Vectaire Ltd", "Vectaire", "MBOX 125/2DC", "", "", "obsolete", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.38", "", "2", "29.0", "0.41", "", "3", "37.0", "0.49", "", "4", "45.0", "0.65"]}
+{"pcdb_id": 500032, "raw": ["500032", "020083", "0", "2016/Jun/20 12:41", "Applied Energy Products Ltd", "Xpelair", "Xplus 340", "", "", "current", "", "1", "0", "2", "1", "", "3", "1", "21.0", "0.38", "", "2", "29.0", "0.30", "", "3", "37.0", "0.24"]}
+{"pcdb_id": 500033, "raw": ["500033", "020083", "0", "2016/Jun/20 12:41", "Applied Energy Products Ltd", "Xpelair", "Xplus 250DC 8CV", "", "", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.52", "", "2", "29.0", "0.27", "", "3", "37.0", "0.34", "", "4", "45.0", "0.50"]}
+{"pcdb_id": 500034, "raw": ["500034", "020007", "0", "2016/Feb/22 14:32", "Titon Hardware Ltd", "Titon", "Q Plus WHR 350", "", "", "2007", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "1.10", "89", "2", "21.0", "1.16", "89", "3", "27.0", "1.30", "87", "4", "33.0", "1.48", "86", "5", "39.0", "1.68", "85", "6", "45.0", "1.89", "83"]}
+{"pcdb_id": 500035, "raw": ["500035", "020007", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Titon", "Q Plus WHR 180", "", "", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "1.00", "84", "2", "21.0", "1.06", "84"]}
+{"pcdb_id": 500036, "raw": ["500036", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 140 L", "", "2007", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "1.03", "81", "2", "21.0", "1.48", "81"]}
+{"pcdb_id": 500037, "raw": ["500037", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 350", "", "2007", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.70", "85", "2", "21.0", "0.71", "84", "3", "27.0", "0.81", "83", "4", "33.0", "0.94", "82", "5", "39.0", "1.08", "82"]}
+{"pcdb_id": 500038, "raw": ["500038", "020024", "0", "2015/Nov/11 10:34", "Itho BV", "Xpelair", "Xcell 301DC", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.55", "91", "2", "21.0", "0.61", "91", "3", "27.0", "0.72", "87", "4", "33.0", "0.84", "86", "5", "39.0", "0.97", "84", "6", "45.0", "1.11", "83"]}
+{"pcdb_id": 500039, "raw": ["500039", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX90S", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "1.06", "83", "2", "21.0", "1.13", "85", "3", "27.0", "1.37", "82", "4", "33.0", "1.69", "79"]}
+{"pcdb_id": 500040, "raw": ["500040", "020013", "0", "2013/Oct/24 09:06", "Johnson & Starley Ltd", "Johnson & Starley", "CE300 Premier", "", "2007", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.26", "", "2", "29.0", "0.24", "", "3", "37.0", "0.29", "", "4", "45.0", "0.36", "", "5", "53.0", "0.46"]}
+{"pcdb_id": 500041, "raw": ["500041", "020013", "0", "2008/May/03 10:29", "Johnson & Starley Ltd", "Johnson & Starley", "CE180 Premier", "", "2007", "current", "", "1", "0", "2", "2", "", "4", "1", "21.0", "0.40", "", "2", "29.0", "0.45", "", "3", "37.0", "0.75", "", "4", "45.0", "1.03"]}
+{"pcdb_id": 500042, "raw": ["500042", "020014", "0", "2013/Oct/24 09:06", "Itho Ventilation Ltd", "Itho", "CVE ECO 2 HP", "", "2009", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.18", "", "2", "29.0", "0.17", "", "3", "37.0", "0.18", "", "4", "45.0", "0.20", "", "5", "53.0", "0.22", "", "6", "61.0", "0.27"]}
+{"pcdb_id": 500043, "raw": ["500043", "020014", "0", "2013/Oct/24 09:06", "Itho Ventilation Ltd", "Itho", "CVE ECO 2", "", "2008", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.18", "", "2", "29.0", "0.17", "", "3", "37.0", "0.18", "", "4", "45.0", "0.20", "", "5", "53.0", "0.22"]}
+{"pcdb_id": 500044, "raw": ["500044", "020014", "0", "2015/Nov/11 10:34", "Itho Ventilation Ltd", "Itho", "HRU ECO 4", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.47", "90", "2", "21.0", "0.53", "90", "3", "27.0", "0.65", "87", "4", "33.0", "0.79", "87", "5", "39.0", "0.94", "87", "6", "45.0", "1.10", "88"]}
+{"pcdb_id": 500047, "raw": ["500047", "020016", "0", "2015/Nov/11 10:34", "ProAir Heat Recovery and Ventilation Systems Ltd", "ProAir", "PA600", "", "2007", "2012", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.97", "90", "2", "21.0", "0.90", "90", "3", "27.0", "1.00", "89", "4", "33.0", "1.18", "88"]}
+{"pcdb_id": 500048, "raw": ["500048", "020017", "0", "2013/Oct/24 09:06", "Airflow Developments Ltd", "Airflow", "HVS-10", "", "2008", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.26", "", "2", "29.0", "0.21", "", "3", "37.0", "0.24", "", "4", "45.0", "0.26"]}
+{"pcdb_id": 500049, "raw": ["500049", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent 230 EC", "", "2007", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "1.20", "83", "2", "21.0", "1.63", "83", "3", "27.0", "1.62", "78", "4", "33.0", "1.90", "75"]}
+{"pcdb_id": 500050, "raw": ["500050", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 300", "", "2007", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "1.10", "85", "2", "21.0", "0.97", "85", "3", "27.0", "0.97", "86", "4", "33.0", "1.04", "85", "5", "39.0", "1.15", "85"]}
+{"pcdb_id": 500051, "raw": ["500051", "020016", "0", "2015/Nov/11 10:34", "ProAir Heat Recovery and Ventilation Systems Ltd", "ProAir", "PA300", "", "2007", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "1.00", "74", "2", "21.0", "1.07", "74"]}
+{"pcdb_id": 500052, "raw": ["500052", "020004", "0", "2016/May/18 18:37", "Greenwood Air Management Ltd", "Greenwood", "HRV95", "", "2007", "2012", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.73", "86", "2", "21.0", "0.76", "86", "3", "27.0", "0.87", "85", "4", "33.0", "1.00", "83", "5", "39.0", "1.15", "81", "6", "45.0", "1.32", "78"]}
+{"pcdb_id": 500053, "raw": ["500053", "020013", "0", "2015/Nov/11 10:34", "Johnson & Starley Ltd", "Johnson & Starley", "LE155", "125 mm ducts", "2007", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.65", "62", "2", "21.0", "0.84", "62", "3", "27.0", "1.14", "58", "4", "33.0", "1.48", "55"]}
+{"pcdb_id": 500054, "raw": ["500054", "020013", "0", "2015/Nov/11 10:34", "Johnson & Starley Ltd", "Johnson & Starley", "LE155", "100 mm ducts", "2007", "current", "", "3", "0", "2", "2", "1", "3", "1", "15.0", "0.94", "62", "2", "21.0", "1.64", "62", "3", "27.0", "2.60", "60"]}
+{"pcdb_id": 500055, "raw": ["500055", "020017", "0", "2013/Oct/24 09:06", "Airflow Developments Ltd", "Airflow", "WHV-8", "", "2008", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.55", "", "2", "29.0", "0.83", "", "3", "37.0", "0.65", "", "4", "45.0", "0.54", "", "5", "53.0", "0.45"]}
+{"pcdb_id": 500056, "raw": ["500056", "020018", "0", "2013/Oct/24 09:06", "National Ventilation", "National Ventilation", "MVS10", "", "2008", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.41", "", "2", "29.0", "0.33", "", "3", "37.0", "0.29", "", "4", "45.0", "0.27"]}
+{"pcdb_id": 500059, "raw": ["500059", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "150 Effect Duplexvent", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.88", "79", "2", "21.0", "0.90", "79", "3", "27.0", "0.99", "82", "4", "33.0", "1.13", "82", "5", "39.0", "1.28", "83"]}
+{"pcdb_id": 500060, "raw": ["500060", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "90 Duplexvent", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.75", "82", "2", "21.0", "0.86", "82", "3", "27.0", "1.07", "82", "4", "33.0", "1.32", "82", "5", "39.0", "1.59", "80"]}
+{"pcdb_id": 500061, "raw": ["500061", "020019", "0", "2015/Nov/11 10:34", "Intervent Ventilation Systems Ltd", "Intervent Ventilation Systems", "HRC300-4B", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "1.04", "86", "2", "21.0", "0.91", "86", "3", "27.0", "0.93", "85", "4", "33.0", "1.02", "85", "5", "39.0", "1.15", "86", "6", "45.0", "1.30", "87"]}
+{"pcdb_id": 500062, "raw": ["500062", "020015", "0", "2015/Nov/11 10:34", "Helios Ventilation Systems Ltd", "Helios", "KWL EC 450", "", "2008", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.99", "77", "2", "21.0", "1.01", "77", "3", "27.0", "1.10", "80", "4", "33.0", "1.22", "81", "5", "39.0", "1.35", "81", "6", "45.0", "1.49", "82", "7", "51.0", "1.64", "82"]}
+{"pcdb_id": 500063, "raw": ["500063", "020015", "0", "2015/Nov/11 10:34", "Helios Ventilation Systems Ltd", "Helios", "KWL EC 300", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.79", "79", "2", "21.0", "0.93", "79", "3", "27.0", "1.15", "78", "4", "33.0", "1.42", "77", "5", "39.0", "1.72", "76"]}
+{"pcdb_id": 500064, "raw": ["500064", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "LPXBOX DC-2", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.71", "65", "2", "21.0", "0.80", "65", "3", "27.0", "1.07", "62", "4", "33.0", "1.43", "60", "5", "39.0", "1.84", "59", "6", "45.0", "2.27", "57"]}
+{"pcdb_id": 500065, "raw": ["500065", "020020", "0", "2015/Nov/11 10:34", "Orcon B.V.", "Orcon", "HRC300-4B", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "1.04", "86", "2", "21.0", "0.91", "86", "3", "27.0", "0.93", "85", "4", "33.0", "1.02", "85", "5", "39.0", "1.15", "86", "6", "45.0", "1.30", "87"]}
+{"pcdb_id": 500066, "raw": ["500066", "020021", "0", "2016/May/18 18:30", "Paul Waermerueckgewinnung Gmbh", "Paul", "Atmos 175 DC", "", "2006", "2008", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.55", "86", "2", "21.0", "0.53", "86", "3", "27.0", "0.61", "86", "4", "33.0", "0.73", "87", "5", "39.0", "0.88", "87", "6", "45.0", "1.04", "88"]}
+{"pcdb_id": 500067, "raw": ["500067", "020021", "0", "2016/May/18 18:30", "Paul Waermerueckgewinnung Gmbh", "Paul", "Thermos 200 DC", "", "2006", "2012", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.52", "90", "2", "21.0", "0.55", "90", "3", "27.0", "0.65", "89", "4", "33.0", "0.78", "88", "5", "39.0", "0.92", "88", "6", "45.0", "1.08", "88"]}
+{"pcdb_id": 500068, "raw": ["500068", "020021", "0", "2016/May/18 18:30", "Paul Waermerueckgewinnung Gmbh", "Paul", "Thermos 300 DC", "", "2006", "2012", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.49", "91", "2", "21.0", "0.53", "91", "3", "27.0", "0.62", "90", "4", "33.0", "0.75", "89", "5", "39.0", "0.90", "89", "6", "45.0", "1.05", "88"]}
+{"pcdb_id": 500069, "raw": ["500069", "020021", "0", "2016/May/18 18:30", "Paul Waermerueckgewinnung Gmbh", "Paul", "Multi 100 DC", "", "2006", "2014", "", "3", "0", "2", "1", "1", "1", "1", "15.0", "0.94", "87"]}
+{"pcdb_id": 500070, "raw": ["500070", "020022", "0", "2015/Nov/11 10:34", "Vallox Oy", "Vallox", "150 Effect", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.87", "79", "2", "21.0", "0.88", "79", "3", "27.0", "0.97", "82", "4", "33.0", "1.11", "82", "5", "39.0", "1.26", "83", "6", "45.0", "1.42", "83"]}
+{"pcdb_id": 500071, "raw": ["500071", "020022", "0", "2015/Nov/11 10:34", "Vallox Oy", "Vallox", "90", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.73", "82", "2", "21.0", "0.85", "82", "3", "27.0", "1.05", "82", "4", "33.0", "1.29", "82", "5", "39.0", "1.56", "80", "6", "45.0", "1.84", "78"]}
+{"pcdb_id": 500072, "raw": ["500072", "020083", "0", "2015/Nov/11 10:34", "Applied Energy Products Ltd", "Xpelair", "Xcell 350V EC BP", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.72", "93", "2", "21.0", "0.75", "93", "3", "27.0", "0.85", "91", "4", "33.0", "0.98", "91", "5", "39.0", "1.13", "90"]}
+{"pcdb_id": 500073, "raw": ["500073", "020083", "0", "2015/Nov/11 10:34", "Applied Energy Products Ltd", "Xpelair", "Xcell 150U EC BP", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "1.17", "87", "2", "21.0", "1.26", "87", "3", "27.0", "1.54", "85", "4", "33.0", "1.90", "85"]}
+{"pcdb_id": 500074, "raw": ["500074", "020023", "0", "2026/Feb/25 10:50", "Ubbink (UK) Ltd", "Ubbink", "HRV Compact", "", "2008", "obsolete", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "1.09", "86", "2", "21.0", "1.23", "86", "3", "27.0", "1.48", "84", "4", "33.0", "1.77", "82"]}
+{"pcdb_id": 500075, "raw": ["500075", "020023", "0", "2026/Feb/25 10:50", "Ubbink (UK) Ltd", "Ubbink", "HRV Medio", "", "2008", "obsolete", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.80", "84", "2", "21.0", "0.82", "84", "3", "27.0", "0.94", "83", "4", "33.0", "1.09", "81", "5", "39.0", "1.27", "79", "6", "45.0", "1.46", "77"]}
+{"pcdb_id": 500076, "raw": ["500076", "020023", "0", "2026/Feb/25 10:50", "Ubbink (UK) Ltd", "Ubbink", "HVR Grande", "", "2008", "obsolete", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.97", "82", "2", "21.0", "0.99", "83", "3", "27.0", "1.11", "82", "4", "33.0", "1.28", "81", "5", "39.0", "1.48", "80", "6", "45.0", "1.69", "79"]}
+{"pcdb_id": 500077, "raw": ["500077", "020002", "0", "2013/Oct/02 17:18", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent", "", "2008", "2012", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.19", "", "2", "29.0", "0.20", "", "3", "37.0", "0.24", "", "4", "45.0", "0.27", "", "5", "53.0", "0.32", "", "6", "61.0", "0.38"]}
+{"pcdb_id": 500082, "raw": ["500082", "020007", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Titon", "HRV1 Q Plus", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.73", "90", "2", "21.0", "0.84", "89", "3", "27.0", "1.01", "87", "4", "33.0", "1.21", "87"]}
+{"pcdb_id": 500083, "raw": ["500083", "020026", "0", "2015/Nov/11 10:34", "EDPAC International Ltd", "Edpac", "HR200 EC", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.74", "79", "2", "21.0", "0.83", "79", "3", "27.0", "0.97", "79", "4", "33.0", "1.12", "78"]}
+{"pcdb_id": 500084, "raw": ["500084", "020002", "0", "2015/Nov/11 10:34", "Vent Axia Ltd", "Vent Axia", "Air Minder Plus Maxi FB", "", "2007", "2010", "", "3", "0", "2", "1", "1", "2", "2", "21.0", "1.01", "86", "3", "27.0", "1.04", "86"]}
+{"pcdb_id": 500085, "raw": ["500085", "020009", "0", "2015/Nov/11 10:34", "Vortice Ltd", "Vortice", "Vort Prometeo HR400", "", "2008", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.55", "91", "2", "21.0", "0.59", "91", "3", "27.0", "0.68", "89", "4", "33.0", "0.80", "88", "5", "39.0", "0.93", "88", "6", "45.0", "1.08", "87", "7", "51.0", "1.23", "86"]}
+{"pcdb_id": 500086, "raw": ["500086", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "Energivent Q", "", "2008", "2013", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.69", "87", "2", "21.0", "0.71", "88", "3", "27.0", "0.83", "88", "4", "33.0", "0.98", "87", "5", "39.0", "1.15", "86", "6", "45.0", "1.34", "85"]}
+{"pcdb_id": 500087, "raw": ["500087", "020028", "0", "2015/Nov/11 10:34", "Enervent Oy Ab", "Enervent", "Plaza", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "1.31", "77", "2", "21.0", "1.36", "78", "3", "27.0", "1.60", "77", "4", "33.0", "1.93", "76", "5", "39.0", "2.30", "73"]}
+{"pcdb_id": 500096, "raw": ["500096", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "HR180Q", "", "2008", "2012", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "1.09", "86", "2", "21.0", "1.23", "86", "3", "27.0", "1.48", "84", "4", "33.0", "1.77", "82"]}
+{"pcdb_id": 500097, "raw": ["500097", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "HR300Q", "", "2008", "2012", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.80", "84", "2", "21.0", "0.82", "84", "3", "27.0", "0.94", "83", "4", "33.0", "1.09", "81", "5", "39.0", "1.27", "79", "6", "45.0", "1.46", "77"]}
+{"pcdb_id": 500098, "raw": ["500098", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "HR400Q", "", "2008", "2012", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.97", "82", "2", "21.0", "0.99", "83", "3", "27.0", "1.11", "82", "4", "33.0", "1.28", "81", "5", "39.0", "1.48", "80", "6", "45.0", "1.69", "79"]}
+{"pcdb_id": 500099, "raw": ["500099", "020030", "0", "2015/Nov/11 10:34", "Aldes", "Aldes", "DeeFly 90 Microwatt", "", "2007", "current", "", "3", "0", "2", "1", "1", "5", "2", "21.0", "0.88", "85", "3", "27.0", "0.97", "85", "4", "33.0", "1.16", "84", "5", "39.0", "1.39", "82", "6", "45.0", "1.66", "79"]}
+{"pcdb_id": 500101, "raw": ["500101", "020031", "0", "2013/Oct/24 09:06", "NIBE Energy Systems Ltd", "NIBE", "Fighter 360P", "", "2008", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "2.00", "", "2", "29.0", "1.05", "", "3", "37.0", "0.82", "", "4", "45.0", "0.86", "", "5", "53.0", "0.83", "", "6", "61.0", "0.81"]}
+{"pcdb_id": 500102, "raw": ["500102", "020013", "0", "2015/Nov/11 10:34", "Johnson & Starley Ltd", "Johnson & Starley", "LE250-1", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.62", "58", "2", "21.0", "0.83", "57", "3", "27.0", "1.13", "54", "4", "33.0", "1.48", "54"]}
+{"pcdb_id": 500103, "raw": ["500103", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR100/90DC", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.79", "79", "2", "21.0", "0.97", "79", "3", "27.0", "1.19", "78", "4", "33.0", "1.45", "77", "5", "39.0", "1.71", "77"]}
+{"pcdb_id": 500104, "raw": ["500104", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR150DC", "", "2007", "current", "", "3", "0", "2", "2", "1", "3", "1", "15.0", "0.94", "62", "2", "21.0", "1.64", "62", "3", "27.0", "2.60", "60"]}
+{"pcdb_id": 500105, "raw": ["500105", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR250DC", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.61", "58", "2", "21.0", "0.81", "57", "3", "27.0", "1.11", "54", "4", "33.0", "1.45", "54"]}
+{"pcdb_id": 500106, "raw": ["500106", "020004", "0", "2014/Jun/18 12:30", "Greenwood Air Management Ltd", "Greenwood", "CMEV.4", "", "2009", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.80", "", "2", "29.0", "0.59", "", "3", "37.0", "0.72", "", "4", "45.0", "0.60", "", "5", "53.0", "0.51"]}
+{"pcdb_id": 500107, "raw": ["500107", "020004", "0", "2014/Jun/18 12:30", "Greenwood Air Management Ltd", "Greenwood", "CMEV.4e", "", "2009", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.18", "", "5", "53.0", "0.22", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500108, "raw": ["500108", "020002", "0", "2015/Nov/11 10:34", "Vent Axia Ltd", "Vent Axia", "Air Minder Plas Midi FB", "", "2007", "2010", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "1.16", "84", "2", "21.0", "1.28", "82", "3", "27.0", "1.41", "84", "4", "33.0", "1.54", "88", "5", "39.0", "1.67", "94"]}
+{"pcdb_id": 500109, "raw": ["500109", "020032", "0", "2015/Nov/11 10:34", "Utek srl", "Utek", "HRE 350-EC-V CTR", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.93", "89", "2", "21.0", "0.98", "89", "3", "27.0", "1.12", "88", "4", "33.0", "1.31", "87", "5", "39.0", "1.51", "85"]}
+{"pcdb_id": 500110, "raw": ["500110", "020028", "0", "2015/Nov/11 10:34", "Enervent Oy Ab", "Enervent", "LTR-3 eco EC", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "1.11", "76", "2", "21.0", "1.05", "76", "3", "27.0", "1.09", "79", "4", "33.0", "1.18", "80", "5", "39.0", "1.30", "81"]}
+{"pcdb_id": 500113, "raw": ["500113", "020033", "0", "2015/Nov/11 10:34", "Vaillant Group UK Ltd", "Vaillant", "recoVAIR VAR 275/3", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.90", "83", "2", "21.0", "0.91", "85", "3", "27.0", "1.04", "86", "4", "33.0", "1.23", "85", "5", "39.0", "1.44", "83", "6", "45.0", "1.68", "79"]}
+{"pcdb_id": 500114, "raw": ["500114", "020033", "0", "2015/Nov/11 10:34", "Vaillant Group UK Ltd", "Vaillant", "recoVAIR VAR 350/3", "", "2008", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.88", "81", "2", "21.0", "0.87", "81", "3", "27.0", "1.00", "83", "4", "33.0", "1.19", "84", "5", "39.0", "1.42", "84", "6", "45.0", "1.68", "84", "7", "51.0", "1.94", "83"]}
+{"pcdb_id": 500117, "raw": ["500117", "020027", "0", "2009/May/16 16:32", "EnviroVent Ltd", "EnviroVent", "Spider MEV", "", "2009", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.45", "", "2", "29.0", "0.34", "", "3", "37.0", "0.33", "", "4", "45.0", "0.34", "", "5", "53.0", "0.37", "", "6", "61.0", "0.40"]}
+{"pcdb_id": 500118, "raw": ["500118", "020009", "0", "2009/Jun/18 08:37", "Vortice Ltd", "Vortice", "Vort Platt ES", "", "2009", "current", "", "1", "0", "2", "2", "", "3", "1", "21.0", "0.20", "", "2", "29.0", "0.20", "", "3", "37.0", "0.21"]}
+{"pcdb_id": 500119, "raw": ["500119", "020009", "0", "2011/Sep/12 08:31", "Vortice Ltd", "Vortice", "Vort Penta ES", "", "2009", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.20", "", "2", "29.0", "0.18", "", "3", "37.0", "0.19", "", "4", "45.0", "0.20", "", "5", "53.0", "0.23"]}
+{"pcdb_id": 500122, "raw": ["500122", "020034", "0", "2015/Nov/11 10:34", "REC Indovent AB", "Rec Indovent", "RT250S-EC", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.85", "79", "2", "21.0", "0.85", "79", "3", "27.0", "0.95", "76", "4", "33.0", "1.09", "75", "5", "39.0", "1.25", "75", "6", "45.0", "1.43", "75"]}
+{"pcdb_id": 500123, "raw": ["500123", "020034", "0", "2015/Nov/11 10:34", "REC Indovent AB", "Rec Indovent", "RT400S-EC", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.98", "78", "2", "21.0", "0.92", "80", "3", "27.0", "0.98", "75", "4", "33.0", "1.08", "74", "5", "39.0", "1.21", "74", "6", "45.0", "1.36", "74"]}
+{"pcdb_id": 500124, "raw": ["500124", "020035", "0", "2015/Nov/11 10:34", "Rega Ventilation Ltd", "RegaVent", "325DC", "", "2009", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.82", "71", "2", "21.0", "0.62", "71", "3", "27.0", "0.65", "70", "4", "33.0", "0.78", "68", "5", "39.0", "0.96", "65", "6", "45.0", "1.19", "61"]}
+{"pcdb_id": 500125, "raw": ["500125", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR100/60DC", "", "2009", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.71", "61", "2", "21.0", "0.78", "61", "3", "27.0", "0.93", "54", "4", "33.0", "1.12", "52", "5", "39.0", "1.33", "50"]}
+{"pcdb_id": 500126, "raw": ["500126", "020002", "0", "2016/May/18 14:58", "Vent Axia Ltd", "Vent Axia", "Sentinel 200", "", "2009", "current", "", "3", "0", "2", "1", "3", "3", "1", "15.0", "0.78", "85", "2", "21.0", "0.89", "85", "3", "27.0", "1.03", "82"]}
+{"pcdb_id": 500127, "raw": ["500127", "020078", "0", "2015/Nov/11 10:34", "Villavent Ltd", "Villavent", "VR400 DC", "", "2009", "current", "", "3", "0", "2", "1", "1", "5", "3", "27.0", "1.38", "83", "4", "33.0", "1.45", "82", "5", "39.0", "1.56", "84", "6", "45.0", "1.70", "84", "7", "51.0", "1.86", "84"]}
+{"pcdb_id": 500128, "raw": ["500128", "020078", "0", "2015/Nov/11 10:34", "Villavent Ltd", "Villavent", "VR700 DC", "", "2009", "current", "", "3", "0", "2", "1", "1", "4", "4", "33.0", "1.99", "84", "5", "39.0", "2.01", "83", "6", "45.0", "2.03", "83", "7", "51.0", "2.03", "82"]}
+{"pcdb_id": 500129, "raw": ["500129", "020036", "0", "2015/Nov/11 10:34", "Glow-worm", "Glow-worm", "Atmosorb HRD 275", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.90", "83", "2", "21.0", "0.91", "85", "3", "27.0", "1.04", "86", "4", "33.0", "1.23", "85", "5", "39.0", "1.44", "83", "6", "45.0", "1.68", "79"]}
+{"pcdb_id": 500130, "raw": ["500130", "020036", "0", "2015/Nov/11 10:34", "Glow-worm", "Glow-worm", "Atmosorb HRD 350", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.88", "81", "2", "21.0", "0.87", "81", "3", "27.0", "1.00", "83", "4", "33.0", "1.19", "84", "5", "39.0", "1.42", "84", "6", "45.0", "1.68", "84"]}
+{"pcdb_id": 500131, "raw": ["500131", "020007", "0", "2016/Feb/22 15:19", "Titon Hardware Ltd", "Titon", "CME 1 Q Plus", "125 mm ducts", "2009", "2015", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.18", "", "3", "37.0", "0.18", "", "4", "45.0", "0.19", "", "5", "53.0", "0.22", "", "6", "61.0", "0.25"]}
+{"pcdb_id": 500132, "raw": ["500132", "020007", "0", "2016/Feb/22 15:19", "Titon Hardware Ltd", "Titon", "CME 1 Q Plus", "100 mm ducts", "2009", "2015", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.25", "", "2", "29.0", "0.22", "", "3", "37.0", "0.23", "", "4", "45.0", "0.25", "", "5", "53.0", "0.30"]}
+{"pcdb_id": 500133, "raw": ["500133", "020009", "0", "2013/Oct/24 09:06", "Vortice Ltd", "Vortice", "Vort Leto MEV", "", "2009", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.24", "", "2", "29.0", "0.21", "", "3", "37.0", "0.20", "", "4", "45.0", "0.23", "", "5", "53.0", "0.25", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500138, "raw": ["500138", "020004", "0", "2016/May/18 18:35", "Greenwood Air Management Ltd", "Greenwood", "Fusion HRV2", "", "2009", "2015", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.47", "93", "2", "21.0", "0.55", "93", "3", "27.0", "0.70", "91", "4", "33.0", "0.88", "90", "5", "39.0", "1.07", "88"]}
+{"pcdb_id": 500139, "raw": ["500139", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR125DC", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.71", "90", "2", "21.0", "0.82", "89", "3", "27.0", "0.99", "87", "4", "33.0", "1.19", "87"]}
+{"pcdb_id": 500140, "raw": ["500140", "020002", "0", "2016/May/18 14:54", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic B", "", "2009", "current", "", "3", "0", "2", "1", "3", "5", "1", "15.0", "0.76", "91", "2", "21.0", "0.88", "91", "3", "27.0", "1.07", "88", "4", "33.0", "1.28", "86", "5", "39.0", "1.50", "84"]}
+{"pcdb_id": 500141, "raw": ["500141", "020004", "0", "2016/May/18 18:40", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 200", "", "2009", "current", "", "3", "0", "2", "1", "3", "5", "1", "15.0", "0.91", "93", "2", "21.0", "1.02", "93", "3", "27.0", "1.20", "91", "4", "33.0", "1.42", "90", "5", "39.0", "1.66", "88"]}
+{"pcdb_id": 500142, "raw": ["500142", "020004", "0", "2016/May/18 18:40", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 350", "", "2009", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.71", "88", "2", "21.0", "0.71", "88", "3", "27.0", "0.80", "87", "4", "33.0", "0.93", "86", "5", "39.0", "1.07", "86", "6", "45.0", "1.23", "85"]}
+{"pcdb_id": 500143, "raw": ["500143", "020004", "0", "2016/May/18 18:40", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 550", "", "2009", "current", "", "3", "0", "2", "1", "3", "7", "1", "15.0", "0.83", "88", "2", "21.0", "0.79", "88", "3", "27.0", "0.83", "88", "4", "33.0", "0.90", "88", "5", "39.0", "0.99", "86", "6", "45.0", "1.08", "84", "7", "51.0", "1.19", "82"]}
+{"pcdb_id": 500144, "raw": ["500144", "020083", "0", "2015/Nov/11 10:34", "Applied Energy Products Ltd", "Xpelair", "Xcell 150 QV", "", "2009", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.72", "89", "2", "21.0", "0.84", "89", "3", "27.0", "1.01", "86"]}
+{"pcdb_id": 500145, "raw": ["500145", "020083", "0", "2015/Nov/11 10:34", "Applied Energy Products Ltd", "Xpelair", "Xcell 300 QV", "", "2009", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.61", "91", "2", "21.0", "0.65", "91", "3", "27.0", "0.76", "88", "4", "33.0", "0.90", "87", "5", "39.0", "1.07", "86", "6", "45.0", "1.24", "85"]}
+{"pcdb_id": 500146, "raw": ["500146", "020007", "0", "2016/Feb/22 14:32", "Titon Hardware Ltd", "Titon", "HRV1.5 Q Plus", "", "2009", "2014", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.64", "90", "2", "21.0", "0.72", "90", "3", "27.0", "0.85", "89", "4", "33.0", "1.01", "88", "5", "39.0", "1.18", "87"]}
+{"pcdb_id": 500147, "raw": ["500147", "020007", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Titon", "HRV2 Q Plus", "", "2009", "current", "", "3", "0", "2", "1", "1", "5", "2", "21.0", "0.72", "89", "3", "27.0", "0.89", "90", "4", "33.0", "1.11", "88", "5", "39.0", "1.36", "87", "6", "45.0", "1.63", "86"]}
+{"pcdb_id": 500148, "raw": ["500148", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 365", "", "2007", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.69", "85", "2", "21.0", "0.70", "84", "3", "27.0", "0.79", "83", "4", "33.0", "0.92", "82", "5", "39.0", "1.06", "82", "6", "45.0", "1.22", "81"]}
+{"pcdb_id": 500149, "raw": ["500149", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 365", "", "2007", "current", "", "3", "0", "1", "1", "1", "6", "1", "15.0", "0.67", "85", "2", "21.0", "0.70", "84", "3", "27.0", "0.80", "83", "4", "33.0", "0.94", "82", "5", "39.0", "1.10", "82", "6", "45.0", "1.27", "81"]}
+{"pcdb_id": 500150, "raw": ["500150", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 350", "", "2007", "current", "", "3", "0", "1", "1", "1", "6", "1", "15.0", "0.67", "85", "2", "21.0", "0.70", "84", "3", "27.0", "0.80", "83", "4", "33.0", "0.94", "82", "5", "39.0", "1.10", "82", "6", "45.0", "1.27", "81"]}
+{"pcdb_id": 500151, "raw": ["500151", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 600", "", "2007", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.81", "88", "2", "21.0", "0.79", "88", "3", "27.0", "0.84", "86", "4", "33.0", "0.91", "85", "5", "39.0", "1.01", "85", "6", "45.0", "1.11", "84"]}
+{"pcdb_id": 500152, "raw": ["500152", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 600", "", "2007", "current", "", "3", "0", "1", "1", "1", "6", "1", "15.0", "0.78", "88", "2", "21.0", "0.75", "88", "3", "27.0", "0.82", "86", "4", "33.0", "0.92", "85", "5", "39.0", "1.04", "85", "6", "45.0", "1.18", "84"]}
+{"pcdb_id": 500153, "raw": ["500153", "020038", "0", "2015/Nov/11 10:34", "AB C.A. Östberg", "Beam", "AXCO HERU 62 B", "", "2009", "current", "", "3", "0", "2", "1", "1", "3", "2", "21.0", "1.90", "83", "3", "27.0", "1.71", "82", "4", "33.0", "1.93", "85"]}
+{"pcdb_id": 500154, "raw": ["500154", "020038", "0", "2015/Nov/11 10:34", "AB C.A. Östberg", "Beam", "AXCO HERU 90 S", "", "2009", "current", "", "3", "0", "2", "1", "1", "4", "3", "27.0", "1.24", "84", "4", "33.0", "1.32", "83", "5", "39.0", "1.43", "85", "6", "45.0", "1.57", "85"]}
+{"pcdb_id": 500155, "raw": ["500155", "020038", "0", "2015/Nov/11 10:34", "AB C.A. Östberg", "Beam", "AXCO HERU 130 S", "", "2009", "current", "", "3", "0", "2", "1", "1", "3", "4", "33.0", "1.08", "81", "5", "39.0", "1.16", "80", "6", "45.0", "1.26", "84"]}
+{"pcdb_id": 500156, "raw": ["500156", "020038", "0", "2015/Nov/11 10:34", "AB C.A. Östberg", "Beam", "AXCO HERU 180 S", "", "2009", "current", "", "3", "0", "2", "1", "1", "2", "5", "39.0", "1.16", "79", "6", "45.0", "1.15", "76"]}
+{"pcdb_id": 500157, "raw": ["500157", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX95-Loft", "", "2009", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "0.79", "92", "2", "21.0", "0.92", "92"]}
+{"pcdb_id": 500158, "raw": ["500158", "020007", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Titon", "HRV3 Q Plus", "", "2009", "current", "", "3", "0", "2", "1", "1", "4", "3", "27.0", "0.90", "88", "4", "33.0", "1.10", "89", "5", "39.0", "1.32", "87", "6", "45.0", "1.56", "87"]}
+{"pcdb_id": 500159, "raw": ["500159", "020083", "0", "2015/Nov/11 10:34", "Applied Energy Products Ltd", "Xpelair", "Xcell 200 QV", "", "2009", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.68", "91", "2", "21.0", "0.77", "91", "3", "27.0", "0.91", "88", "4", "33.0", "1.07", "86"]}
+{"pcdb_id": 500160, "raw": ["500160", "020083", "0", "2016/Jun/20 12:41", "Applied Energy Products Ltd", "Xpelair", "Xplus 2-EC", "", "2009", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.21", "", "2", "29.0", "0.19", "", "3", "37.0", "0.19", "", "4", "45.0", "0.21", "", "5", "53.0", "0.24", "", "6", "61.0", "0.27"]}
+{"pcdb_id": 500163, "raw": ["500163", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent DV 75EC", "", "2008", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.68", "61", "2", "21.0", "0.80", "62", "3", "27.0", "0.96", "59", "4", "33.0", "1.15", "57", "5", "39.0", "1.34", "54"]}
+{"pcdb_id": 500164, "raw": ["500164", "020040", "0", "2015/Nov/11 10:34", "Itho Ventilation Ltd", "Kair", "IECO 4", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.47", "90", "2", "21.0", "0.53", "90", "3", "27.0", "0.65", "87", "4", "33.0", "0.79", "87", "5", "39.0", "0.94", "87", "6", "45.0", "1.10", "88"]}
+{"pcdb_id": 500165, "raw": ["500165", "020012", "0", "2015/Nov/11 10:34", "MTD Solutions Ltd", "MTD Solutions", "MTD-ERV 200", "", "2009", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.91", "93", "2", "21.0", "1.02", "93", "3", "27.0", "1.20", "91", "4", "33.0", "1.42", "90", "5", "39.0", "1.66", "88"]}
+{"pcdb_id": 500166, "raw": ["500166", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX95-Wall", "", "2009", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "0.71", "91", "2", "21.0", "0.92", "91"]}
+{"pcdb_id": 500167, "raw": ["500167", "020002", "0", "2016/May/26 14:24", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic Plus B", "", "2009", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.52", "92", "2", "21.0", "0.55", "92", "3", "27.0", "0.63", "90", "4", "33.0", "0.74", "89", "5", "39.0", "0.86", "89", "6", "45.0", "0.99", "88"]}
+{"pcdb_id": 500168, "raw": ["500168", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR180DC", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "1.09", "86", "2", "21.0", "1.23", "86", "3", "27.0", "1.48", "84", "4", "33.0", "1.77", "82"]}
+{"pcdb_id": 500169, "raw": ["500169", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR300DC", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.80", "84", "2", "21.0", "0.82", "84", "3", "27.0", "0.94", "83", "4", "33.0", "1.09", "81", "5", "39.0", "1.27", "79", "6", "45.0", "1.46", "77"]}
+{"pcdb_id": 500170, "raw": ["500170", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR400DC", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.97", "82", "2", "21.0", "0.99", "83", "3", "27.0", "1.11", "82", "4", "33.0", "1.28", "81", "5", "39.0", "1.48", "80", "6", "45.0", "1.69", "79"]}
+{"pcdb_id": 500179, "raw": ["500179", "020041", "0", "2015/Nov/11 10:34", "Polypipe Ltd", "Polypipe Ventilation", "HR01L", "", "2009", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "0.79", "92", "2", "21.0", "0.92", "92"]}
+{"pcdb_id": 500180, "raw": ["500180", "020041", "0", "2015/Nov/11 10:34", "Polypipe Ltd", "Polypipe Ventilation", "HR01W", "", "2009", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "0.71", "91", "2", "21.0", "0.92", "91"]}
+{"pcdb_id": 500181, "raw": ["500181", "020042", "0", "2015/Nov/11 10:34", "Brink Climate Systems B.V.", "Brink", "Renovent HR 4/0 R Medium", "", "2009", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.60", "90", "2", "21.0", "0.66", "90", "3", "27.0", "0.80", "87", "4", "33.0", "0.98", "86", "5", "39.0", "1.19", "84", "6", "45.0", "1.41", "82"]}
+{"pcdb_id": 500182, "raw": ["500182", "020042", "0", "2015/Nov/11 10:34", "Brink Climate Systems B.V.", "Brink", "Renovent HR 4/0 R Small", "", "2009", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.85", "88", "2", "21.0", "1.03", "88", "3", "27.0", "1.31", "85"]}
+{"pcdb_id": 500183, "raw": ["500183", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "energiVent FLOW", "", "2010", "2012", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.73", "89", "2", "21.0", "0.83", "90", "3", "27.0", "1.02", "87", "4", "33.0", "1.24", "85", "5", "39.0", "1.48", "83"]}
+{"pcdb_id": 500184, "raw": ["500184", "020013", "0", "2015/Nov/11 10:34", "Johnson & Starley Ltd", "Johnson & Starley", "Q Vent HR160", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.85", "91", "2", "21.0", "1.04", "91", "3", "27.0", "1.33", "88"]}
+{"pcdb_id": 500185, "raw": ["500185", "020023", "0", "2026/Feb/25 10:50", "Ubbink (UK) Ltd", "Ubbink", "HRV C180", "", "2009", "obsolete", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.85", "88", "2", "21.0", "1.03", "88", "3", "27.0", "1.31", "85"]}
+{"pcdb_id": 500186, "raw": ["500186", "020023", "0", "2026/Feb/25 10:50", "Ubbink (UK) Ltd", "Ubbink", "HRV M300", "", "2009", "obsolete", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.60", "90", "2", "21.0", "0.66", "90", "3", "27.0", "0.80", "87", "4", "33.0", "0.98", "86", "5", "39.0", "1.19", "84", "6", "45.0", "1.41", "82"]}
+{"pcdb_id": 500187, "raw": ["500187", "020078", "0", "2015/Nov/11 10:34", "Villavent Ltd", "Villavent", "VR400 DCV/BR", "", "2009", "current", "", "3", "0", "2", "1", "1", "5", "2", "21.0", "1.54", "77", "3", "27.0", "1.51", "77", "4", "33.0", "1.56", "80", "5", "39.0", "1.66", "81", "6", "45.0", "1.78", "82"]}
+{"pcdb_id": 500188, "raw": ["500188", "020004", "0", "2016/May/18 18:29", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir ZHRV2", "", "2009", "2015", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.47", "93", "2", "21.0", "0.55", "93", "3", "27.0", "0.70", "91", "4", "33.0", "0.88", "90", "5", "39.0", "1.07", "88"]}
+{"pcdb_id": 500189, "raw": ["500189", "020078", "0", "2015/Nov/11 10:34", "Villavent Ltd", "Villavent", "Combini EC", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.73", "62", "2", "21.0", "0.90", "63", "3", "27.0", "1.19", "55", "4", "33.0", "1.53", "50"]}
+{"pcdb_id": 500190, "raw": ["500190", "020009", "0", "2015/Nov/11 10:34", "Vortice Ltd", "Vortice", "Vort HR200", "", "2010", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "0.73", "91", "2", "21.0", "0.88", "91"]}
+{"pcdb_id": 500191, "raw": ["500191", "020043", "0", "2014/Jun/11 13:30", "Genvex A/S", "Genvex", "GES Energy BP DS LG", "", "2009", "current", "", "3", "0", "2", "1", "3", "5", "1", "15.0", "0.81", "91", "2", "21.0", "0.88", "91", "3", "27.0", "1.01", "88", "4", "33.0", "1.16", "86", "5", "39.0", "1.33", "84"]}
+{"pcdb_id": 500194, "raw": ["500194", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent DV71", "", "2010", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "3.18", "92", "2", "21.0", "3.05", "92"]}
+{"pcdb_id": 500195, "raw": ["500195", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent DV72", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.75", "90", "2", "21.0", "0.87", "90", "3", "27.0", "1.05", "87", "4", "33.0", "1.27", "86"]}
+{"pcdb_id": 500196, "raw": ["500196", "020002", "0", "2015/Nov/11 10:34", "Vent Axia Ltd", "Vent Axia", "Lo-Carbon Astra", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.75", "90", "2", "21.0", "0.87", "90", "3", "27.0", "1.05", "87", "4", "33.0", "1.27", "86"]}
+{"pcdb_id": 500199, "raw": ["500199", "020014", "0", "2015/Nov/11 10:34", "Itho Ventilation Ltd", "Itho", "Advance", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.50", "89", "2", "21.0", "0.73", "89", "3", "27.0", "1.00", "86"]}
+{"pcdb_id": 500200, "raw": ["500200", "020048", "0", "2015/Nov/11 10:34", "Manrose Manufacturing Ltd", "Manrose", "Windsor MANHR4500DC", "", "2010", "2012", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.75", "90", "2", "21.0", "0.87", "90", "3", "27.0", "1.05", "87", "4", "33.0", "1.27", "86"]}
+{"pcdb_id": 500201, "raw": ["500201", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX95-LH1", "", "2010", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.60", "91", "2", "21.0", "0.66", "91", "3", "27.0", "0.80", "91", "4", "33.0", "0.96", "90", "5", "39.0", "1.15", "90", "6", "45.0", "1.35", "89"]}
+{"pcdb_id": 500202, "raw": ["500202", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX95-LH2", "", "2010", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.78", "91", "2", "21.0", "0.83", "91", "3", "27.0", "0.97", "91", "4", "33.0", "1.14", "90", "5", "39.0", "1.33", "90", "6", "45.0", "1.54", "89"]}
+{"pcdb_id": 500203, "raw": ["500203", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR100/90DC-A", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.99", "91", "2", "21.0", "1.14", "91", "3", "27.0", "1.34", "88"]}
+{"pcdb_id": 500204, "raw": ["500204", "020031", "0", "2013/Oct/24 09:06", "NIBE Energy Systems Ltd", "NIBE", "F205P", "", "2010", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.65", "", "2", "29.0", "0.60", "", "3", "37.0", "0.65", "", "4", "45.0", "0.78", "", "5", "53.0", "0.87", "", "6", "61.0", "1.02"]}
+{"pcdb_id": 500205, "raw": ["500205", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR100/90DC-B", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.78", "91", "2", "21.0", "0.94", "91", "3", "27.0", "1.16", "88"]}
+{"pcdb_id": 500206, "raw": ["500206", "020049", "0", "2015/Nov/11 10:34", "Kingspan Century Ltd", "Kingspan", "Air Recovery 4", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.47", "90", "2", "21.0", "0.53", "90", "3", "27.0", "0.65", "87", "4", "33.0", "0.79", "87", "5", "39.0", "0.94", "87", "6", "45.0", "1.10", "88"]}
+{"pcdb_id": 500207, "raw": ["500207", "020047", "0", "2015/Nov/11 10:34", "Mitsubishi Electric Europe B.V.", "Mitsubishi", "LGH-50RSDC-E1", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.70", "85", "2", "21.0", "0.76", "85", "3", "27.0", "0.89", "82", "4", "33.0", "0.93", "81"]}
+{"pcdb_id": 500208, "raw": ["500208", "020050", "0", "2013/Oct/24 09:06", "Aereco Ltd", "Aereco", "V2A 032EX", "", "2009", "current", "", "1", "0", "2", "1", "", "2", "1", "21.0", "0.37", "", "2", "29.0", "0.42"]}
+{"pcdb_id": 500209, "raw": ["500209", "020050", "0", "2013/Oct/24 09:06", "Aereco Ltd", "Aereco", "V4A 053EX", "", "2009", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.45", "", "2", "29.0", "0.40", "", "3", "37.0", "0.36", "", "4", "45.0", "0.34"]}
+{"pcdb_id": 500210, "raw": ["500210", "020050", "0", "2013/Oct/24 09:06", "Aereco Ltd", "Aereco", "VAM 767EX", "", "2009", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.71", "", "2", "29.0", "0.51", "", "3", "37.0", "0.50", "", "4", "45.0", "0.46", "", "5", "53.0", "0.50", "", "6", "61.0", "0.61"]}
+{"pcdb_id": 500211, "raw": ["500211", "020038", "0", "2015/Nov/11 10:34", "Beam Vacuum Systems Ltd", "Beam", "AXCO HERU 130T", "", "2009", "current", "", "3", "0", "2", "1", "1", "3", "4", "33.0", "1.33", "81", "5", "39.0", "1.38", "81", "6", "45.0", "1.46", "80"]}
+{"pcdb_id": 500212, "raw": ["500212", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR125DC AERA", "", "2010", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.61", "93", "2", "21.0", "0.69", "93", "3", "27.0", "0.84", "91", "4", "33.0", "1.01", "90", "5", "39.0", "1.20", "89"]}
+{"pcdb_id": 500213, "raw": ["500213", "020013", "0", "2015/Nov/11 10:34", "Johnson & Starley Ltd", "Johnson & Starley", "Q-Vent HR260", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.92", "89", "2", "21.0", "1.09", "89", "3", "27.0", "1.33", "88", "4", "33.0", "1.62", "88"]}
+{"pcdb_id": 500214, "raw": ["500214", "020021", "0", "2016/May/18 18:41", "Paul Waermerueckgewinnung Gmbh", "Paul", "Novus 300", "", "2010", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.67", "93", "2", "21.0", "0.66", "93", "3", "27.0", "0.73", "93", "4", "33.0", "0.83", "92", "5", "39.0", "0.96", "91", "6", "45.0", "1.09", "90"]}
+{"pcdb_id": 500215, "raw": ["500215", "020021", "0", "2015/Nov/11 10:34", "Paul Waermerueckgewinnung Gmbh", "Paul", "Focus F200", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.82", "94", "2", "21.0", "0.92", "94", "3", "27.0", "1.14", "93", "4", "33.0", "1.40", "91"]}
+{"pcdb_id": 500216, "raw": ["500216", "020078", "0", "2015/Nov/11 10:34", "Villavent Ltd", "Villavent", "VR 300 ECV / B", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "1.77", "79", "2", "21.0", "1.74", "80", "3", "27.0", "1.72", "80"]}
+{"pcdb_id": 500217, "raw": ["500217", "020052", "0", "2011/May/04 13:42", "Brook Design Hardware Ltd", "Brookvent", "Airstream 1.1AC", "", "2009", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.80", "", "2", "29.0", "0.59", "", "3", "37.0", "0.72", "", "4", "45.0", "0.60", "", "5", "53.0", "0.51"]}
+{"pcdb_id": 500218, "raw": ["500218", "020052", "0", "2011/May/04 13:41", "Brook Design Hardware Ltd", "Brookvent", "Airstream 1.1AC", "", "2009", "current", "", "1", "0", "2", "2", "", "3", "1", "21.0", "0.81", "", "2", "29.0", "0.91", "", "3", "37.0", "0.72"]}
+{"pcdb_id": 500219, "raw": ["500219", "020052", "0", "2011/May/04 13:42", "Brook Design Hardware Ltd", "Brookvent", "Airstream 1.1E", "", "2009", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.18", "", "5", "53.0", "0.22", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500220, "raw": ["500220", "020052", "0", "2011/May/04 13:42", "Brook Design Hardware Ltd", "Brookvent", "Airstream 1.1E", "", "2009", "current", "", "1", "0", "2", "2", "", "4", "1", "21.0", "0.23", "", "2", "29.0", "0.20", "", "3", "37.0", "0.24", "", "4", "45.0", "0.27"]}
+{"pcdb_id": 500221, "raw": ["500221", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHRC180DC", "", "2009", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.85", "88", "2", "21.0", "1.03", "88", "3", "27.0", "1.31", "85"]}
+{"pcdb_id": 500222, "raw": ["500222", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHRM300DC", "", "2009", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.60", "90", "2", "21.0", "0.66", "90", "3", "27.0", "0.80", "87", "4", "33.0", "0.98", "86", "5", "39.0", "1.19", "84", "6", "45.0", "1.41", "82"]}
+{"pcdb_id": 500223, "raw": ["500223", "020083", "0", "2015/Nov/11 10:34", "Applied Energy Products Ltd", "Xpelair", "Xcell 400 QV", "", "2010", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.67", "90", "2", "21.0", "0.72", "90", "3", "27.0", "0.84", "90", "4", "33.0", "1.00", "89", "5", "39.0", "1.17", "88", "6", "45.0", "1.36", "87", "7", "51.0", "1.56", "86"]}
+{"pcdb_id": 500224, "raw": ["500224", "020002", "0", "2016/May/26 14:29", "Vent Axia Ltd", "Vent Axia", "Kinetic E", "", "2010", "2016", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "0.60", "90", "2", "21.0", "0.79", "90"]}
+{"pcdb_id": 500225, "raw": ["500225", "020031", "0", "2013/Oct/24 09:06", "NIBE Energy Systems Ltd", "NIBE", "F370", "", "2010", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.66", "", "2", "29.0", "0.62", "", "3", "37.0", "0.65", "", "4", "45.0", "0.71", "", "5", "53.0", "0.79", "", "6", "61.0", "0.90"]}
+{"pcdb_id": 500226, "raw": ["500226", "020048", "0", "2010/Dec/18 08:49", "Manrose Manufacturing Ltd", "Manrose", "MANI2000", "", "", "current", "", "1", "0", "2", "1", "", "3", "1", "21.0", "0.24", "", "2", "29.0", "0.18", "", "3", "37.0", "0.21"]}
+{"pcdb_id": 500227, "raw": ["500227", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "Compakt", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.50", "89", "2", "21.0", "0.73", "89", "3", "27.0", "1.00", "86"]}
+{"pcdb_id": 500228, "raw": ["500228", "020008", "0", "2016/Jul/14 15:51", "Passivent Ltd", "Passivent", "1Hybrid HR 3", "", "2008", "2013", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.47", "90", "2", "21.0", "0.53", "90", "3", "27.0", "0.65", "87", "4", "33.0", "0.79", "87", "5", "39.0", "0.94", "87", "6", "45.0", "1.10", "88"]}
+{"pcdb_id": 500231, "raw": ["500231", "020052", "0", "2015/Nov/11 10:34", "Brookvent", "Brookvent", "AirCycle", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.73", "89", "2", "21.0", "0.83", "89", "3", "27.0", "0.98", "86"]}
+{"pcdb_id": 500232, "raw": ["500232", "020050", "0", "2011/Feb/22 17:22", "Aereco Ltd", "Aereco", "V4A Premium", "V4A336EX", "2010", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.33", "", "2", "29.0", "0.29", "", "3", "37.0", "0.27", "", "4", "45.0", "0.26"]}
+{"pcdb_id": 500233, "raw": ["500233", "020003", "0", "2013/Oct/24 09:06", "The Nuaire Group", "Nuaire", "MEVDC", "", "2011", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.35", "", "2", "29.0", "0.30", "", "3", "37.0", "0.31", "", "4", "45.0", "0.33", "", "5", "53.0", "0.38"]}
+{"pcdb_id": 500235, "raw": ["500235", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX90M", "", "2010", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.60", "89", "2", "21.0", "0.66", "90", "3", "27.0", "0.80", "87", "4", "33.0", "0.98", "89", "5", "39.0", "1.19", "93", "6", "45.0", "1.41", "99"]}
+{"pcdb_id": 500236, "raw": ["500236", "020059", "0", "2015/Nov/11 10:34", "Ventilation Systems PrJSC", "VENTS", "VUT 600 WH EC", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "2", "21.0", "1.35", "89", "3", "27.0", "1.38", "89", "4", "33.0", "1.48", "87", "5", "39.0", "1.60", "86"]}
+{"pcdb_id": 500237, "raw": ["500237", "020059", "0", "2015/Nov/11 10:34", "Ventilation Systems PrJSC", "VENTS", "VUT 300 WH EC", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.99", "89", "2", "21.0", "0.96", "89", "3", "27.0", "1.01", "88", "4", "33.0", "1.09", "87"]}
+{"pcdb_id": 500238, "raw": ["500238", "020059", "0", "2015/Nov/11 10:34", "Ventilation Systems PrJSC", "VENTS", "VUT 300V mini EC", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.76", "59", "2", "21.0", "0.91", "59", "3", "27.0", "1.13", "54", "4", "33.0", "1.38", "53"]}
+{"pcdb_id": 500239, "raw": ["500239", "020059", "0", "2015/Nov/11 10:34", "Ventilation Systems PrJSC", "VENTS", "VUT 400 WH EC", "", "2010", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.90", "89", "2", "21.0", "0.89", "89", "3", "27.0", "0.97", "87", "4", "33.0", "1.09", "87", "5", "39.0", "1.22", "86"]}
+{"pcdb_id": 500240, "raw": ["500240", "020059", "0", "2015/Nov/11 10:34", "Ventilation Systems PrJSC", "VENTS", "VUT 300H mini EC", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.90", "63", "2", "21.0", "1.10", "63", "3", "27.0", "1.37", "58"]}
+{"pcdb_id": 500241, "raw": ["500241", "020078", "0", "2013/Nov/25 09:40", "Villavent Ltd", "Systemair", "K 160 EC", "", "2011", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.24", "", "2", "29.0", "0.27", "", "3", "37.0", "0.30", "", "4", "45.0", "0.36", "", "5", "53.0", "0.43", "", "6", "61.0", "0.57"]}
+{"pcdb_id": 500242, "raw": ["500242", "020078", "0", "2013/Nov/25 09:40", "Villavent Ltd", "Systemair", "KVKE 125 EC", "", "2011", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.25", "", "2", "29.0", "0.27", "", "3", "37.0", "0.30", "", "4", "45.0", "0.35", "", "5", "53.0", "0.42", "", "6", "61.0", "0.53"]}
+{"pcdb_id": 500243, "raw": ["500243", "020041", "0", "2015/Nov/11 10:34", "Polypipe Ltd", "Polypipe Ventilation", "HR02L", "", "2010", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.60", "91", "2", "21.0", "0.66", "91", "3", "27.0", "0.80", "91", "4", "33.0", "0.96", "90", "5", "39.0", "1.15", "90", "6", "45.0", "1.35", "89"]}
+{"pcdb_id": 500244, "raw": ["500244", "020041", "0", "2015/Nov/11 10:34", "Polypipe Ltd", "Polypipe Ventilation", "HR03L", "", "2010", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.78", "91", "2", "21.0", "0.83", "91", "3", "27.0", "0.97", "91", "4", "33.0", "1.14", "90", "5", "39.0", "1.33", "90", "6", "45.0", "1.54", "89"]}
+{"pcdb_id": 500245, "raw": ["500245", "020060", "0", "2011/Mar/21 08:56", "Addvent", "Addvent", "AVWH2N", "", "2006", "current", "", "1", "0", "2", "1", "", "3", "1", "21.0", "0.24", "", "2", "29.0", "0.18", "", "3", "37.0", "0.21"]}
+{"pcdb_id": 500246, "raw": ["500246", "020060", "0", "2015/Nov/11 10:34", "Addvent", "Addvent", "AVHRU4", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.75", "90", "2", "21.0", "0.87", "90", "3", "27.0", "1.05", "87", "4", "33.0", "1.27", "86"]}
+{"pcdb_id": 500247, "raw": ["500247", "020035", "0", "2015/Nov/11 10:34", "Rega Ventilation Ltd", "RegaVent", "200 DC", "", "2011", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.69", "77", "2", "21.0", "0.84", "77", "3", "27.0", "1.03", "71", "4", "33.0", "1.26", "69"]}
+{"pcdb_id": 500248, "raw": ["500248", "020035", "0", "2015/Nov/11 10:34", "Rega Ventilation Ltd", "RegaVent", "650 DC", "", "2011", "current", "", "3", "0", "2", "1", "1", "4", "3", "27.0", "0.63", "70", "4", "33.0", "0.77", "71", "5", "39.0", "1.00", "67", "6", "45.0", "1.27", "65"]}
+{"pcdb_id": 500249, "raw": ["500249", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX95-WH1", "", "2011", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.42", "91", "2", "21.0", "0.50", "91", "3", "27.0", "0.61", "89", "4", "33.0", "0.75", "88", "5", "39.0", "0.90", "87", "6", "45.0", "1.05", "85"]}
+{"pcdb_id": 500250, "raw": ["500250", "020007", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Titon", "HRV1.75 Q Plus", "", "2009", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.42", "90", "2", "21.0", "0.54", "90", "3", "27.0", "0.72", "89", "4", "33.0", "0.93", "88", "5", "39.0", "1.16", "87"]}
+{"pcdb_id": 500251, "raw": ["500251", "020007", "0", "2016/Feb/22 15:16", "Titon Hardware Ltd", "Titon", "HRV2.75 Q Plus", "", "2009", "2016", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.44", "90", "2", "21.0", "0.56", "90", "3", "27.0", "0.73", "89", "4", "33.0", "0.92", "88", "5", "39.0", "1.12", "87"]}
+{"pcdb_id": 500252, "raw": ["500252", "020058", "0", "2015/Nov/11 10:34", "Ferrob Ltd", "Ferrob", "Infinity 9000", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.75", "90", "2", "21.0", "0.87", "90", "3", "27.0", "1.05", "87", "4", "33.0", "1.27", "86"]}
+{"pcdb_id": 500253, "raw": ["500253", "020061", "0", "2015/Nov/11 10:34", "Maico Ventilation UK Ltd", "Maico", "WRG 180 EC", "", "2009", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.85", "88", "2", "21.0", "1.03", "88", "3", "27.0", "1.31", "85"]}
+{"pcdb_id": 500254, "raw": ["500254", "020061", "0", "2015/Nov/11 10:34", "Maico Ventilation UK Ltd", "Maico", "Aeronom WS 250", "", "2011", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "1.05", "87", "2", "21.0", "1.12", "87", "3", "27.0", "1.35", "87", "4", "33.0", "1.64", "87"]}
+{"pcdb_id": 500255, "raw": ["500255", "020061", "0", "2015/Nov/11 10:34", "Maico Ventilation UK Ltd", "Maico", "Aeronom WR 300", "", "2011", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.76", "83", "2", "21.0", "0.80", "84", "3", "27.0", "0.89", "83", "4", "33.0", "0.98", "81"]}
+{"pcdb_id": 500256, "raw": ["500256", "020061", "0", "2015/Nov/11 10:34", "Maico Ventilation UK Ltd", "Maico", "Aeronom WR 400", "", "2011", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.85", "84", "2", "21.0", "0.83", "84", "3", "27.0", "0.92", "84", "4", "33.0", "1.06", "83"]}
+{"pcdb_id": 500257, "raw": ["500257", "020061", "0", "2015/Nov/11 10:34", "Maico Ventilation UK Ltd", "Maico", "Aeronom WR 600", "", "2011", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.96", "81", "2", "21.0", "1.00", "81", "3", "27.0", "1.08", "83", "4", "33.0", "1.19", "83", "5", "39.0", "1.31", "81"]}
+{"pcdb_id": 500258, "raw": ["500258", "020031", "0", "2013/Oct/24 09:06", "NIBE Energy Systems Ltd", "NIBE", "Fighter 470", "", "2011", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.65", "", "2", "29.0", "0.60", "", "3", "37.0", "0.65", "", "4", "45.0", "0.78", "", "5", "53.0", "0.87", "", "6", "61.0", "1.02"]}
+{"pcdb_id": 500259, "raw": ["500259", "020027", "0", "2011/Jul/25 14:11", "EnviroVent Ltd", "EnviroVent", "OZEO", "", "2011", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.30", "", "2", "29.0", "0.28", "", "3", "37.0", "0.25", "", "4", "45.0", "0.24", "", "5", "53.0", "0.25", "", "6", "61.0", "0.27"]}
+{"pcdb_id": 500260, "raw": ["500260", "020011", "0", "2011/Jul/25 14:44", "Vectaire Ltd", "Vectaire", "MBOX 125/2DC-B", "", "2011", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.20", "", "2", "29.0", "0.26", "", "3", "37.0", "0.34", "", "4", "45.0", "0.44", "", "5", "53.0", "0.55"]}
+{"pcdb_id": 500261, "raw": ["500261", "020042", "0", "2015/Nov/11 10:34", "Brink Climate Systems B.V.", "Brink", "Renovent HR 4/0 R Large", "", "2008", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.97", "82", "2", "21.0", "0.99", "83", "3", "27.0", "1.11", "82", "4", "33.0", "1.28", "81", "5", "39.0", "1.48", "80", "6", "45.0", "1.69", "79"]}
+{"pcdb_id": 500262, "raw": ["500262", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "IDEO", "", "2011", "current", "", "3", "0", "2", "1", "1", "5", "2", "21.0", "0.98", "87", "3", "27.0", "0.97", "87", "4", "33.0", "1.12", "87", "5", "39.0", "1.37", "86", "6", "45.0", "1.67", "85"]}
+{"pcdb_id": 500263, "raw": ["500263", "020009", "0", "2015/Nov/11 10:34", "Vortice Ltd", "Vortice", "Vort Prometeo HR 400 M", "", "2008", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.55", "91", "2", "21.0", "0.59", "91", "3", "27.0", "0.68", "89", "4", "33.0", "0.80", "88", "5", "39.0", "0.93", "88", "6", "45.0", "1.08", "87", "7", "51.0", "1.23", "86"]}
+{"pcdb_id": 500266, "raw": ["500266", "020003", "0", "2013/Oct/24 09:06", "The Nuaire Group", "Nuaire", "MEVDC2", "", "2011", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.35", "", "2", "29.0", "0.30", "", "3", "37.0", "0.31", "", "4", "45.0", "0.33", "", "5", "53.0", "0.38"]}
+{"pcdb_id": 500267, "raw": ["500267", "020066", "0", "2013/Nov/25 09:40", "J Pichler GmbH", "Pichler", "08 LG 180", "", "2010", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.91", "89", "2", "21.0", "1.01", "90", "3", "27.0", "1.20", "86", "4", "33.0", "1.44", "84", "5", "39.0", "1.70", "82", "6", "45.0", "1.98", "80"]}
+{"pcdb_id": 500268, "raw": ["500268", "020066", "0", "2013/Nov/25 09:40", "J Pichler GmbH", "Pichler", "08 LG 250", "", "2010", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.69", "88", "2", "21.0", "0.67", "88", "3", "27.0", "0.73", "88", "4", "33.0", "0.84", "87", "5", "39.0", "0.96", "86", "6", "45.0", "1.09", "85"]}
+{"pcdb_id": 500269, "raw": ["500269", "020066", "0", "2013/Nov/25 09:40", "J Pichler GmbH", "Pichler", "08 LG 500", "", "2010", "current", "", "3", "0", "2", "1", "3", "7", "1", "15.0", "0.76", "89", "2", "21.0", "0.73", "89", "3", "27.0", "0.79", "89", "4", "33.0", "0.89", "89", "5", "39.0", "1.01", "88", "6", "45.0", "1.14", "87", "7", "51.0", "1.28", "85"]}
+{"pcdb_id": 500270, "raw": ["500270", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent DV50", "", "2011", "current", "", "3", "0", "2", "2", "1", "4", "1", "15.0", "0.99", "80", "2", "21.0", "1.21", "80", "3", "27.0", "1.51", "82", "4", "33.0", "1.86", "82"]}
+{"pcdb_id": 500271, "raw": ["500271", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent DV80", "", "2011", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.81", "90", "2", "21.0", "0.94", "91", "3", "27.0", "1.14", "90", "4", "33.0", "1.38", "89", "5", "39.0", "1.63", "89", "6", "45.0", "1.90", "88"]}
+{"pcdb_id": 500272, "raw": ["500272", "020011", "0", "2015/Nov/11 10:34", "Vectaire Ltd", "Vectaire", "WHHR100/90DC-B Plus", "", "2011", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.76", "91", "2", "21.0", "0.90", "91", "3", "27.0", "1.05", "88"]}
+{"pcdb_id": 500273, "raw": ["500273", "020002", "0", "2015/Nov/11 10:34", "Vent Axia Ltd", "Vent Axia", "Astra", "", "2011", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.67", "90", "2", "21.0", "0.85", "90", "3", "27.0", "1.09", "87", "4", "33.0", "1.36", "86"]}
+{"pcdb_id": 500274, "raw": ["500274", "020048", "0", "2015/Nov/11 10:34", "Manrose Manufacturing Ltd", "Manrose", "MANHR4500DC2", "", "2011", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.67", "90", "2", "21.0", "0.85", "90", "3", "27.0", "1.09", "87", "4", "33.0", "1.36", "86"]}
+{"pcdb_id": 500276, "raw": ["500276", "020002", "0", "2016/May/26 14:27", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic VS", "", "2011", "2016", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.61", "90", "2", "21.0", "0.74", "90", "3", "27.0", "0.95", "90", "4", "33.0", "1.19", "90"]}
+{"pcdb_id": 500277, "raw": ["500277", "020042", "0", "2016/Apr/12 16:01", "Brink Climate Systems B.V.", "Brink", "Renovent Excellent 400", "", "2011", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.63", "89", "2", "21.0", "0.61", "89", "3", "27.0", "0.66", "87", "4", "33.0", "0.74", "86", "5", "39.0", "0.84", "85", "6", "45.0", "0.95", "84"]}
+{"pcdb_id": 500278, "raw": ["500278", "020070", "0", "2012/Feb/27 12:02", "Soler & Palau Ltd", "S & P", "OZEO e ECOWATT", "", "2011", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.30", "", "2", "29.0", "0.28", "", "3", "37.0", "0.25", "", "4", "45.0", "0.24", "", "5", "53.0", "0.25", "", "6", "61.0", "0.27"]}
+{"pcdb_id": 500281, "raw": ["500281", "020071", "0", "2015/Nov/11 10:34", "Maico Italia s.p.a.", "Elicent", "AERA IN LINE", "", "2011", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.97", "91", "2", "21.0", "1.10", "91", "3", "27.0", "1.26", "88"]}
+{"pcdb_id": 500282, "raw": ["500282", "020043", "0", "2015/Nov/11 10:34", "Total Home Environment Ltd", "Genvex", "GE Premium 2 H OPT 300", "", "2009", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.92", "82", "2", "21.0", "0.86", "83", "3", "27.0", "0.93", "84", "4", "33.0", "1.07", "84", "5", "39.0", "1.24", "85", "6", "45.0", "1.43", "84"]}
+{"pcdb_id": 500283, "raw": ["500283", "020043", "0", "2015/Nov/11 10:34", "Total Home Environment Ltd", "Genvex", "GE Premium 1 H OPT 300", "", "2009", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.96", "82", "2", "21.0", "0.93", "83", "3", "27.0", "1.01", "83", "4", "33.0", "1.16", "82", "5", "39.0", "1.34", "82", "6", "45.0", "1.54", "80"]}
+{"pcdb_id": 500284, "raw": ["500284", "020043", "0", "2015/Nov/11 10:34", "Total Home Environment Ltd", "Genvex", "Combi 185 S OPT 310", "", "2009", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.95", "80", "2", "21.0", "0.92", "80", "3", "27.0", "1.00", "82", "4", "33.0", "1.13", "82", "5", "39.0", "1.29", "80", "6", "45.0", "1.47", "78"]}
+{"pcdb_id": 500285, "raw": ["500285", "020072", "0", "2016/Mar/17 11:16", "Nilan A/S", "Nilan", "Comfort 300T", "", "2010", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.72", "89", "2", "21.0", "0.72", "88", "3", "27.0", "0.83", "88", "4", "33.0", "1.00", "88", "5", "39.0", "1.21", "88", "6", "45.0", "1.43", "89"]}
+{"pcdb_id": 500286, "raw": ["500286", "020008", "0", "2016/Jul/14 15:51", "Passivent Ltd", "Passivent", "iHybrid HR1", "", "2010", "2013", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.50", "89", "2", "21.0", "0.73", "89", "3", "27.0", "1.00", "86"]}
+{"pcdb_id": 500287, "raw": ["500287", "020007", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Titon", "HRV 10 Q Plus", "", "", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.48", "92", "2", "21.0", "0.52", "92", "3", "27.0", "0.63", "91", "4", "33.0", "0.78", "90", "5", "39.0", "0.94", "89", "6", "45.0", "1.11", "87", "7", "51.0", "1.29", "85"]}
+{"pcdb_id": 500288, "raw": ["500288", "020070", "0", "2015/Nov/11 10:34", "Soler & Palau Ltd", "S & P", "IDEO 325 ECOWATT", "", "2011", "current", "", "3", "0", "2", "1", "1", "5", "2", "21.0", "0.98", "87", "3", "27.0", "0.97", "87", "4", "33.0", "1.12", "87", "5", "39.0", "1.37", "86", "6", "45.0", "1.67", "85"]}
+{"pcdb_id": 500289, "raw": ["500289", "020002", "0", "2016/May/26 14:20", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic Plus BS", "", "2012", "current", "", "3", "0", "2", "1", "3", "7", "1", "15.0", "0.42", "91", "2", "21.0", "0.44", "91", "3", "27.0", "0.52", "90", "4", "33.0", "0.63", "90", "5", "39.0", "0.76", "90", "6", "45.0", "0.90", "91", "7", "51.0", "1.05", "91"]}
+{"pcdb_id": 500290, "raw": ["500290", "020058", "0", "2012/Apr/23 18:47", "Ferrob Ltd", "Ferrob", "Infinity 9050", "", "2008", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.55", "", "2", "29.0", "0.83", "", "3", "37.0", "0.65", "", "4", "45.0", "0.54", "", "5", "53.0", "0.45"]}
+{"pcdb_id": 500291, "raw": ["500291", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent DV72 E", "", "2012", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.70", "90", "2", "21.0", "0.92", "90", "3", "27.0", "1.20", "87", "4", "33.0", "1.50", "86"]}
+{"pcdb_id": 500292, "raw": ["500292", "020073", "0", "2015/Nov/11 10:34", "Dantherm Air Handling A/S", "Dantherm", "HCH 5", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "2", "21.0", "0.58", "82", "3", "27.0", "0.65", "82", "4", "33.0", "0.76", "83", "5", "39.0", "0.90", "84"]}
+{"pcdb_id": 500293, "raw": ["500293", "020073", "0", "2015/Nov/11 10:34", "Dantherm Air Handling A/S", "Dantherm", "HCH 8", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "3", "27.0", "0.70", "82", "4", "33.0", "0.82", "81", "5", "39.0", "0.98", "82", "6", "45.0", "1.15", "82"]}
+{"pcdb_id": 500294, "raw": ["500294", "020073", "0", "2015/Nov/11 10:34", "Dantherm Air Handling A/S", "Dantherm", "HCV 5", "", "2010", "current", "", "3", "0", "2", "1", "1", "4", "2", "21.0", "0.64", "82", "3", "27.0", "0.72", "82", "4", "33.0", "0.85", "83", "5", "39.0", "1.01", "84"]}
+{"pcdb_id": 500295, "raw": ["500295", "020002", "0", "2013/Oct/02 17:18", "Vent Axia Ltd", "Vent Axia", "MVDC-MS A", "", "", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.16", "", "2", "29.0", "0.15", "", "3", "37.0", "0.17", "", "4", "45.0", "0.20", "", "5", "53.0", "0.24", "", "6", "61.0", "0.28"]}
+{"pcdb_id": 500296, "raw": ["500296", "020002", "0", "2013/Oct/02 17:18", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent A", "", "2012", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.16", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.21", "", "5", "53.0", "0.24", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500297, "raw": ["500297", "020003", "0", "2013/Sep/20 15:22", "The Nuaire Group", "Nuaire", "MRXBOX95B-LP1", "", "2012", "current", "", "3", "0", "2", "1", "3", "5", "1", "15.0", "0.59", "76", "2", "21.0", "0.71", "76", "3", "27.0", "0.91", "78", "4", "33.0", "1.15", "79", "5", "39.0", "1.40", "79"]}
+{"pcdb_id": 500298, "raw": ["500298", "020002", "0", "2015/Nov/11 10:34", "Vent Axia Ltd", "Vent Axia", "Kinetic Plus E", "", "2012", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.40", "94", "2", "21.0", "0.43", "94", "3", "27.0", "0.53", "94", "4", "33.0", "0.65", "93", "5", "39.0", "0.78", "93", "6", "45.0", "0.93", "92"]}
+{"pcdb_id": 500299, "raw": ["500299", "020009", "0", "2015/Nov/11 10:34", "Vortice Ltd", "Vortice", "Vort Prometeo Plus HR400", "", "2012", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.48", "91", "2", "21.0", "0.54", "91", "3", "27.0", "0.66", "89", "4", "33.0", "0.80", "88", "5", "39.0", "0.95", "88", "6", "45.0", "1.11", "87"]}
+{"pcdb_id": 500300, "raw": ["500300", "020076", "0", "2015/Nov/11 10:34", "Elek-Trends Productions", "Veneco", "V4275", "", "2012", "current", "", "3", "0", "2", "1", "1", "5", "2", "21.0", "0.73", "90", "3", "27.0", "0.82", "90", "4", "33.0", "0.95", "89", "5", "39.0", "1.11", "88", "6", "45.0", "1.27", "87"]}
+{"pcdb_id": 500301, "raw": ["500301", "020076", "0", "2015/Nov/11 10:34", "Elek-Trends Productions", "Veneco", "V4375", "", "2012", "current", "", "3", "0", "2", "1", "1", "5", "2", "21.0", "0.81", "90", "3", "27.0", "0.90", "90", "4", "33.0", "1.03", "89", "5", "39.0", "1.17", "88", "6", "45.0", "1.33", "87"]}
+{"pcdb_id": 500302, "raw": ["500302", "020076", "0", "2015/Nov/11 10:34", "Elek-Trends Productions", "Veneco", "V4450", "", "2012", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "1.01", "90", "2", "21.0", "1.04", "91", "3", "27.0", "1.11", "90", "4", "33.0", "1.20", "89", "5", "39.0", "1.31", "88", "6", "45.0", "1.42", "86", "7", "51.0", "1.54", "85"]}
+{"pcdb_id": 500303, "raw": ["500303", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX95-WM2", "", "2012", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.56", "87", "2", "21.0", "0.68", "87", "3", "27.0", "0.85", "86", "4", "33.0", "1.06", "86"]}
+{"pcdb_id": 500304, "raw": ["500304", "020078", "0", "2015/Nov/11 10:34", "Villavent Ltd", "Systemair", "SAVE VTC 300", "", "2012", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.82", "76", "2", "21.0", "0.82", "76", "3", "27.0", "0.92", "79", "4", "33.0", "1.06", "80", "5", "39.0", "1.22", "81", "6", "45.0", "1.40", "81"]}
+{"pcdb_id": 500305, "raw": ["500305", "020038", "0", "2012/Aug/21 07:53", "Titon Hardware Ltd", "Axco", "CEV 130", "", "2009", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.18", "", "3", "37.0", "0.18", "", "4", "45.0", "0.19", "", "5", "53.0", "0.22", "", "6", "61.0", "0.25"]}
+{"pcdb_id": 500306, "raw": ["500306", "020038", "0", "2012/Aug/28 20:31", "Titon Hardware Ltd", "Axco", "CEV 130", "", "2009", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.25", "", "2", "29.0", "0.22", "", "3", "37.0", "0.23", "", "4", "45.0", "0.25", "", "5", "53.0", "0.30"]}
+{"pcdb_id": 500308, "raw": ["500308", "020038", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Beam", "AXCO MVHR C50", "", "2008", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.71", "90", "2", "21.0", "0.82", "89", "3", "27.0", "0.99", "87", "4", "33.0", "1.19", "87"]}
+{"pcdb_id": 500309, "raw": ["500309", "020038", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Beam", "AXCO MVHR C75", "", "2009", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.42", "90", "2", "21.0", "0.54", "90", "3", "27.0", "0.72", "89", "4", "33.0", "0.93", "88", "5", "39.0", "1.16", "87"]}
+{"pcdb_id": 500310, "raw": ["500310", "020038", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Beam", "AXCO MVHR C100", "", "2009", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.44", "90", "2", "21.0", "0.56", "90", "3", "27.0", "0.73", "89", "4", "33.0", "0.92", "88", "5", "39.0", "1.12", "87"]}
+{"pcdb_id": 500311, "raw": ["500311", "020038", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Beam", "AXCO MVHR C130", "", "2011", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.48", "92", "2", "21.0", "0.52", "92", "3", "27.0", "0.63", "91", "4", "33.0", "0.78", "90", "5", "39.0", "0.94", "89", "6", "45.0", "1.11", "87"]}
+{"pcdb_id": 500312, "raw": ["500312", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "energiSava 280", "", "2011", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.57", "88", "2", "21.0", "0.68", "88", "3", "27.0", "0.87", "84", "4", "33.0", "1.11", "83", "5", "39.0", "1.37", "83", "6", "45.0", "1.64", "83"]}
+{"pcdb_id": 500313, "raw": ["500313", "020043", "0", "2015/Nov/11 10:34", "Genvex A/S", "Genvex", "GES Energy 2 BP", "", "2012", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "1.22", "92", "2", "21.0", "1.03", "92", "3", "27.0", "1.10", "90", "4", "33.0", "1.28", "89", "5", "39.0", "1.54", "88", "6", "45.0", "1.84", "88", "7", "51.0", "2.16", "87"]}
+{"pcdb_id": 500314, "raw": ["500314", "020027", "0", "2015/Nov/11 10:34", "EnviroVent Ltd", "EnviroVent", "energiSava 380", "", "2012", "2019", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.41", "93", "2", "21.0", "0.47", "93", "3", "27.0", "0.59", "91", "4", "33.0", "0.73", "90", "5", "39.0", "0.89", "88", "6", "45.0", "1.05", "86"]}
+{"pcdb_id": 500315, "raw": ["500315", "020035", "0", "2015/Nov/11 10:34", "Rega Ventilation Ltd", "RegaVent", "650P-DC", "", "2012", "current", "", "3", "0", "2", "1", "1", "6", "2", "21.0", "0.70", "81", "3", "27.0", "0.69", "81", "4", "33.0", "0.83", "82", "5", "39.0", "1.06", "81", "6", "45.0", "1.34", "81", "7", "51.0", "1.65", "80"]}
+{"pcdb_id": 500316, "raw": ["500316", "020078", "0", "2015/Nov/11 10:34", "Systemair Fans & Spares Ltd", "Villavent", "VTC Low E", "", "2012", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.80", "85", "2", "21.0", "0.93", "85", "3", "27.0", "1.07", "83", "4", "33.0", "1.21", "82"]}
+{"pcdb_id": 500317, "raw": ["500317", "020042", "0", "2015/Nov/11 10:34", "Brink Climate Systems B.V.", "Brink", "Renovent Sky 300", "", "2012", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.60", "90", "2", "21.0", "0.62", "90", "3", "27.0", "0.71", "87", "4", "33.0", "0.83", "86", "5", "39.0", "0.97", "85", "6", "45.0", "1.12", "84"]}
+{"pcdb_id": 500318, "raw": ["500318", "020041", "0", "2013/Sep/20 17:51", "Polypipe Ltd", "Polypipe Ventilation", "Silavent HRX", "", "2012", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.63", "87", "2", "21.0", "0.75", "86", "3", "27.0", "0.93", "85", "4", "33.0", "1.14", "84", "5", "39.0", "1.37", "84"]}
+{"pcdb_id": 500319, "raw": ["500319", "020007", "0", "2015/Nov/11 10:34", "Titon Hardware Ltd", "Titon", "HRV1.25 Q Plus", "", "2012", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.61", "89", "2", "21.0", "0.86", "89", "3", "27.0", "1.19", "88"]}
+{"pcdb_id": 500320, "raw": ["500320", "020002", "0", "2016/May/18 15:30", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic 300Z", "", "2012", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.54", "78", "2", "21.0", "0.61", "78", "3", "27.0", "0.75", "78", "4", "33.0", "0.93", "78", "5", "39.0", "1.13", "77", "6", "45.0", "1.35", "76"]}
+{"pcdb_id": 500321, "raw": ["500321", "020072", "0", "2015/Nov/11 10:34", "Nilan A/S", "Nilan", "Compact P", "7512404", "2012", "current", "", "3", "1", "2", "1", "1", "6", "1", "15.0", "0.73", "85", "2", "21.0", "0.76", "86", "3", "27.0", "0.88", "86", "4", "33.0", "1.03", "85", "5", "39.0", "1.20", "84", "6", "45.0", "1.38", "83"]}
+{"pcdb_id": 500322, "raw": ["500322", "020072", "0", "2015/Nov/11 10:34", "Nilan A/S", "Nilan", "Compact P", "7512305", "2012", "current", "", "3", "1", "2", "1", "1", "6", "1", "15.0", "0.73", "85", "2", "21.0", "0.76", "86", "3", "27.0", "0.88", "86", "4", "33.0", "1.03", "85", "5", "39.0", "1.20", "84", "6", "45.0", "1.38", "83"]}
+{"pcdb_id": 500323, "raw": ["500323", "020002", "0", "2016/May/18 15:25", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic 200Z", "", "2012", "current", "", "3", "0", "2", "1", "3", "4", "1", "15.0", "0.73", "81", "2", "21.0", "0.89", "81", "3", "27.0", "1.12", "79", "4", "33.0", "1.39", "78"]}
+{"pcdb_id": 500324, "raw": ["500324", "020013", "0", "2015/Nov/11 10:34", "Johnson & Starley Ltd", "Johnson & Starley", "Q-Vent HR400", "", "2011", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.48", "92", "2", "21.0", "0.52", "92", "3", "27.0", "0.63", "91", "4", "33.0", "0.78", "90", "5", "39.0", "0.94", "89", "6", "45.0", "1.11", "87"]}
+{"pcdb_id": 500325, "raw": ["500325", "020082", "0", "2015/Nov/11 10:34", "Emmeti SpA", "Emmeti", "RECUPERA SLIM (ER02011-ER + ER02011-EC)", "", "2011", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.97", "91", "2", "21.0", "1.10", "91", "3", "27.0", "1.26", "88"]}
+{"pcdb_id": 500326, "raw": ["500326", "020082", "0", "2015/Nov/11 10:34", "Emmeti SpA", "Emmeti", "RECUPERA-MED-ER02511-EC", "", "2010", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.61", "93", "2", "21.0", "0.69", "93", "3", "27.0", "0.84", "91", "4", "33.0", "1.01", "90", "5", "39.0", "1.20", "89"]}
+{"pcdb_id": 500327, "raw": ["500327", "020071", "0", "2015/Nov/11 10:34", "Maico Italia s.p.a.", "Elicent", "AERA 280 EC", "", "2010", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.61", "93", "2", "21.0", "0.69", "93", "3", "27.0", "0.84", "91", "4", "33.0", "1.01", "90", "5", "39.0", "1.20", "89"]}
+{"pcdb_id": 500328, "raw": ["500328", "020083", "0", "2015/Nov/11 10:34", "Redring Xpelair Group Ltd", "Xpelair", "Xcell Compact XR", "", "2012", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.49", "90", "2", "21.0", "0.61", "90", "3", "27.0", "0.77", "87"]}
+{"pcdb_id": 500329, "raw": ["500329", "020084", "0", "2021/Oct/20 09:58", "FRÄNKISCHE ROHRWERKE", "FRÄNKISCHE", "profi-air 250 touch", "", "2012", "obsolete", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.74", "90", "2", "21.0", "0.78", "90", "3", "27.0", "0.92", "88", "4", "33.0", "1.11", "87", "5", "39.0", "1.32", "86", "6", "45.0", "1.55", "85"]}
+{"pcdb_id": 500330, "raw": ["500330", "020084", "0", "2021/Oct/20 09:58", "FRÄNKISCHE ROHRWERKE", "FRÄNKISCHE", "profi-air 400 touch", "", "2012", "obsolete", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.88", "86", "2", "21.0", "0.89", "86", "3", "27.0", "0.99", "86", "4", "33.0", "1.13", "85", "5", "39.0", "1.30", "85", "6", "45.0", "1.48", "84", "7", "51.0", "1.66", "83"]}
+{"pcdb_id": 500332, "raw": ["500332", "020041", "0", "2017/Apr/26 11:15", "Polypipe Ltd", "Polypipe Ventilation", "Silavent HRX2", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.48", "94", "2", "21.0", "0.50", "94", "3", "27.0", "0.59", "93", "4", "33.0", "0.71", "92", "5", "39.0", "0.85", "91", "6", "45.0", "1.00", "90", "7", "51.0", "1.15", "89"]}
+{"pcdb_id": 500333, "raw": ["500333", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent BV300", "", "2013", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.60", "90", "2", "21.0", "0.78", "90", "3", "27.0", "1.02", "87", "4", "33.0", "1.29", "86"]}
+{"pcdb_id": 500334, "raw": ["500334", "020017", "0", "2015/Nov/11 10:34", "Airflow Developments Ltd", "Airflow", "Duplexvent BV400", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.46", "92", "2", "21.0", "0.49", "92", "3", "27.0", "0.60", "91", "4", "33.0", "0.74", "90", "5", "39.0", "0.89", "90", "6", "45.0", "1.05", "89", "7", "51.0", "1.23", "88"]}
+{"pcdb_id": 500335, "raw": ["500335", "020004", "0", "2014/Aug/04 15:30", "Greenwood Air Management Ltd", "Greenwood", "Vireo HR155CM", "", "2013", "current", "", "3", "0", "2", "1", "3", "3", "1", "15.0", "0.73", "92", "2", "21.0", "0.83", "91", "3", "27.0", "1.00", "90"]}
+{"pcdb_id": 500336, "raw": ["500336", "020004", "0", "2014/Aug/04 15:30", "Greenwood Air Management Ltd", "Greenwood", "Vireo HR155WM", "", "2013", "current", "", "3", "0", "2", "1", "3", "3", "1", "15.0", "0.77", "92", "2", "21.0", "0.90", "91", "3", "27.0", "1.10", "90"]}
+{"pcdb_id": 500337, "raw": ["500337", "020004", "0", "2014/Aug/04 15:30", "Greenwood Air Management Ltd", "Greenwood", "Vireo HR185WM", "", "2013", "current", "", "3", "0", "2", "1", "3", "4", "1", "15.0", "0.57", "92", "2", "21.0", "0.64", "91", "3", "27.0", "0.76", "91", "4", "33.0", "0.96", "91"]}
+{"pcdb_id": 500341, "raw": ["500341", "020052", "0", "2015/Nov/11 10:34", "Brookvent", "Brookvent", "AirCycle 1.2", "", "2013", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.59", "91", "2", "21.0", "0.74", "91", "3", "27.0", "0.96", "88", "4", "33.0", "1.20", "87", "5", "39.0", "1.46", "86"]}
+{"pcdb_id": 500342, "raw": ["500342", "020052", "0", "2015/Nov/11 10:34", "Brookvent", "Brookvent", "AirCycle 2.2", "", "2013", "current", "", "3", "0", "2", "1", "1", "5", "2", "21.0", "0.62", "91", "3", "27.0", "0.76", "91", "4", "33.0", "0.96", "89", "5", "39.0", "1.20", "88", "6", "45.0", "1.45", "88"]}
+{"pcdb_id": 500343, "raw": ["500343", "020035", "0", "2015/Nov/11 10:34", "Rega Ventilation Ltd", "RegaVent", "300R-DC", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.70", "89", "2", "21.0", "0.77", "89", "3", "27.0", "0.92", "88", "4", "33.0", "1.11", "87", "5", "39.0", "1.32", "86", "6", "45.0", "1.55", "85", "7", "51.0", "1.78", "84"]}
+{"pcdb_id": 500344, "raw": ["500344", "020035", "0", "2015/Nov/11 10:34", "Rega Ventilation Ltd", "RegaVent", "600R-DC", "", "2013", "current", "", "3", "0", "2", "1", "1", "3", "4", "33.0", "0.71", "89", "5", "39.0", "0.86", "90", "6", "45.0", "1.04", "88"]}
+{"pcdb_id": 500345, "raw": ["500345", "020031", "0", "2014/Jun/11 13:30", "Genvex A/S", "NIBE", "GV-HR110-250", "", "2013", "current", "", "3", "0", "2", "1", "3", "5", "1", "15.0", "0.81", "91", "2", "21.0", "0.88", "91", "3", "27.0", "1.01", "88", "4", "33.0", "1.16", "86", "5", "39.0", "1.33", "84"]}
+{"pcdb_id": 500346, "raw": ["500346", "020031", "0", "2015/Nov/11 10:34", "Genvex A/S", "NIBE", "GV-HR110-400", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "1.22", "92", "2", "21.0", "1.03", "92", "3", "27.0", "1.10", "90", "4", "33.0", "1.28", "89", "5", "39.0", "1.54", "88", "6", "45.0", "1.84", "88", "7", "51.0", "2.16", "87"]}
+{"pcdb_id": 500347, "raw": ["500347", "020003", "0", "2015/Nov/11 10:34", "The Nuaire Group", "Nuaire", "MRXBOX95-WM1", "", "2013", "current", "", "3", "0", "2", "1", "1", "2", "1", "15.0", "0.72", "92", "2", "21.0", "0.99", "91"]}
+{"pcdb_id": 500349, "raw": ["500349", "020016", "0", "2015/Nov/11 10:34", "ProAir Heat Recovery and Ventilation Systems Ltd", "ProAir", "PA600LI", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.59", "93", "2", "21.0", "0.64", "92", "3", "27.0", "0.75", "91", "4", "33.0", "0.89", "90", "5", "39.0", "1.04", "89", "6", "45.0", "1.20", "87", "7", "51.0", "1.37", "86"]}
+{"pcdb_id": 500350, "raw": ["500350", "020013", "0", "2015/Nov/11 10:34", "Johnson & Starley Ltd", "Johnson & Starley", "Q Vent 160 MK3", "", "2010", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.65", "91", "2", "21.0", "0.84", "90", "3", "27.0", "1.08", "90"]}
+{"pcdb_id": 500351, "raw": ["500351", "020041", "0", "2013/Oct/03 13:32", "Polypipe Ltd", "Polypipe Ventilation", "Silavent CMX", "", "2013", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.24", "", "2", "29.0", "0.25", "", "3", "37.0", "0.29", "", "4", "45.0", "0.35", "", "5", "53.0", "0.43", "", "6", "61.0", "0.54"]}
+{"pcdb_id": 500352, "raw": ["500352", "020011", "0", "2025/Jul/07 12:00", "Vectaire Ltd", "Vectaire", "WHHR MIDI", "", "2013", "obsolete", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.58", "93", "2", "21.0", "0.70", "91", "3", "27.0", "0.87", "90", "4", "33.0", "1.06", "89", "5", "39.0", "1.27", "87"]}
+{"pcdb_id": 500353, "raw": ["500353", "020038", "0", "2014/Apr/28 10:00", "AB C.A. Östberg", "Beam", "AXCO HERU 100 S", "", "2013", "current", "", "3", "0", "2", "1", "3", "3", "3", "27.0", "1.11", "83", "4", "33.0", "1.12", "83", "5", "39.0", "1.17", "83"]}
+{"pcdb_id": 500354, "raw": ["500354", "020038", "0", "2014/Apr/28 10:00", "AB C.A. Östberg", "Beam", "AXCO HERU 100 T", "", "2013", "current", "", "3", "0", "2", "1", "3", "3", "3", "27.0", "1.31", "83", "4", "33.0", "1.36", "83", "5", "39.0", "1.43", "83"]}
+{"pcdb_id": 500355, "raw": ["500355", "020038", "0", "2014/Apr/28 10:00", "AB C.A. Östberg", "Beam", "AXCO HERU 160 T", "", "2013", "current", "", "3", "0", "2", "1", "3", "4", "4", "33.0", "1.08", "81", "5", "39.0", "1.17", "81", "6", "45.0", "1.29", "80", "7", "51.0", "1.43", "79"]}
+{"pcdb_id": 500356, "raw": ["500356", "020078", "0", "2014/Apr/28 10:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VSR 300", "", "2013", "current", "", "3", "0", "2", "1", "3", "4", "3", "27.0", "1.09", "83", "4", "33.0", "1.17", "84", "5", "39.0", "1.30", "84", "6", "45.0", "1.48", "84"]}
+{"pcdb_id": 500357, "raw": ["500357", "020078", "0", "2014/Apr/28 10:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VSR 500", "", "2013", "current", "", "3", "0", "2", "1", "3", "3", "4", "33.0", "1.14", "84", "5", "39.0", "1.20", "85", "6", "45.0", "1.29", "87"]}
+{"pcdb_id": 500358, "raw": ["500358", "020009", "0", "2013/Nov/25 09:50", "Vortice Ltd", "Vortice", "VORT EVO HR 200", "", "2013", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.61", "90", "2", "21.0", "0.80", "89", "3", "27.0", "1.06", "87"]}
+{"pcdb_id": 500360, "raw": ["500360", "020083", "0", "2013/Dec/04 09:50", "Redring Xpelair Group Ltd", "Xpelair", "Xcell S120Q Stratum", "92923AW", "2013", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.87", "87", "2", "21.0", "1.17", "85", "3", "27.0", "1.61", "84"]}
+{"pcdb_id": 500361, "raw": ["500361", "020003", "0", "2014/Feb/18 14:00", "The Nuaire Group", "Nuaire", "MRXBOX95AB-WH1", "", "2013", "current", "", "3", "0", "2", "1", "0", "7", "1", "15.0", "0.52", "88", "2", "21.0", "0.56", "88", "3", "27.0", "0.67", "88", "4", "33.0", "0.78", "86", "5", "39.0", "0.95", "86", "6", "45.0", "1.16", "85", "7", "51.0", "1.40", "85"]}
+{"pcdb_id": 500362, "raw": ["500362", "020003", "0", "2014/Feb/18 14:00", "The Nuaire Group", "Nuaire", "MRXBOX95AB-WH2", "", "2013", "current", "", "3", "0", "2", "1", "0", "7", "1", "15.0", "0.60", "89", "2", "21.0", "0.61", "88", "3", "27.0", "0.68", "88", "4", "33.0", "0.79", "87", "5", "39.0", "0.95", "86", "6", "45.0", "1.15", "85", "7", "51.0", "1.38", "85"]}
+{"pcdb_id": 500363, "raw": ["500363", "020003", "0", "2014/Feb/18 14:00", "The Nuaire Group", "Nuaire", "MRXBOX95AB-WM1", "", "2013", "current", "", "3", "0", "2", "1", "0", "2", "1", "15.0", "0.91", "86", "2", "21.0", "1.26", "85"]}
+{"pcdb_id": 500364, "raw": ["500364", "020003", "0", "2014/Feb/18 14:00", "The Nuaire Group", "Nuaire", "MRXBOX95AB-WM2", "", "2013", "current", "", "3", "0", "2", "1", "0", "6", "1", "15.0", "0.56", "86", "2", "21.0", "0.66", "85", "3", "27.0", "0.79", "84", "4", "33.0", "1.02", "83", "5", "39.0", "1.23", "82", "6", "45.0", "1.52", "82"]}
+{"pcdb_id": 500365, "raw": ["500365", "020027", "0", "2014/Feb/18 14:00", "EnviroVent Ltd", "EnviroVent", "OZEO ECOWATT CP", "", "2013", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.43", "", "2", "29.0", "0.37", "", "3", "37.0", "0.36", "", "4", "45.0", "0.36", "", "5", "53.0", "0.35", "", "6", "61.0", "0.34"]}
+{"pcdb_id": 500366, "raw": ["500366", "020011", "0", "2014/Feb/18 14:00", "Vectaire Ltd", "Vectaire", "WHHR Maxi", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.45", "92", "2", "21.0", "0.47", "92", "3", "27.0", "0.54", "91", "4", "33.0", "0.66", "90", "5", "39.0", "0.80", "90", "6", "45.0", "0.99", "89", "7", "51.0", "1.21", "89"]}
+{"pcdb_id": 500367, "raw": ["500367", "020011", "0", "2014/Feb/18 14:00", "Vectaire Ltd", "Vectaire", "WHHR MIDI Plus", "", "2013", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.51", "93", "2", "21.0", "0.61", "91", "3", "27.0", "0.75", "90", "4", "33.0", "0.92", "89"]}
+{"pcdb_id": 500370, "raw": ["500370", "020017", "0", "2014/Apr/24 12:00", "Airflow Developments Ltd", "Airflow", "Duplexvent DV96SE", "", "2013", "current", "", "3", "0", "2", "1", "1", "5", "1", "15.0", "0.96", "87", "2", "21.0", "1.06", "87", "3", "27.0", "1.21", "86", "4", "33.0", "1.42", "85", "5", "39.0", "1.73", "85"]}
+{"pcdb_id": 500371, "raw": ["500371", "020017", "0", "2014/Apr/24 12:00", "Airflow Developments Ltd", "Airflow", "Duplexvent DV110SE", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.85", "90", "2", "21.0", "0.82", "89", "3", "27.0", "0.90", "88", "4", "33.0", "1.05", "88", "5", "39.0", "1.22", "87", "6", "45.0", "1.42", "87", "7", "51.0", "1.71", "87"]}
+{"pcdb_id": 500372, "raw": ["500372", "020017", "0", "2014/Apr/24 12:00", "Airflow Developments Ltd", "Airflow", "Duplexvent DV145SE", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "1.04", "80", "2", "21.0", "0.95", "82", "3", "27.0", "0.97", "83", "4", "33.0", "1.07", "83", "5", "39.0", "1.19", "84", "6", "45.0", "1.35", "84", "7", "51.0", "1.55", "84"]}
+{"pcdb_id": 500373, "raw": ["500373", "020027", "0", "2014/Apr/24 12:00", "EnviroVent Ltd", "EnviroVent", "energiSava 250", "", "2013", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.66", "90", "2", "21.0", "0.81", "89", "3", "27.0", "1.01", "87"]}
+{"pcdb_id": 500374, "raw": ["500374", "020090", "0", "2014/Apr/28 10:00", "Elta UK Ltd", "Elta Fans", "VIGO 200M", "ISSUE A", "2013", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.86", "86", "2", "21.0", "1.03", "85", "3", "27.0", "1.22", "83", "4", "33.0", "1.58", "81"]}
+{"pcdb_id": 500375, "raw": ["500375", "020090", "0", "2014/May/21 13:00", "Elta UK Ltd", "Elta Fans", "VIGO 200A", "ISSUE A", "2013", "current", "", "3", "0", "2", "1", "1", "4", "1", "15.0", "0.86", "86", "2", "21.0", "1.03", "85", "3", "27.0", "1.22", "83", "4", "33.0", "1.58", "81"]}
+{"pcdb_id": 500376, "raw": ["500376", "020090", "0", "2014/Apr/28 10:00", "EnviroVent Ltd", "Elta Fans", "VIGO 250", "ISSUE A", "2013", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.66", "90", "2", "21.0", "0.81", "89", "3", "27.0", "1.01", "87"]}
+{"pcdb_id": 500377, "raw": ["500377", "020078", "0", "2014/Jul/01 11:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTR 300/B R", "19592", "2014", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "1.39", "79", "2", "21.0", "1.18", "81", "3", "27.0", "1.12", "83", "4", "33.0", "1.20", "84", "5", "39.0", "1.30", "84", "6", "45.0", "1.46", "83", "7", "51.0", "1.65", "82"]}
+{"pcdb_id": 500378, "raw": ["500378", "020078", "0", "2014/Jul/01 11:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTR 300/B L", "19593", "2014", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "1.39", "79", "2", "21.0", "1.18", "81", "3", "27.0", "1.12", "83", "4", "33.0", "1.20", "84", "5", "39.0", "1.30", "84", "6", "45.0", "1.46", "83", "7", "51.0", "1.65", "82"]}
+{"pcdb_id": 500379, "raw": ["500379", "020078", "0", "2014/Jun/11 14:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTR 200/B R", "14882", "2014", "current", "", "3", "0", "2", "1", "3", "4", "1", "15.0", "1.66", "70", "2", "21.0", "1.56", "71", "3", "27.0", "1.62", "72", "4", "33.0", "1.81", "72"]}
+{"pcdb_id": 500380, "raw": ["500380", "020078", "0", "2014/Jun/11 14:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTR 200/B L", "14883", "2014", "current", "", "3", "0", "2", "1", "3", "4", "1", "15.0", "1.66", "70", "2", "21.0", "1.56", "71", "3", "27.0", "1.62", "72", "4", "33.0", "1.81", "72"]}
+{"pcdb_id": 500381, "raw": ["500381", "020013", "0", "2014/Jun/11 14:00", "Johnson & Starley Ltd", "Johnson & Starley", "Q-VENT CE50", "", "2014", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.26", "", "2", "29.0", "0.28", "", "3", "37.0", "0.35", "", "4", "45.0", "0.42", "", "5", "53.0", "0.54"]}
+{"pcdb_id": 500382, "raw": ["500382", "020092", "0", "2014/Jun/11 14:00", "Renson Fabrications Ltd", "Renson", "C+CUBE", "", "2014", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.23", "", "2", "29.0", "0.19", "", "3", "37.0", "0.27", "", "4", "45.0", "0.24", "", "5", "53.5", "0.23"]}
+{"pcdb_id": 500383, "raw": ["500383", "020092", "0", "2014/Jun/11 14:00", "Renson Fabrications Ltd", "Renson", "CBASE", "", "2014", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.23", "", "2", "29.0", "0.19", "", "3", "37.0", "0.27", "", "4", "45.0", "0.24", "", "5", "53.5", "0.23"]}
+{"pcdb_id": 500384, "raw": ["500384", "020092", "0", "2014/Jun/11 14:00", "Renson Fabrications Ltd", "Renson", "HEALTHBOX II", "", "2014", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.60", "", "2", "29.0", "0.50", "", "3", "37.0", "0.43", "", "4", "45.3", "0.40", "", "5", "53.1", "0.41"]}
+{"pcdb_id": 500385, "raw": ["500385", "020090", "0", "2014/Jul/14 14:00", "Elta UK Ltd", "Elta Fans", "MORI MEV", "Issue A", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.20", "", "5", "53.0", "0.24", "", "6", "61.0", "0.28"]}
+{"pcdb_id": 500386, "raw": ["500386", "020090", "0", "2014/Jul/14 14:00", "Elta UK Ltd", "Elta Fans", "VIGO 400", "ISSUE A", "2014", "current", "", "3", "0", "2", "1", "1", "7", "1", "15.0", "0.59", "92", "2", "21.0", "0.60", "90", "3", "27.0", "0.64", "89", "4", "33.0", "0.78", "89", "5", "39.0", "0.89", "88", "6", "45.0", "1.06", "87", "7", "51.0", "1.27", "86"]}
+{"pcdb_id": 500387, "raw": ["500387", "020007", "0", "2014/Jul/14 14:00", "Titon Hardware Ltd", "Titon", "CME2 Q Plus A", "", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.17", "", "3", "37.0", "0.19", "", "4", "45.0", "0.21", "", "5", "53.0", "0.25", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500388, "raw": ["500388", "020007", "0", "2014/Jul/28 16:30", "Titon Hardware Ltd", "Titon", "CME2 Q Plus A", "", "2014", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.28", "", "2", "29.0", "0.25", "", "3", "37.0", "0.26", "", "4", "45.0", "0.28", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500389, "raw": ["500389", "020007", "0", "2014/Jul/14 14:00", "Titon Hardware Ltd", "Titon", "CME2 Q Plus HA", "", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.17", "", "3", "37.0", "0.19", "", "4", "45.0", "0.21", "", "5", "53.0", "0.25", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500390, "raw": ["500390", "020007", "0", "2014/Jul/28 16:30", "Titon Hardware Ltd", "Titon", "CME2 Q Plus HA", "", "2014", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.28", "", "2", "29.0", "0.25", "", "3", "37.0", "0.26", "", "4", "45.0", "0.28", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500391, "raw": ["500391", "020038", "0", "2014/Jul/14 14:00", "Titon Hardware Ltd", "Beam", "AXCO MEV130 A", "", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.17", "", "3", "37.0", "0.19", "", "4", "45.0", "0.21", "", "5", "53.0", "0.25", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500392, "raw": ["500392", "020038", "0", "2014/Jul/28 16:30", "Titon Hardware Ltd", "Beam", "AXCO MEV130 A", "", "2014", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.28", "", "2", "29.0", "0.25", "", "3", "37.0", "0.26", "", "4", "45.0", "0.28", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500393, "raw": ["500393", "020038", "0", "2014/Jul/14 14:00", "Titon Hardware Ltd", "Beam", "AXCO MEV130 HA", "", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.17", "", "3", "37.0", "0.19", "", "4", "45.0", "0.21", "", "5", "53.0", "0.25", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500394, "raw": ["500394", "020038", "0", "2014/Jul/28 16:30", "Titon Hardware Ltd", "Beam", "AXCO MEV130 HA", "", "2014", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.28", "", "2", "29.0", "0.25", "", "3", "37.0", "0.26", "", "4", "45.0", "0.28", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500397, "raw": ["500397", "020003", "0", "2014/Jul/15 15:00", "The Nuaire Group", "Nuaire", "AP-MVHR-RL", "", "2014", "current", "", "3", "0", "2", "1", "0", "6", "1", "15.0", "0.72", "86", "2", "21.0", "0.77", "86", "3", "27.0", "0.88", "85", "4", "33.0", "1.10", "85", "5", "39.0", "1.29", "85", "6", "45.0", "1.60", "84"]}
+{"pcdb_id": 500398, "raw": ["500398", "020003", "0", "2014/Jul/15 15:00", "The Nuaire Group", "Nuaire", "AP-MVHR-LL", "", "2014", "current", "", "3", "0", "2", "1", "0", "6", "1", "15.0", "0.72", "86", "2", "21.0", "0.77", "86", "3", "27.0", "0.88", "85", "4", "33.0", "1.10", "85", "5", "39.0", "1.29", "85", "6", "45.0", "1.60", "84"]}
+{"pcdb_id": 500402, "raw": ["500402", "020027", "0", "2014/Oct/09 13:00", "EnviroVent Ltd", "EnviroVent", "MEV Spider 2", "Issue A", "2014", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.36", "", "2", "29.0", "0.32", "", "3", "37.0", "0.33", "", "4", "45.0", "0.32", "", "5", "53.0", "0.35", "", "6", "61.0", "0.36"]}
+{"pcdb_id": 500403, "raw": ["500403", "020027", "0", "2014/Oct/09 13:00", "EnviroVent Ltd", "EnviroVent", "energiSava 210", "5153582900-000", "2014", "current", "", "3", "0", "2", "1", "3", "5", "1", "15.0", "0.81", "89", "2", "21.0", "0.82", "87", "3", "27.0", "0.89", "87", "4", "33.0", "1.03", "85", "5", "39.0", "1.22", "85"]}
+{"pcdb_id": 500404, "raw": ["500404", "020078", "0", "2014/Nov/12 12:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTR 500 R", "Ver A", "2014", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "1.44", "71", "2", "29.0", "1.21", "74", "3", "37.0", "1.15", "76", "4", "45.0", "1.18", "78", "5", "53.0", "1.23", "79", "6", "61.0", "1.35", "80", "7", "69.0", "1.53", "81"]}
+{"pcdb_id": 500405, "raw": ["500405", "020078", "0", "2014/Nov/12 12:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTR 500 L", "Ver A", "2014", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "1.44", "71", "2", "29.0", "1.21", "74", "3", "37.0", "1.15", "76", "4", "45.0", "1.18", "78", "5", "53.0", "1.23", "79", "6", "61.0", "1.35", "80", "7", "69.0", "1.53", "81"]}
+{"pcdb_id": 500406, "raw": ["500406", "020078", "0", "2014/Dec/03 12:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTC 200 R", "Ver A", "2014", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.73", "89", "2", "29.0", "0.75", "89", "3", "37.0", "0.81", "89", "4", "45.0", "0.97", "88", "5", "53.0", "1.14", "88"]}
+{"pcdb_id": 500407, "raw": ["500407", "020078", "0", "2014/Dec/03 12:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTC 200 L", "Ver A", "2014", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.73", "89", "2", "29.0", "0.75", "89", "3", "37.0", "0.81", "89", "4", "45.0", "0.97", "88", "5", "53.0", "1.14", "88"]}
+{"pcdb_id": 500408, "raw": ["500408", "020078", "0", "2014/Nov/12 12:00", "Systemair Fans & Spares Ltd", "Systemair", "prio 160EC", "", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.24", "", "2", "29.0", "0.24", "", "3", "37.0", "0.25", "", "4", "45.0", "0.30", "", "5", "53.0", "0.35", "", "6", "61.0", "0.40"]}
+{"pcdb_id": 500409, "raw": ["500409", "020007", "0", "2015/May/18 13:50", "Titon Hardware Ltd", "Titon", "HRV1.25 Q Plus Eco", "", "2014", "current", "", "3", "0", "2", "1", "3", "3", "1", "15.0", "0.68", "87", "2", "21.0", "0.90", "85", "3", "27.0", "1.21", "84"]}
+{"pcdb_id": 500410, "raw": ["500410", "020007", "0", "2015/May/18 13:50", "Titon Hardware Ltd", "Titon", "HRV2.85 Q Plus Eco", "", "2014", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.60", "91", "2", "21.0", "0.62", "90", "3", "27.0", "0.72", "89", "4", "33.0", "0.88", "88", "5", "39.0", "1.06", "87", "6", "45.0", "1.30", "87"]}
+{"pcdb_id": 500411, "raw": ["500411", "020007", "0", "2015/May/18 13:50", "Titon Hardware Ltd", "Titon", "HRV2 Q Plus Eco", "", "2014", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.63", "90", "2", "29.0", "0.67", "90", "3", "37.0", "0.76", "89", "4", "45.0", "0.94", "88", "5", "53.0", "1.14", "87", "6", "61.0", "1.40", "87"]}
+{"pcdb_id": 500412, "raw": ["500412", "020007", "0", "2015/May/18 13:50", "Titon Hardware Ltd", "Titon", "HRV3 Q Plus Eco", "", "2014", "current", "", "3", "0", "2", "1", "3", "5", "2", "29.0", "0.71", "90", "3", "37.0", "0.85", "88", "4", "45.0", "1.04", "87", "5", "53.0", "1.28", "87", "6", "61.0", "1.58", "87"]}
+{"pcdb_id": 500413, "raw": ["500413", "020007", "0", "2015/Jul/15 14:56", "Titon Hardware Ltd", "Titon", "HRV1.35 Q Plus Eco", "", "2015", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.71", "87", "2", "29.0", "0.92", "85", "3", "37.0", "1.19", "85", "4", "45.0", "1.55", "84"]}
+{"pcdb_id": 500414, "raw": ["500414", "020011", "0", "2015/Mar/17 13:10", "Vectaire Ltd", "Vectaire", "WHHR Mini", "", "2014", "current", "", "3", "0", "2", "1", "1", "1", "1", "21.0", "1.40", "82"]}
+{"pcdb_id": 500420, "raw": ["500420", "020007", "0", "2015/May/18 13:50", "Titon Hardware Ltd", "Titon", "HRV2.85 Q Plus", "", "2015", "current", "", "3", "0", "2", "1", "1", "6", "1", "21.0", "0.57", "90", "2", "29.0", "0.59", "89", "3", "37.0", "0.69", "89", "4", "45.0", "0.85", "88", "5", "53.0", "1.03", "87", "6", "61.0", "1.28", "86"]}
+{"pcdb_id": 500421, "raw": ["500421", "020011", "0", "2021/Nov/08 20:30", "Vectaire Ltd", "Vectaire", "EVO250DC", "", "2015", "current", "", "3", "0", "2", "1", "4", "4", "1", "21.0", "0.75", "87", "2", "29.0", "0.89", "86", "3", "37.0", "1.00", "85", "4", "45.0", "1.37", "84"]}
+{"pcdb_id": 500422, "raw": ["500422", "020007", "0", "2015/Jul/15 14:56", "Titon Hardware Ltd", "Titon", "HRV1.75 Q Plus Eco", "", "2015", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.52", "89", "2", "29.0", "0.60", "89", "3", "37.0", "0.73", "88", "4", "45.0", "0.94", "87"]}
+{"pcdb_id": 500423, "raw": ["500423", "020007", "0", "2015/Jul/16 10:25", "Titon Hardware Ltd", "Titon", "HRV10 Q Plus Eco", "", "2015", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.55", "90", "2", "29.0", "0.57", "90", "3", "37.0", "0.65", "89", "4", "45.0", "0.76", "88", "5", "53.0", "0.90", "87", "6", "61.0", "1.09", "86", "7", "69.0", "1.27", "85"]}
+{"pcdb_id": 500424, "raw": ["500424", "020035", "0", "2015/Jul/16 10:25", "Rega Ventilation Ltd", "RegaVent", "250R DC", "", "2015", "current", "", "3", "0", "2", "1", "1", "4", "1", "21.0", "0.64", "88", "2", "29.0", "0.75", "86", "3", "37.0", "0.91", "85", "4", "45.0", "1.16", "85"]}
+{"pcdb_id": 500427, "raw": ["500427", "020030", "0", "2015/Aug/17 12:08", "Aldes", "Aldes", "Dee Fly Cube 300 Micro-watt", "", "2015", "current", "", "3", "0", "2", "1", "3", "5", "3", "37.0", "0.93", "87", "4", "45.0", "1.04", "84", "5", "53.0", "1.25", "84", "6", "61.0", "1.47", "83", "7", "69.0", "1.71", "82"]}
+{"pcdb_id": 500429, "raw": ["500429", "020038", "0", "2015/Sep/15 12:25", "Titon Hardware Ltd", "Beam", "AXCO MVHR C90", "", "2015", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.60", "91", "2", "21.0", "0.62", "90", "3", "27.0", "0.72", "89", "4", "33.0", "0.88", "88", "5", "39.0", "1.06", "87", "6", "45.0", "1.30", "87"]}
+{"pcdb_id": 500430, "raw": ["500430", "020038", "0", "2015/Sep/15 12:25", "Titon Hardware Ltd", "Beam", "AXCO MVHR C65", "", "2015", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.71", "87", "2", "29.0", "0.92", "85", "3", "37.0", "1.19", "85", "4", "45.0", "1.55", "84"]}
+{"pcdb_id": 500431, "raw": ["500431", "020009", "0", "2015/Nov/09 12:00", "Vortice Ltd", "Vortice", "VORT HR 250 NETI", "", "2015", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.60", "88", "2", "29.0", "0.72", "86", "3", "37.0", "0.86", "84", "4", "45.0", "1.12", "83"]}
+{"pcdb_id": 500432, "raw": ["500432", "020009", "0", "2015/Sep/15 12:25", "Vortice Ltd", "Vortice", "VORT HR 350 AVEL", "", "2015", "current", "", "3", "0", "2", "1", "0", "7", "1", "21.0", "0.60", "91", "2", "29.0", "0.63", "90", "3", "37.0", "0.72", "89", "4", "45.0", "0.88", "89", "5", "53.0", "1.05", "88", "6", "61.0", "1.31", "88", "7", "69.0", "1.58", "88"]}
+{"pcdb_id": 500433, "raw": ["500433", "020059", "0", "2015/Sep/15 12:25", "Ventilation Systems PrJSC", "VENTS", "VUT 160 PB EC A11", "", "2010", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.67", "80", "2", "29.0", "0.76", "81", "3", "37.0", "0.93", "82"]}
+{"pcdb_id": 500434, "raw": ["500434", "020059", "0", "2015/Sep/15 12:25", "Ventilation Systems PrJSC", "VENTS", "VUT 350 VB EC A11", "", "2010", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.71", "88", "2", "29.0", "0.64", "88", "3", "37.0", "0.68", "87", "4", "45.0", "0.76", "86", "5", "53.0", "0.86", "86", "6", "61.0", "1.07", "85", "7", "69.0", "1.26", "85"]}
+{"pcdb_id": 500435, "raw": ["500435", "020059", "0", "2015/Sep/15 12:25", "Ventilation Systems PrJSC", "VENTS", "VUT 550 VB EC A11", "", "2010", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.71", "87", "2", "29.0", "0.63", "88", "3", "37.0", "0.63", "88", "4", "45.0", "0.72", "88", "5", "53.0", "0.84", "88", "6", "61.0", "0.98", "87", "7", "69.0", "1.16", "87"]}
+{"pcdb_id": 500436, "raw": ["500436", "020002", "0", "2015/Sep/15 12:25", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic 200ZP", "", "2014", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.67", "84", "2", "29.0", "0.82", "82", "3", "37.0", "1.07", "80"]}
+{"pcdb_id": 500437, "raw": ["500437", "020104", "0", "2015/Oct/20 11:58", "Salda UAB", "Salda", "SMARTY 3X P", "", "2015", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.88", "91", "2", "29.0", "0.83", "91", "3", "37.0", "0.85", "90", "4", "45.0", "0.95", "89", "5", "53.0", "1.08", "89", "6", "61.0", "1.26", "88", "7", "69.0", "1.48", "88"]}
+{"pcdb_id": 500438, "raw": ["500438", "020101", "0", "2015/Nov/11 10:34", "Itho UK Ltd", "Heatrae Sadia", "Advance", "95 060 001", "2015", "current", "", "3", "0", "2", "1", "1", "3", "1", "15.0", "0.50", "89", "2", "21.0", "0.73", "89", "3", "27.0", "1.00", "86"]}
+{"pcdb_id": 500439, "raw": ["500439", "020101", "0", "2015/Oct/20 12:34", "Itho UK Ltd", "Heatrae Sadia", "CVE ECO 2 HP", "95 060 006", "2015", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.18", "", "2", "29.0", "0.17", "", "3", "37.0", "0.18", "", "4", "45.0", "0.20", "", "5", "53.0", "0.22", "", "6", "61.0", "0.27"]}
+{"pcdb_id": 500440, "raw": ["500440", "020101", "0", "2015/Oct/20 12:34", "Itho UK Ltd", "Heatrae Sadia", "CVE ECO 2", "95 060 004", "2015", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.18", "", "2", "29.0", "0.17", "", "3", "37.0", "0.18", "", "4", "45.0", "0.20", "", "5", "53.0", "0.22"]}
+{"pcdb_id": 500441, "raw": ["500441", "020101", "0", "2016/Sep/22 11:45", "Itho UK Ltd", "Heatrae Sadia", "HRU ECO 4 - House", "95 060 002", "2015", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.47", "90", "2", "21.0", "0.53", "90", "3", "27.0", "0.65", "87", "4", "33.0", "0.79", "87", "5", "39.0", "0.94", "87", "6", "45.0", "1.10", "88"]}
+{"pcdb_id": 500442, "raw": ["500442", "020101", "0", "2016/Sep/22 11:45", "Itho UK Ltd", "Heatrae Sadia", "HRU ECO 4 - Apartment", "95 060 003", "2015", "current", "", "3", "0", "2", "1", "3", "6", "1", "15.0", "0.47", "90", "2", "21.0", "0.53", "90", "3", "27.0", "0.65", "87", "4", "33.0", "0.79", "87", "5", "39.0", "0.94", "87", "6", "45.0", "1.10", "88"]}
+{"pcdb_id": 500443, "raw": ["500443", "020007", "0", "2015/Nov/23 10:37", "Titon Hardware Ltd", "Titon", "H200 Q Plus ECO", "", "2015", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.58", "83", "2", "29.0", "0.66", "82", "3", "37.0", "0.80", "80", "4", "45.0", "1.01", "80", "5", "53.0", "1.25", "80", "6", "61.0", "1.58", "82"]}
+{"pcdb_id": 500446, "raw": ["500446", "020013", "0", "2016/Feb/22 14:32", "Johnson & Starley Ltd", "Johnson & Starley", "Q-VENT COMPACT v2", "", "2015", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "1.54", "84", "2", "29.0", "2.00", "82"]}
+{"pcdb_id": 500447, "raw": ["500447", "020002", "0", "2016/Feb/22 15:39", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic Advance S", "405215", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.39", "93", "2", "29.0", "0.46", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.70", "91", "5", "53.0", "0.85", "90", "6", "61.0", "1.07", "89", "7", "69.0", "1.31", "89"]}
+{"pcdb_id": 500448, "raw": ["500448", "020059", "0", "2016/Feb/22 16:03", "Ventilation Systems PrJSC", "VENTS", "VUT 700 H EC eco", "", "2015", "current", "", "3", "0", "2", "1", "0", "7", "1", "21.0", "0.75", "83", "2", "29.0", "0.69", "85", "3", "37.0", "0.73", "86", "4", "45.0", "0.80", "86", "5", "53.0", "0.89", "86", "6", "61.0", "1.08", "85", "7", "69.0", "1.27", "85"]}
+{"pcdb_id": 500449, "raw": ["500449", "020027", "0", "2016/Mar/17 13:49", "Brink Climate Systems B.V.", "EnviroVent", "energiSava 400", "", "2016", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.63", "89", "2", "21.0", "0.61", "89", "3", "27.0", "0.66", "87", "4", "33.0", "0.74", "86", "5", "39.0", "0.84", "85", "6", "45.0", "0.95", "84"]}
+{"pcdb_id": 500450, "raw": ["500450", "020027", "0", "2016/Mar/17 13:49", "Brink Climate Systems B.V.", "EnviroVent", "Slimline 300", "", "2016", "current", "", "3", "0", "2", "1", "1", "6", "1", "15.0", "0.60", "90", "2", "21.0", "0.62", "90", "3", "27.0", "0.71", "87", "4", "33.0", "0.83", "86", "5", "39.0", "0.97", "85", "6", "45.0", "1.12", "84"]}
+{"pcdb_id": 500451, "raw": ["500451", "020027", "0", "2016/Mar/17 13:49", "EnviroVent Ltd", "EnviroVent", "energiSava 200", "Issue A", "2016", "current", "", "3", "0", "2", "1", "0", "5", "1", "21.0", "0.75", "89", "2", "29.0", "0.82", "87", "3", "37.0", "0.96", "85", "4", "45.0", "1.17", "84", "5", "53.0", "1.41", "82"]}
+{"pcdb_id": 500452, "raw": ["500452", "020052", "0", "2016/Apr/12 16:08", "Brook Design Hardware Ltd", "Brookvent", "AIRCYCLE 3.1", "", "2014", "current", "", "3", "0", "2", "1", "1", "7", "1", "21.0", "0.41", "93", "2", "29.0", "0.43", "92", "3", "37.0", "0.51", "91", "4", "45.0", "0.64", "91", "5", "53.0", "0.78", "90", "6", "61.0", "0.98", "89", "7", "69.0", "1.20", "89"]}
+{"pcdb_id": 500453, "raw": ["500453", "020041", "0", "2016/Apr/12 16:08", "Polypipe Ltd", "Polypipe Ventilation", "Silavent AQH240-S", "", "2016", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "0.69", "88", "2", "29.0", "0.84", "85"]}
+{"pcdb_id": 500454, "raw": ["500454", "020041", "0", "2016/Apr/12 16:08", "Polypipe Ltd", "Polypipe Ventilation", "Silavent AQH200-B", "", "2016", "current", "", "3", "0", "2", "1", "3", "2", "1", "21.0", "0.75", "83", "2", "29.0", "0.95", "81"]}
+{"pcdb_id": 500455, "raw": ["500455", "020041", "0", "2016/Apr/12 16:08", "Polypipe Ltd", "Polypipe Ventilation", "Silavent AQH200-S", "", "2016", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "0.72", "87", "2", "29.0", "0.88", "84"]}
+{"pcdb_id": 500456, "raw": ["500456", "020041", "0", "2016/Apr/12 16:08", "Polypipe Ltd", "Polypipe Ventilation", "Silavent AQH240-B", "", "2016", "current", "", "3", "0", "2", "1", "3", "2", "1", "21.0", "0.69", "86", "2", "29.0", "0.84", "83"]}
+{"pcdb_id": 500457, "raw": ["500457", "020030", "0", "2016/Apr/13 11:18", "Aldes", "Aldes", "INSPIRAIR HOME", "SC240 CLASSIC Droite", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.91", "87", "2", "29.0", "1.01", "87", "3", "37.0", "1.18", "85", "4", "45.0", "1.37", "85"]}
+{"pcdb_id": 500458, "raw": ["500458", "020030", "0", "2016/Apr/13 11:18", "Aldes", "Aldes", "INSPIRAIR HOME", "SC240 CLASSIC Gauche", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.91", "87", "2", "29.0", "1.01", "87", "3", "37.0", "1.18", "85", "4", "45.0", "1.37", "85"]}
+{"pcdb_id": 500459, "raw": ["500459", "020030", "0", "2016/Apr/13 11:18", "Aldes", "Aldes", "INSPIRAIR HOME", "SC240 PREMIUM Droite", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.91", "87", "2", "29.0", "1.01", "87", "3", "37.0", "1.18", "85", "4", "45.0", "1.37", "85"]}
+{"pcdb_id": 500460, "raw": ["500460", "020030", "0", "2016/Apr/13 11:18", "Aldes", "Aldes", "INSPIRAIR HOME", "SC240 PREMIUM Gauche", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.91", "87", "2", "29.0", "1.01", "87", "3", "37.0", "1.18", "85", "4", "45.0", "1.37", "85"]}
+{"pcdb_id": 500461, "raw": ["500461", "020030", "0", "2016/Apr/13 11:18", "Aldes", "Aldes", "INSPIRAIR HOME", "SC370 CLASSIC Droite", "2016", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.90", "91", "2", "29.0", "0.92", "91", "3", "37.0", "1.04", "90", "4", "45.0", "1.21", "89", "5", "53.0", "1.39", "89", "6", "61.0", "1.64", "89"]}
+{"pcdb_id": 500462, "raw": ["500462", "020030", "0", "2016/Apr/13 11:18", "Aldes", "Aldes", "INSPIRAIR HOME", "SC370 CLASSIC Gauche", "2016", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.90", "91", "2", "29.0", "0.92", "91", "3", "37.0", "1.04", "90", "4", "45.0", "1.21", "89", "5", "53.0", "1.39", "89", "6", "61.0", "1.64", "89"]}
+{"pcdb_id": 500463, "raw": ["500463", "020030", "0", "2016/Apr/13 11:18", "Aldes", "Aldes", "INSPIRAIR HOME", "SC370 PREMIUM Droite", "2016", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.90", "91", "2", "29.0", "0.92", "91", "3", "37.0", "1.04", "90", "4", "45.0", "1.21", "89", "5", "53.0", "1.39", "89", "6", "61.0", "1.64", "89"]}
+{"pcdb_id": 500464, "raw": ["500464", "020030", "0", "2016/Apr/13 11:18", "Aldes", "Aldes", "INSPIRAIR HOME", "SC370 PREMIUM Gauche", "2016", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.90", "91", "2", "29.0", "0.92", "91", "3", "37.0", "1.04", "90", "4", "45.0", "1.21", "89", "5", "53.0", "1.39", "89", "6", "61.0", "1.64", "89"]}
+{"pcdb_id": 500465, "raw": ["500465", "020047", "0", "2016/Apr/14 12:26", "Mitsubishi Electric Europe B.V.", "Mitsubishi", "LOSSNAY", "VL-220CZGV-EB", "2016", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "0.65", "85", "2", "29.0", "0.62", "84"]}
+{"pcdb_id": 500466, "raw": ["500466", "020090", "0", "2016/Apr/14 12:26", "Elta UK Ltd", "Elta Fans", "VIGO 350", "Issue A", "2016", "current", "", "3", "0", "2", "1", "0", "3", "1", "21.0", "0.98", "89", "2", "29.0", "1.15", "88", "3", "37.0", "1.42", "87"]}
+{"pcdb_id": 500467, "raw": ["500467", "020090", "0", "2016/Apr/14 12:26", "Elta UK Ltd", "Elta Fans", "VIGO 550", "Issue A", "2016", "current", "", "3", "0", "2", "1", "0", "7", "1", "21.0", "0.56", "93", "2", "29.0", "0.58", "93", "3", "37.0", "0.63", "91", "4", "45.0", "0.74", "91", "5", "53.0", "0.87", "90", "6", "61.0", "1.04", "89", "7", "69.0", "1.22", "89"]}
+{"pcdb_id": 500468, "raw": ["500468", "020042", "0", "2016/Apr/14 12:26", "Brink Climate Systems B.V.", "Brink", "Renovent Sky 150+ EU", "", "2013", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.75", "88", "2", "29.0", "0.86", "85", "3", "37.0", "1.04", "84"]}
+{"pcdb_id": 500469, "raw": ["500469", "020042", "0", "2016/Apr/14 12:26", "Brink Climate Systems B.V.", "Brink", "Renovent Excellent 300 4-0 EU", "", "2013", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.66", "89", "2", "29.0", "0.62", "87", "3", "37.0", "0.66", "86", "4", "45.0", "0.74", "85", "5", "53.0", "0.86", "84", "6", "61.0", "1.04", "83", "7", "69.0", "1.21", "83"]}
+{"pcdb_id": 500470, "raw": ["500470", "020002", "0", "2016/May/18 15:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic C", "", "2016", "current", "", "3", "0", "2", "1", "3", "3", "1", "15.0", "0.78", "85", "2", "21.0", "0.89", "85", "3", "27.0", "1.03", "82"]}
+{"pcdb_id": 500471, "raw": ["500471", "020002", "0", "2016/May/18 15:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic High Flow", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.58", "88", "2", "29.0", "0.55", "90", "3", "37.0", "0.60", "91", "4", "45.0", "0.69", "91", "5", "53.0", "0.78", "90", "6", "61.0", "0.92", "90", "7", "69.0", "1.09", "90"]}
+{"pcdb_id": 500472, "raw": ["500472", "020002", "0", "2016/May/18 15:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic FH", "", "2016", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.53", "89", "2", "29.0", "0.60", "88", "3", "37.0", "0.71", "86", "4", "45.0", "0.88", "84", "5", "53.0", "1.07", "84"]}
+{"pcdb_id": 500473, "raw": ["500473", "020002", "0", "2016/May/18 15:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent Plus", "", "2015", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.25", "", "2", "29.0", "0.22", "", "3", "37.0", "0.22", "", "4", "45.0", "0.22", "", "5", "53.0", "0.25", "", "6", "61.0", "0.27"]}
+{"pcdb_id": 500476, "raw": ["500476", "020007", "0", "2016/May/19 09:16", "Titon Hardware Ltd", "Titon", "HRV10.25 Q Plus Eco", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.43", "90", "2", "29.0", "0.46", "88", "3", "37.0", "0.54", "87", "4", "45.0", "0.65", "86", "5", "53.0", "0.79", "85", "6", "61.0", "0.96", "84", "7", "69.0", "1.16", "83"]}
+{"pcdb_id": 500477, "raw": ["500477", "020108", "0", "2016/Jun/20 12:52", "Aermec SpA", "Aermec", "RePuro 170", "", "2012", "current", "", "3", "0", "2", "1", "1", "3", "1", "21.0", "0.94", "88", "2", "29.0", "0.96", "86", "3", "37.0", "1.14", "84"]}
+{"pcdb_id": 500478, "raw": ["500478", "020108", "0", "2016/Jun/22 11:15", "Aermec SpA", "Aermec", "RePuro 350", "", "2012", "current", "", "3", "0", "2", "1", "1", "6", "1", "21.0", "0.77", "88", "2", "29.0", "0.76", "88", "3", "37.0", "0.83", "87", "4", "45.0", "0.96", "86", "5", "53.0", "1.12", "85", "6", "61.0", "1.40", "85"]}
+{"pcdb_id": 500479, "raw": ["500479", "020004", "0", "2016/Jul/18 12:36", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 180 GB Luxe PH", "", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.72", "89", "2", "29.0", "0.79", "86", "3", "37.0", "0.94", "84", "4", "45.0", "1.20", "82"]}
+{"pcdb_id": 500480, "raw": ["500480", "020004", "0", "2016/Nov/16 14:15", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir Q350 GB ST", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.60", "96", "2", "29.0", "0.53", "95", "3", "37.0", "0.57", "94", "4", "45.0", "0.64", "94", "5", "53.0", "0.72", "93", "6", "61.0", "0.89", "93", "7", "69.0", "1.03", "93"]}
+{"pcdb_id": 500481, "raw": ["500481", "020004", "0", "2016/Nov/16 14:15", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir Q450 GB ST", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.54", "96", "2", "29.0", "0.53", "95", "3", "37.0", "0.55", "94", "4", "45.0", "0.62", "94", "5", "53.0", "0.73", "93", "6", "61.0", "0.86", "93", "7", "69.0", "1.04", "93"]}
+{"pcdb_id": 500482, "raw": ["500482", "020004", "0", "2016/Nov/16 14:15", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir Q600 GB ST", "", "2016", "current", "", "3", "0", "2", "2", "3", "7", "1", "21.0", "0.63", "96", "2", "29.0", "0.60", "95", "3", "37.0", "0.63", "94", "4", "45.0", "0.71", "94", "5", "53.0", "0.79", "93", "6", "61.0", "0.91", "93", "7", "69.0", "1.06", "93"]}
+{"pcdb_id": 500483, "raw": ["500483", "020027", "0", "2016/Aug/16 14:31", "Brink Climate Systems B.V.", "EnviroVent", "Slimline 150", "", "2016", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.75", "88", "2", "29.0", "0.86", "85", "3", "37.0", "1.04", "84"]}
+{"pcdb_id": 500484, "raw": ["500484", "020027", "0", "2016/Aug/16 14:31", "Brink Climate Systems B.V.", "EnviroVent", "energiSava 300", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.66", "89", "2", "29.0", "0.62", "87", "3", "37.0", "0.66", "86", "4", "45.0", "0.74", "85", "5", "53.0", "0.86", "84", "6", "61.0", "1.04", "83", "7", "69.0", "1.21", "83"]}
+{"pcdb_id": 500485, "raw": ["500485", "020101", "0", "2016/Sep/26 11:26", "Baxi Heating UK Ltd", "Heatrae Sadia", "Advance Plus", "95060007", "2015", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.48", "86", "2", "29.0", "0.72", "85", "3", "37.0", "0.99", "83", "4", "45.0", "1.35", "82"]}
+{"pcdb_id": 500486, "raw": ["500486", "020083", "0", "2016/Sep/26 11:23", "Redring Xpelair Group Ltd", "Xpelair", "Stratum 275Q", "", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.73", "88", "2", "29.0", "0.85", "86", "3", "37.0", "1.02", "85", "4", "45.0", "1.27", "83"]}
+{"pcdb_id": 500487, "raw": ["500487", "020069", "0", "2017/Jan/16 09:30", "Earth Save Products Ltd", "ESP", "Ecocent", "ESP400-010-200L(D)", "2008", "current", "", "1", "0", "2", "1", "", "2", "1", "21.0", "0.51", "", "2", "29.0", "0.48"]}
+{"pcdb_id": 500488, "raw": ["500488", "020069", "0", "2016/Oct/04 14:06", "Earth Save Products Ltd", "ESP", "Ecocent", "ESP400-010-300L(D)", "2008", "current", "", "1", "0", "2", "1", "", "6", "2", "29.0", "0.70", "", "3", "37.0", "0.70", "", "4", "45.0", "0.70", "", "5", "53.0", "0.70", "", "6", "61.0", "0.70", "", "7", "69.0", "0.70"]}
+{"pcdb_id": 500489, "raw": ["500489", "020069", "0", "2016/Oct/04 14:05", "Earth Save Products Ltd", "ESP", "Ecocent Maxi", "ESP400-015-300L(D)", "2008", "current", "", "1", "0", "2", "1", "", "6", "2", "29.0", "0.70", "", "3", "37.0", "0.70", "", "4", "45.0", "0.70", "", "5", "53.0", "0.70", "", "6", "61.0", "0.70", "", "7", "69.0", "0.70"]}
+{"pcdb_id": 500490, "raw": ["500490", "020017", "0", "2016/Sep/26 11:19", "Airflow Developments Ltd", "Airflow", "DV250 Entro", "", "2016", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.70", "82", "2", "29.0", "0.78", "81", "3", "37.0", "0.93", "80", "4", "45.0", "1.20", "79", "5", "53.0", "1.38", "79"]}
+{"pcdb_id": 500491, "raw": ["500491", "020017", "0", "2016/Sep/26 11:11", "Airflow Developments Ltd", "Airflow", "DV300 Entro", "", "2016", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.58", "84", "2", "29.0", "0.62", "82", "3", "37.0", "0.70", "81", "4", "45.0", "0.84", "80", "5", "53.0", "0.99", "79"]}
+{"pcdb_id": 500492, "raw": ["500492", "020017", "0", "2016/Sep/26 11:03", "Airflow Developments Ltd", "Airflow", "DV400 Entro", "", "2016", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.59", "84", "2", "29.0", "0.61", "82", "3", "37.0", "0.71", "81", "4", "45.0", "0.87", "80", "5", "53.0", "1.03", "79", "6", "61.0", "1.27", "79"]}
+{"pcdb_id": 500493, "raw": ["500493", "020111", "0", "2016/Sep/26 11:00", "Vaventis BV", "Vaventis", "Fresh-R", "", "2014", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "0.87", "87", "2", "29.0", "1.11", "84"]}
+{"pcdb_id": 500495, "raw": ["500495", "020078", "0", "2016/Oct/24 14:00", "Systemair Fans & Spares Ltd", "Systemair", "SAVE VTC 700", "", "2012", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.70", "71", "3", "37.0", "0.70", "73", "4", "45.0", "0.83", "75", "5", "53.0", "0.91", "77", "6", "61.0", "1.11", "78", "7", "69.0", "1.31", "79"]}
+{"pcdb_id": 500496, "raw": ["500496", "020104", "0", "2016/Oct/31 12:28", "Salda UAB", "Salda", "SMARTY 2X V 1.1", "", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.89", "88", "2", "29.0", "0.98", "88", "3", "37.0", "1.17", "87", "4", "45.0", "1.50", "86"]}
+{"pcdb_id": 500497, "raw": ["500497", "020104", "0", "2016/Oct/31 12:29", "Salda UAB", "Salda", "SMARTY 3X V 1.1", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.91", "87", "2", "29.0", "0.78", "88", "3", "37.0", "0.83", "87", "4", "45.0", "0.90", "87", "5", "53.0", "1.03", "86", "6", "61.0", "1.21", "86", "7", "69.0", "1.40", "85"]}
+{"pcdb_id": 500498, "raw": ["500498", "020003", "0", "2017/Jan/17 12:36", "The Nuaire Group", "Nuaire", "MRXBOX-ECO3", "", "2016", "current", "", "3", "0", "2", "1", "1", "7", "1", "21.0", "0.47", "91", "2", "29.0", "0.50", "91", "3", "37.0", "0.58", "90", "4", "45.0", "0.71", "89", "5", "53.0", "0.86", "89", "6", "61.0", "1.08", "88", "7", "69.0", "1.33", "88"]}
+{"pcdb_id": 500499, "raw": ["500499", "020003", "0", "2017/Jan/17 12:51", "The Nuaire Group", "Nuaire", "MRXBOX-ECO2", "", "2016", "current", "", "3", "0", "2", "1", "1", "6", "1", "21.0", "0.47", "89", "2", "29.0", "0.54", "88", "3", "37.0", "0.66", "87", "4", "45.0", "0.85", "87", "5", "53.0", "1.05", "86", "6", "61.0", "1.34", "86"]}
+{"pcdb_id": 500500, "raw": ["500500", "020003", "0", "2017/Jan/17 13:02", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO2", "", "2016", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.52", "90", "2", "29.0", "0.59", "89", "3", "37.0", "0.77", "87", "4", "45.0", "1.00", "86", "5", "53.0", "1.23", "86"]}
+{"pcdb_id": 500501, "raw": ["500501", "020003", "0", "2017/Jan/17 13:06", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO3", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.50", "90", "2", "29.0", "0.53", "90", "3", "37.0", "0.60", "89", "4", "45.0", "0.75", "88", "5", "53.0", "0.92", "88", "6", "61.0", "1.10", "87", "7", "69.0", "1.36", "87"]}
+{"pcdb_id": 500502, "raw": ["500502", "020003", "0", "2017/Jan/17 16:12", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO4", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.62", "94", "2", "29.0", "0.62", "93", "3", "37.0", "0.66", "93", "4", "45.0", "0.79", "92", "5", "53.0", "0.94", "91", "6", "61.0", "1.15", "91", "7", "69.0", "1.41", "91"]}
+{"pcdb_id": 500503, "raw": ["500503", "020104", "0", "2017/Mar/14 16:41", "Salda UAB", "Salda", "SMARTY 2X P 1.1", "", "2016", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.91", "86", "2", "29.0", "0.88", "84", "3", "37.0", "0.96", "82", "4", "45.0", "1.10", "81", "5", "53.0", "1.26", "81", "6", "61.0", "1.50", "80"]}
+{"pcdb_id": 500504, "raw": ["500504", "020108", "0", "2017/Mar/20 14:18", "Aermec SpA", "Aermec", "RePuro 100", "", "2012", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "0.91", "88", "2", "29.0", "0.96", "86"]}
+{"pcdb_id": 500505, "raw": ["500505", "020108", "0", "2017/Mar/20 14:18", "Aermec SpA", "Aermec", "RePuro 250", "", "2012", "current", "", "3", "0", "2", "1", "1", "6", "1", "21.0", "0.75", "88", "2", "29.0", "0.73", "88", "3", "37.0", "0.80", "87", "4", "45.0", "0.96", "86", "5", "53.0", "1.12", "85", "6", "61.0", "1.36", "85"]}
+{"pcdb_id": 500506, "raw": ["500506", "020108", "0", "2017/Mar/20 14:18", "Aermec SpA", "Aermec", "RePuro 450", "", "2012", "current", "", "3", "0", "2", "1", "1", "7", "1", "21.0", "0.84", "90", "2", "29.0", "0.77", "90", "3", "37.0", "0.80", "89", "4", "45.0", "0.90", "88", "5", "53.0", "1.03", "88", "6", "61.0", "1.22", "87", "7", "69.0", "1.42", "87"]}
+{"pcdb_id": 500507, "raw": ["500507", "020108", "0", "2017/Mar/20 14:19", "Aermec SpA", "Aermec", "RePuro 550", "", "2012", "current", "", "3", "0", "2", "1", "1", "7", "1", "21.0", "0.83", "90", "2", "29.0", "0.78", "90", "3", "37.0", "0.82", "89", "4", "45.0", "0.91", "88", "5", "53.0", "1.07", "88", "6", "61.0", "1.24", "87", "7", "69.0", "1.44", "87"]}
+{"pcdb_id": 500508, "raw": ["500508", "020108", "0", "2017/Mar/20 14:19", "Aermec SpA", "Aermec", "RePuro 650", "", "2012", "current", "", "3", "0", "2", "1", "1", "7", "1", "21.0", "0.85", "90", "2", "29.0", "0.79", "90", "3", "37.0", "0.84", "89", "4", "45.0", "0.92", "88", "5", "53.0", "1.04", "88", "6", "61.0", "1.28", "87", "7", "69.0", "1.45", "87"]}
+{"pcdb_id": 500509, "raw": ["500509", "020017", "0", "2017/Mar/14 16:31", "Airflow Developments Ltd", "Airflow", "DV96 Adroit", "", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.87", "89", "2", "29.0", "0.98", "88", "3", "37.0", "1.13", "87", "4", "45.0", "1.40", "86"]}
+{"pcdb_id": 500510, "raw": ["500510", "020017", "0", "2017/Mar/14 16:31", "Airflow Developments Ltd", "Airflow", "DV110 Adroit", "", "2016", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.83", "91", "2", "29.0", "0.85", "90", "3", "37.0", "0.97", "89", "4", "45.0", "1.16", "89", "5", "53.0", "1.40", "88"]}
+{"pcdb_id": 500511, "raw": ["500511", "020017", "0", "2017/Mar/14 16:31", "Airflow Developments Ltd", "Airflow", "DV145 Adroit", "", "2016", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "1.11", "92", "2", "29.0", "1.05", "92", "3", "37.0", "1.05", "91", "4", "45.0", "1.19", "90", "5", "53.0", "1.31", "90", "6", "61.0", "1.48", "90"]}
+{"pcdb_id": 500512, "raw": ["500512", "020041", "0", "2017/Mar/14 16:33", "Polypipe Ltd", "Domus Ventilation", "HRX2D", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.61", "94", "2", "29.0", "0.57", "94", "3", "37.0", "0.62", "92", "4", "45.0", "0.70", "92", "5", "53.0", "0.82", "91", "6", "61.0", "0.98", "90", "7", "69.0", "1.15", "90"]}
+{"pcdb_id": 500513, "raw": ["500513", "020041", "0", "2017/Mar/14 16:33", "Polypipe Ltd", "Domus Ventilation", "HRXD", "", "2017", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.66", "87", "2", "29.0", "0.73", "86", "3", "37.0", "0.85", "85", "4", "45.0", "1.05", "84", "5", "53.0", "1.27", "83"]}
+{"pcdb_id": 500514, "raw": ["500514", "020083", "0", "2017/Apr/26 09:20", "Xpelair", "Xpelair", "Natural Air 180", "93256AW", "2017", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.68", "86", "2", "29.0", "0.83", "84", "3", "37.0", "1.04", "84"]}
+{"pcdb_id": 500515, "raw": ["500515", "020115", "0", "2017/May/17 16:57", "Vectaire Ltd", "AVT", "HRH250", "", "2015", "current", "", "3", "0", "2", "1", "1", "4", "1", "21.0", "0.75", "87", "2", "29.0", "0.89", "86", "3", "37.0", "1.00", "85", "4", "45.0", "1.37", "84"]}
+{"pcdb_id": 500516, "raw": ["500516", "020115", "0", "2017/May/17 16:54", "Vectaire Ltd", "AVT", "HRH/MOD", "", "2014", "current", "", "3", "0", "2", "1", "1", "1", "1", "21.0", "1.40", "82"]}
+{"pcdb_id": 500517, "raw": ["500517", "020115", "0", "2017/May/17 16:52", "Vectaire Ltd", "AVT", "HRV130", "", "2013", "current", "", "3", "0", "2", "1", "1", "7", "1", "21.0", "0.45", "92", "2", "29.0", "0.47", "92", "3", "37.0", "0.54", "91", "4", "45.0", "0.66", "90", "5", "53.0", "0.80", "90", "6", "61.0", "0.99", "89", "7", "69.0", "1.21", "89"]}
+{"pcdb_id": 500518, "raw": ["500518", "020115", "0", "2017/May/17 17:14", "Vectaire Ltd", "AVT", "SL125/2EC", "", "2011", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.20", "", "2", "29.0", "0.26", "", "3", "37.0", "0.34", "", "4", "45.0", "0.44", "", "5", "53.0", "0.55"]}
+{"pcdb_id": 500519, "raw": ["500519", "020003", "0", "2017/May/17 17:27", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO-LP1", "", "2017", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.59", "76", "2", "29.0", "0.71", "76", "3", "37.0", "0.91", "78", "4", "45.0", "1.15", "79", "5", "53.0", "1.40", "79"]}
+{"pcdb_id": 500520, "raw": ["500520", "020041", "0", "2017/May/22 09:52", "Polypipe Ltd", "Domus Ventilation", "CMX", "", "2013", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.24", "", "2", "29.0", "0.25", "", "3", "37.0", "0.29", "", "4", "45.0", "0.35", "", "5", "53.0", "0.43", "", "6", "61.0", "0.54"]}
+{"pcdb_id": 500521, "raw": ["500521", "020041", "0", "2017/May/17 17:49", "Polypipe Ltd", "Domus Ventilation", "AQH200-B", "", "2016", "current", "", "3", "0", "2", "1", "3", "2", "1", "21.0", "0.75", "83", "2", "29.0", "0.95", "81"]}
+{"pcdb_id": 500522, "raw": ["500522", "020041", "0", "2017/May/22 09:45", "Polypipe Ltd", "Domus Ventilation", "AQH200-S", "", "2016", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "0.72", "87", "2", "29.0", "0.88", "84"]}
+{"pcdb_id": 500523, "raw": ["500523", "020041", "0", "2017/May/17 17:40", "Polypipe Ltd", "Domus Ventilation", "AQH240-B", "", "2016", "current", "", "3", "0", "2", "1", "3", "2", "1", "21.0", "0.69", "86", "2", "29.0", "0.84", "83"]}
+{"pcdb_id": 500524, "raw": ["500524", "020041", "0", "2017/May/17 17:37", "Polypipe Ltd", "Domus Ventilation", "AQH240-S", "", "2016", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "0.69", "88", "2", "29.0", "0.84", "85"]}
+{"pcdb_id": 500525, "raw": ["500525", "020030", "0", "2017/May/17 17:33", "Aldes", "Aldes", "COMPACT MICRO-WATT SP", "", "2015", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.29", "", "2", "29.0", "0.26", "", "3", "37.0", "0.24", "", "4", "45.0", "0.34"]}
+{"pcdb_id": 500526, "raw": ["500526", "020030", "0", "2017/May/17 17:31", "Aldes", "Aldes", "SFP300", "", "2015", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.30", "", "2", "29.0", "0.25", "", "3", "37.0", "0.22", "", "4", "45.0", "0.33", "", "5", "53.0", "0.32", "", "6", "61.0", "0.33"]}
+{"pcdb_id": 500527, "raw": ["500527", "020115", "0", "2017/May/17 16:48", "Vectaire Ltd", "AVT", "HRV100", "", "2013", "current", "", "3", "0", "2", "1", "1", "4", "1", "21.0", "0.51", "93", "2", "29.0", "0.61", "91", "3", "37.0", "0.75", "90", "4", "45.0", "0.92", "89"]}
+{"pcdb_id": 500528, "raw": ["500528", "020092", "0", "2017/Jul/24 12:31", "Renson Fabrications Ltd", "Renson", "Endura Delta 330", "", "2017", "current", "", "3", "0", "2", "2", "3", "7", "1", "21.0", "0.75", "91", "2", "29.0", "0.72", "90", "3", "37.0", "0.75", "89", "4", "45.0", "0.86", "88", "5", "53.0", "0.96", "88", "6", "61.0", "1.16", "87", "7", "69.0", "1.43", "87"]}
+{"pcdb_id": 500529, "raw": ["500529", "020092", "0", "2017/Jul/24 12:45", "Renson Fabrications Ltd", "Renson", "Endura Delta 380", "", "2017", "current", "", "3", "0", "2", "2", "3", "7", "1", "21.0", "0.64", "91", "2", "29.0", "0.59", "90", "3", "37.0", "0.62", "89", "4", "45.0", "0.71", "88", "5", "53.0", "0.81", "87", "6", "61.0", "0.98", "87", "7", "69.0", "1.16", "87"]}
+{"pcdb_id": 500530, "raw": ["500530", "020011", "0", "2022/Sep/23 15:41", "Vectaire Ltd", "Vectaire", "WHHR-Maxi Plus BY", "", "2017", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "0.56", "89", "2", "29.0", "0.47", "89", "3", "37.0", "0.50", "88", "4", "45.0", "0.56", "87", "5", "53.0", "0.66", "86", "6", "61.0", "0.78", "85", "7", "69.0", "0.94", "84"]}
+{"pcdb_id": 500531, "raw": ["500531", "020092", "0", "2017/Aug/24 11:41", "Renson Fabrications Ltd", "Renson", "E+ndura 300", "", "2015", "current", "", "1", "1", "2", "2", "", "6", "1", "21.0", "0.38", "", "2", "29.0", "0.32", "", "3", "37.0", "0.29", "", "4", "45.0", "0.25", "", "5", "53.0", "0.28", "", "6", "61.0", "0.28"]}
+{"pcdb_id": 500533, "raw": ["500533", "020043", "0", "2017/Oct/11 15:42", "Total Home Environment Ltd", "Genvex", "ECO 375 TS OPT251 PET", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.65", "86", "2", "29.0", "0.63", "86", "3", "37.0", "0.64", "87", "4", "45.0", "0.74", "86", "5", "53.0", "0.85", "86", "6", "61.0", "1.02", "86", "7", "69.0", "1.19", "85"]}
+{"pcdb_id": 500534, "raw": ["500534", "020043", "0", "2017/Oct/26 14:15", "Total Home Environment Ltd", "Genvex", "ECO 190 CS", "", "2016", "current", "", "3", "0", "2", "1", "0", "3", "1", "21.0", "0.67", "90", "2", "29.0", "0.71", "88", "3", "37.0", "0.80", "86"]}
+{"pcdb_id": 500539, "raw": ["500539", "020065", "0", "2017/Dec/19 13:17", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "LWZ 280", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.52", "90", "2", "29.0", "0.55", "90", "3", "37.0", "0.62", "90", "4", "45.0", "0.72", "89", "5", "53.0", "0.88", "88", "6", "61.0", "1.07", "89", "7", "69.0", "1.28", "88"]}
+{"pcdb_id": 500540, "raw": ["500540", "020065", "0", "2017/Dec/19 13:14", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "LWZ 280 Enthalpie", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.48", "84", "2", "29.0", "0.46", "84", "3", "37.0", "0.55", "82", "4", "45.0", "0.64", "80", "5", "53.0", "0.78", "79", "6", "61.0", "0.99", "77", "7", "69.0", "1.12", "77"]}
+{"pcdb_id": 500541, "raw": ["500541", "020065", "0", "2017/Dec/19 13:11", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "LWZ 180", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.52", "90", "2", "29.0", "0.55", "90", "3", "37.0", "0.62", "90", "4", "45.0", "0.72", "89", "5", "53.0", "0.88", "88", "6", "61.0", "1.07", "89", "7", "69.0", "1.28", "88"]}
+{"pcdb_id": 500542, "raw": ["500542", "020065", "0", "2017/Dec/19 13:05", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "LWZ 180 Enthalpie", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.48", "84", "2", "29.0", "0.46", "84", "3", "37.0", "0.55", "82", "4", "45.0", "0.64", "80", "5", "53.0", "0.78", "79", "6", "61.0", "0.99", "77", "7", "69.0", "1.12", "77"]}
+{"pcdb_id": 500543, "raw": ["500543", "020031", "0", "2018/Feb/08 13:45", "Genvex AB", "NIBE", "ERS 20-250", "", "2017", "current", "", "3", "0", "2", "1", "0", "5", "1", "21.0", "0.81", "81", "2", "29.0", "0.83", "81", "3", "37.0", "0.97", "81", "4", "45.0", "1.18", "80", "5", "53.0", "1.45", "80"]}
+{"pcdb_id": 500544, "raw": ["500544", "020031", "0", "2018/Jan/15 15:22", "NIBE Energy Systems Ltd", "NIBE", "F730", "", "2017", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.70", "", "2", "29.0", "0.64", "", "3", "37.0", "0.62", "", "4", "45.0", "0.68", "", "5", "53.0", "0.72", "", "6", "61.0", "0.81"]}
+{"pcdb_id": 500545, "raw": ["500545", "020031", "0", "2018/Jan/15 15:17", "GENVEX AB", "NIBE", "ERS 10-400", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.79", "89", "2", "29.0", "0.73", "89", "3", "37.0", "0.75", "88", "4", "45.0", "0.83", "87", "5", "53.0", "0.94", "87", "6", "61.0", "1.09", "86", "7", "69.0", "1.28", "86"]}
+{"pcdb_id": 500546, "raw": ["500546", "020084", "0", "2018/Jan/15 15:08", "FRÄNKISCHE ROHRWERKE", "FRÄNKISCHE", "profi-air 180 flat", "", "2016", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.92", "92", "2", "29.0", "0.98", "91", "3", "37.0", "1.13", "90", "4", "45.0", "1.41", "89"]}
+{"pcdb_id": 500547, "raw": ["500547", "020084", "0", "2021/Oct/20 09:58", "FRÄNKISCHE ROHRWERKE", "FRÄNKISCHE", "profi-air 180 sensor", "", "2016", "obsolete", "", "3", "0", "2", "1", "1", "4", "1", "21.0", "0.85", "82", "2", "29.0", "0.92", "82", "3", "37.0", "1.05", "81", "4", "45.0", "1.23", "81"]}
+{"pcdb_id": 500548, "raw": ["500548", "020084", "0", "2021/Oct/20 09:58", "FRÄNKISCHE ROHRWERKE", "FRÄNKISCHE", "profi-air 300 sensor", "", "2016", "obsolete", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.59", "82", "2", "29.0", "0.58", "82", "3", "37.0", "0.66", "83", "4", "45.0", "0.83", "83", "5", "53.0", "0.94", "83", "6", "61.0", "1.14", "83"]}
+{"pcdb_id": 500549, "raw": ["500549", "020066", "0", "2025/Sep/15 16:33", "J Pichler GmbH", "Pichler", "PKOM4A", "", "2015", "current", "", "3", "1", "2", "1", "3", "6", "1", "21.0", "1.10", "89", "2", "29.0", "0.99", "89", "3", "37.0", "1.00", "90", "4", "45.0", "1.11", "90", "5", "53.0", "1.24", "90", "6", "61.0", "1.45", "89"]}
+{"pcdb_id": 500550, "raw": ["500550", "020112", "0", "2018/Mar/20 15:06", "Blauberg UK Ltd", "Blauberg", "KOMFORT EC SB 350", "", "2015", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.66", "85", "2", "29.0", "0.60", "84", "3", "37.0", "0.63", "84", "4", "45.0", "0.71", "83", "5", "53.0", "0.82", "83", "6", "61.0", "0.97", "83", "7", "69.0", "1.16", "82"]}
+{"pcdb_id": 500551, "raw": ["500551", "020112", "0", "2018/Mar/20 15:01", "Blauberg UK Ltd", "Blauberg", "KOMFORT EC SB 550 S14", "", "2015", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.71", "84", "2", "29.0", "0.65", "85", "3", "37.0", "0.68", "85", "4", "45.0", "0.76", "85", "5", "53.0", "0.88", "85", "6", "61.0", "1.02", "85", "7", "69.0", "1.20", "84"]}
+{"pcdb_id": 500552, "raw": ["500552", "020112", "0", "2018/Mar/20 14:46", "Blauberg UK Ltd", "Blauberg", "KOMFORT EC S5B 270 S14", "", "2017", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.72", "81", "2", "29.0", "0.83", "80", "3", "37.0", "1.01", "80", "4", "45.0", "1.28", "79"]}
+{"pcdb_id": 500553, "raw": ["500553", "020030", "0", "2018/Apr/23 14:00", "Aldes", "Aldes", "EasyHOME PureAIR COMPACT PREMIUM", "", "2018", "current", "", "1", "0", "2", "2", "", "4", "1", "21.0", "0.28", "", "2", "29.0", "0.24", "", "3", "37.0", "0.24", "", "4", "45.0", "0.24"]}
+{"pcdb_id": 500554, "raw": ["500554", "020030", "0", "2018/Apr/23 13:45", "Aldes", "Aldes", "EasyHOME PureAIR COMPACT CLASSIC", "", "2018", "current", "", "1", "0", "2", "2", "", "3", "1", "21.0", "0.59", "", "2", "29.0", "0.44", "", "3", "37.0", "0.38"]}
+{"pcdb_id": 500555, "raw": ["500555", "020030", "0", "2018/Apr/23 13:48", "Aldes", "Aldes", "EasyHOME HYGRO COMPACT PREMIUM SP", "", "2018", "current", "", "1", "0", "2", "2", "", "4", "1", "21.0", "0.26", "", "2", "29.0", "0.33", "", "3", "37.0", "0.27", "", "4", "45.0", "0.25"]}
+{"pcdb_id": 500556, "raw": ["500556", "020122", "0", "2018/Apr/25 12:44", "Vortice Ltd", "INVAVENT", "MAXI", "", "2009", "current", "", "1", "0", "2", "1", "", "6", "1", "15.0", "0.24", "", "2", "21.0", "0.21", "", "3", "27.0", "0.20", "", "4", "33.0", "0.23", "", "5", "39.0", "0.25", "", "6", "45.0", "0.29"]}
+{"pcdb_id": 500557, "raw": ["500557", "020122", "0", "2018/Apr/25 12:42", "Vortice Ltd.", "INVAVENT", "200", "", "2013", "current", "", "3", "0", "2", "1", "1", "3", "1", "21.0", "0.61", "90", "2", "29.0", "0.80", "89", "3", "37.0", "1.06", "87"]}
+{"pcdb_id": 500558, "raw": ["500558", "020122", "0", "2018/May/21 09:20", "Vortice", "INVAVENT", "350", "", "2015", "current", "", "3", "0", "2", "1", "0", "7", "1", "21.0", "0.60", "91", "2", "29.0", "0.63", "90", "3", "37.0", "0.72", "89", "4", "45.0", "0.88", "89", "5", "53.0", "1.05", "88", "6", "61.0", "1.31", "88", "7", "69.0", "1.58", "88"]}
+{"pcdb_id": 500559, "raw": ["500559", "020065", "0", "2018/Apr/23 14:14", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "LWZ 130", "237805", "2017", "current", "", "3", "0", "2", "1", "1", "3", "1", "21.0", "0.82", "91", "2", "29.0", "0.99", "89", "3", "37.0", "1.13", "87"]}
+{"pcdb_id": 500560, "raw": ["500560", "020065", "0", "2018/Apr/23 14:11", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "LWZ 130 Enthalpie", "237806", "2017", "current", "", "3", "0", "2", "1", "1", "3", "1", "21.0", "0.78", "79", "2", "29.0", "0.89", "75", "3", "37.0", "1.07", "72"]}
+{"pcdb_id": 500561, "raw": ["500561", "020122", "0", "2018/Apr/25 12:45", "Blauberg", "INVAVENT", "550", "", "2010", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.71", "84", "2", "29.0", "0.65", "85", "3", "37.0", "0.68", "85", "4", "45.0", "0.76", "85", "5", "53.0", "0.88", "85", "6", "61.0", "1.02", "85", "7", "69.0", "1.20", "84"]}
+{"pcdb_id": 500562, "raw": ["500562", "020002", "0", "2018/May/25 08:35", "Vent Axia Ltd", "Vent Axia", "MVHR 75 R", "475695", "2018", "current", "", "3", "0", "2", "1", "1", "5", "1", "21.0", "0.58", "90", "2", "29.0", "0.70", "88", "3", "37.0", "0.83", "86", "4", "45.0", "1.05", "85", "5", "53.0", "1.32", "84"]}
+{"pcdb_id": 500563, "raw": ["500563", "020030", "0", "2018/May/15 13:10", "Aldes", "Aldes", "EasyHOME HYGRO PREMIUM SP", "", "2018", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.26", "", "2", "29.0", "0.23", "", "3", "37.0", "0.33", "", "4", "45.0", "0.31", "", "5", "51.0", "0.31"]}
+{"pcdb_id": 500564, "raw": ["500564", "020013", "0", "2018/May/25 08:09", "Johnson & Starley Ltd", "Johnson & Starley", "Q-VENT MEZZO", "", "2018", "current", "", "3", "0", "2", "1", "1", "4", "1", "21.0", "0.72", "88", "2", "29.0", "0.83", "85", "3", "37.0", "1.02", "83", "4", "45.0", "1.27", "81"]}
+{"pcdb_id": 500565, "raw": ["500565", "020002", "0", "2018/May/25 08:26", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic Advance S", "405215A", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "94", "2", "29.0", "0.61", "93", "3", "37.0", "0.66", "93", "4", "45.0", "0.83", "92", "5", "53.0", "0.96", "91", "6", "61.0", "1.18", "90", "7", "69.0", "1.39", "90"]}
+{"pcdb_id": 500566, "raw": ["500566", "020011", "0", "2018/Jun/25 11:08", "Vectaire Ltd", "Vectaire", "MBOX200/2DC", "", "2017", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.28", "", "2", "29.0", "0.27", "", "3", "37.0", "0.28", "", "4", "45.0", "0.36", "", "5", "53.0", "0.42", "", "6", "61.0", "0.52"]}
+{"pcdb_id": 500567, "raw": ["500567", "020007", "0", "2018/Jun/25 11:12", "Titon Hardware Ltd", "Titon", "HRV1.6 Q Plus Eco", "", "2018", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.51", "89", "2", "29.0", "0.58", "87", "3", "37.0", "0.70", "86", "4", "45.0", "0.90", "84", "5", "53.0", "1.07", "83", "6", "61.0", "1.34", "82"]}
+{"pcdb_id": 500568, "raw": ["500568", "020027", "0", "2018/Jul/24 10:20", "Titon Hardware Ltd", "EnviroVent", "energiSava 325", "", "2018", "current", "", "3", "0", "2", "1", "1", "6", "1", "21.0", "0.60", "91", "2", "29.0", "0.62", "90", "3", "37.0", "0.72", "89", "4", "45.0", "0.88", "88", "5", "53.0", "1.06", "87", "6", "61.0", "1.30", "87"]}
+{"pcdb_id": 500569, "raw": ["500569", "020003", "0", "2018/Jul/24 10:24", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO-LP2", "", "2018", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.48", "78", "2", "29.0", "0.61", "79", "3", "37.0", "0.77", "79", "4", "45.0", "1.01", "79", "5", "53.0", "1.26", "79"]}
+{"pcdb_id": 500570, "raw": ["500570", "020027", "0", "2018/Jul/24 10:19", "Titon Hardware Ltd", "EnviroVent", "energiSava 500", "", "2016", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.43", "90", "2", "29.0", "0.46", "88", "3", "37.0", "0.54", "87", "4", "45.0", "0.65", "86", "5", "53.0", "0.79", "85", "6", "61.0", "0.96", "84", "7", "69.0", "1.16", "83"]}
+{"pcdb_id": 500571, "raw": ["500571", "020050", "0", "2018/Aug/07 10:19", "Aereco Ltd", "Aereco", "DXA Exclusive with condensate pump", "DXA1240EX", "2017", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.69", "92", "2", "29.0", "0.69", "91", "3", "37.0", "0.74", "90", "4", "45.0", "0.90", "90", "5", "53.0", "1.05", "89", "6", "61.0", "1.27", "89"]}
+{"pcdb_id": 500572, "raw": ["500572", "020050", "0", "2018/Aug/07 10:19", "Aereco Ltd", "Aereco", "DXA Exclusive with siphon", "DXA1247EX", "2017", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.69", "92", "2", "29.0", "0.69", "91", "3", "37.0", "0.74", "90", "4", "45.0", "0.90", "90", "5", "53.0", "1.05", "89", "6", "61.0", "1.27", "89"]}
+{"pcdb_id": 500573, "raw": ["500573", "020004", "0", "2018/Sep/20 13:33", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 160 EXP", "", "2012", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.84", "85", "2", "29.0", "0.96", "83", "3", "37.0", "1.15", "82"]}
+{"pcdb_id": 500574, "raw": ["500574", "020083", "0", "2018/Sep/20 13:27", "Redring Xpelair Group Ltd", "Xpelair", "Natural Air 350", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.40", "90", "2", "29.0", "0.43", "89", "3", "37.0", "0.49", "88", "4", "45.0", "0.61", "87", "5", "53.0", "0.75", "86", "6", "61.0", "0.93", "86", "7", "69.0", "1.16", "85"]}
+{"pcdb_id": 500575, "raw": ["500575", "020011", "0", "2021/Apr/30 19:13", "Vectaire Ltd", "Vectaire", "EVO350-BY", "", "2018", "current", "", "3", "0", "2", "1", "4", "5", "1", "21.0", "0.72", "87", "2", "29.0", "0.75", "85", "3", "37.0", "0.85", "84", "4", "45.0", "1.04", "83", "5", "53.0", "1.23", "82"]}
+{"pcdb_id": 500576, "raw": ["500576", "020041", "0", "2018/Oct/24 07:36", "Polypipe Ltd", "Domus Ventilation", "CMX-MULTI", "", "2018", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.14", "", "2", "29.0", "0.16", "", "3", "37.0", "0.20", "", "4", "45.0", "0.25", "", "5", "53.0", "0.31", "", "6", "61.0", "0.37"]}
+{"pcdb_id": 500577, "raw": ["500577", "020011", "0", "2021/Apr/30 19:13", "Vectaire Ltd", "Vectaire", "STUDIO-BY", "", "2018", "current", "", "3", "0", "2", "1", "4", "3", "1", "21.0", "0.93", "79", "2", "29.0", "1.09", "78", "3", "37.0", "1.36", "77"]}
+{"pcdb_id": 500578, "raw": ["500578", "020041", "0", "2018/Oct/29 11:29", "Polypipe Ltd", "Domus Ventilation", "HRXE", "", "2018", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.57", "90", "2", "29.0", "0.64", "88", "3", "37.0", "0.81", "87", "4", "45.0", "1.05", "86", "5", "53.0", "1.29", "86"]}
+{"pcdb_id": 500579, "raw": ["500579", "020018", "0", "2018/Nov/26 10:35", "Volution Ventilation UK Ltd", "National Ventilation", "MON-HRU/330-100", "", "2018", "current", "", "3", "0", "2", "1", "1", "6", "1", "21.0", "0.59", "91", "2", "29.0", "0.63", "89", "3", "37.0", "0.72", "88", "4", "45.0", "0.88", "86", "5", "53.0", "1.05", "85", "6", "61.0", "1.28", "84"]}
+{"pcdb_id": 500580, "raw": ["500580", "020018", "0", "2018/Nov/27 10:58", "Volution Ventilation UK Ltd", "National Ventilation", "MON-HRU/350-150i", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.39", "93", "2", "29.0", "0.46", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.70", "91", "5", "53.0", "0.85", "90", "6", "61.0", "1.07", "89", "7", "69.0", "1.31", "89"]}
+{"pcdb_id": 500581, "raw": ["500581", "020018", "0", "2018/Nov/26 10:50", "Volution Ventilation UK Ltd", "National Ventilation", "MON-HRU/230-100", "", "2018", "current", "", "3", "0", "2", "1", "1", "5", "1", "21.0", "0.58", "90", "2", "29.0", "0.70", "88", "3", "37.0", "0.83", "86", "4", "45.0", "1.05", "85", "5", "53.0", "1.32", "84"]}
+{"pcdb_id": 500582, "raw": ["500582", "020018", "0", "2018/Nov/27 10:56", "Volution Ventilation UK Ltd", "National Ventilation", "MON-HRU/400-150", "", "2018", "current", "", "3", "0", "2", "1", "1", "6", "1", "21.0", "0.40", "94", "2", "29.0", "0.43", "94", "3", "37.0", "0.53", "94", "4", "45.0", "0.65", "93", "5", "53.0", "0.78", "93", "6", "61.0", "0.93", "92"]}
+{"pcdb_id": 500583, "raw": ["500583", "020130", "0", "2018/Nov/27 11:25", "Vero Duco N.V.", "Duco", "DucoBox Silent UK", "00004229", "2013", "current", "", "1", "0", "2", "1", "", "6", "1", "21.4", "0.31", "", "2", "29.0", "0.26", "", "3", "37.0", "0.25", "", "4", "45.0", "0.26", "", "5", "53.6", "0.29", "", "6", "61.1", "0.32"]}
+{"pcdb_id": 500584, "raw": ["500584", "020130", "0", "2018/Nov/27 11:25", "Vero Duco N.V.", "Duco", "DucoBox Focus UK", "00004448", "2013", "current", "", "1", "0", "2", "1", "", "6", "1", "21.4", "0.31", "", "2", "29.0", "0.26", "", "3", "37.0", "0.25", "", "4", "45.0", "0.26", "", "5", "53.6", "0.29", "", "6", "61.1", "0.32"]}
+{"pcdb_id": 500585, "raw": ["500585", "020092", "0", "2018/Nov/26 12:23", "Renson Fabrications Ltd", "Renson", "Healthbox 3.0", "", "2018", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.46", "", "2", "29.0", "0.36", "", "3", "37.0", "0.31", "", "4", "45.0", "0.28", "", "5", "53.0", "0.28", "", "6", "61.0", "0.28"]}
+{"pcdb_id": 500591, "raw": ["500591", "020092", "0", "2018/Dec/13 09:10", "Renson Fabrications Ltd", "Renson", "Endura Delta 450", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.62", "91", "2", "29.0", "0.59", "90", "3", "37.0", "0.62", "89", "4", "45.0", "0.71", "88", "5", "53.0", "0.83", "87", "6", "61.0", "0.99", "86", "7", "69.0", "1.18", "86"]}
+{"pcdb_id": 500592, "raw": ["500592", "020050", "0", "2018/Dec/13 09:09", "Aereco Ltd", "Aereco", "V5S Premium", "V5S 1131", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.40", "", "2", "29.0", "0.33", "", "3", "37.0", "0.38", "", "4", "45.0", "0.34", "", "5", "53.0", "0.36", "", "6", "61.0", "0.36"]}
+{"pcdb_id": 500593, "raw": ["500593", "020122", "0", "2019/Jan/23 15:04", "Inventum BV", "JOULE", "Victorum", "62010020", "2016", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.32", "", "2", "29.0", "0.29", "", "3", "37.0", "0.29", "", "4", "45.0", "0.33", "", "5", "53.0", "0.39", "", "6", "61.0", "0.45"]}
+{"pcdb_id": 500594, "raw": ["500594", "020052", "0", "2019/Feb/25 12:50", "Brook Design Hardware Ltd", "Brookvent", "Aircycle 1.3", "", "2018", "current", "", "3", "0", "2", "1", "4", "4", "1", "21.0", "0.57", "90", "2", "29.0", "0.68", "87", "3", "37.0", "0.85", "85", "4", "45.0", "1.10", "84"]}
+{"pcdb_id": 500595, "raw": ["500595", "020052", "0", "2019/Feb/25 12:49", "Brook Design Hardware Ltd", "Brookvent", "Aircycle 1.3+", "", "2018", "current", "", "3", "0", "2", "1", "4", "4", "1", "21.0", "0.45", "87", "2", "29.0", "0.54", "84", "3", "37.0", "0.67", "83", "4", "45.0", "0.87", "81"]}
+{"pcdb_id": 500596, "raw": ["500596", "020020", "0", "2019/Feb/22 09:25", "Orcon B.V.", "Orcon", "HRC-350-MaxComfort", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.54", "93", "2", "29.0", "0.52", "93", "3", "37.0", "0.55", "92", "4", "45.0", "0.62", "92", "5", "53.0", "0.72", "92", "6", "61.0", "0.84", "92", "7", "69.0", "1.00", "91"]}
+{"pcdb_id": 500597, "raw": ["500597", "020020", "0", "2019/Feb/22 09:19", "Orcon B.V.", "Orcon", "HRC-450-MaxComfort", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.47", "92", "2", "29.0", "0.46", "93", "3", "37.0", "0.50", "93", "4", "45.0", "0.57", "92", "5", "53.0", "0.67", "92", "6", "61.0", "0.79", "92", "7", "69.0", "0.93", "91"]}
+{"pcdb_id": 500598, "raw": ["500598", "020007", "0", "2019/Feb/22 09:43", "Titon Hardware Ltd", "Titon", "HRV20 Q Plus Eco", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.48", "88", "2", "29.0", "0.49", "88", "3", "37.0", "0.53", "87", "4", "45.0", "0.63", "86", "5", "53.0", "0.74", "85", "6", "61.0", "0.90", "83", "7", "69.0", "1.08", "82"]}
+{"pcdb_id": 500599, "raw": ["500599", "020130", "0", "2022/Jul/26 10:18", "Vero Duco N.V.", "Duco", "DucoBox Energy Premium 400 - 2ZS - L", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.58", "91", "3", "37.0", "0.63", "90", "4", "45.0", "0.75", "89", "5", "53.0", "0.87", "89", "6", "61.0", "1.03", "88", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500600, "raw": ["500600", "020130", "0", "2022/Jul/26 10:18", "Vero Duco N.V.", "Duco", "DucoBox Energy Premium 325 - 1ZS - L", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.58", "91", "3", "37.0", "0.63", "90", "4", "45.0", "0.75", "89", "5", "53.0", "0.87", "89", "6", "61.0", "1.03", "88", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500601, "raw": ["500601", "020007", "0", "2019/Feb/22 09:37", "Titon Hardware Ltd", "Titon", "CME3 Q Plus A", "", "2019", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.18", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.19", "", "5", "53.0", "0.21", "", "6", "61.0", "0.25"]}
+{"pcdb_id": 500602, "raw": ["500602", "020007", "0", "2019/Feb/22 09:37", "Titon Hardware Ltd", "Titon", "CME3 Q Plus A", "", "2019", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.27", "", "2", "29.0", "0.25", "", "3", "37.0", "0.27", "", "4", "45.0", "0.29", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500603, "raw": ["500603", "020007", "0", "2019/Feb/22 09:35", "Titon Hardware Ltd", "Titon", "CME3 Q Plus HA", "", "2019", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.18", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.19", "", "5", "53.0", "0.21", "", "6", "61.0", "0.25"]}
+{"pcdb_id": 500604, "raw": ["500604", "020007", "0", "2019/Feb/22 09:35", "Titon Hardware Ltd", "Titon", "CME3 Q Plus HA", "", "2019", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.27", "", "2", "29.0", "0.25", "", "3", "37.0", "0.27", "", "4", "45.0", "0.29", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500605, "raw": ["500605", "020007", "0", "2019/Feb/22 09:32", "Titon Hardware Ltd", "Titon", "CME3 Q Plus HA LS", "", "2019", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.18", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.19", "", "5", "53.0", "0.21", "", "6", "61.0", "0.25"]}
+{"pcdb_id": 500606, "raw": ["500606", "020007", "0", "2019/Feb/22 09:32", "Titon Hardware Ltd", "Titon", "CME3 Q Plus HA LS", "", "2019", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.27", "", "2", "29.0", "0.25", "", "3", "37.0", "0.27", "", "4", "45.0", "0.29", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500607, "raw": ["500607", "020070", "0", "2019/Feb/20 13:45", "Soler and Palau Ltd", "S & P", "OZEO FLAT H Ecowatt", "9050344601 - 31/2018", "2018", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.42", "", "2", "29.0", "0.35", "", "3", "37.0", "0.34", "", "4", "45.0", "0.34", "", "5", "53.0", "0.35"]}
+{"pcdb_id": 500608, "raw": ["500608", "020070", "0", "2019/Feb/20 13:44", "Soler and Palau Ltd", "S & P", "OZEO H Ecowatt 2", "9050473300 - 41/2018", "2018", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.26", "", "2", "29.0", "0.31", "", "3", "37.0", "0.33", "", "4", "45.0", "0.37", "", "5", "53.0", "0.41", "", "6", "61.0", "0.42"]}
+{"pcdb_id": 500609, "raw": ["500609", "020073", "0", "2019/Apr/25 12:49", "Dantherm Air Handling A/S", "Dantherm", "HCV400 P1 – A – BP – RH", "", "2018", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.84", "93", "2", "29.0", "0.80", "93", "3", "37.0", "0.87", "92", "4", "45.0", "1.01", "92", "5", "53.0", "1.18", "91", "6", "61.0", "1.42", "91"]}
+{"pcdb_id": 500610, "raw": ["500610", "020133", "0", "2019/Mar/26 12:25", "Comfortzone AB", "Comfortzone", "EX35", "", "2013", "current", "", "1", "1", "2", "1", "", "4", "1", "21.0", "0.75", "", "2", "29.0", "0.68", "", "3", "37.0", "0.71", "", "4", "45.0", "0.82"]}
+{"pcdb_id": 500611, "raw": ["500611", "020133", "0", "2019/Mar/26 12:16", "Comfortzone AB", "Comfortzone", "EX50", "", "2013", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.75", "", "2", "29.0", "0.68", "", "3", "37.0", "0.71", "", "4", "45.0", "0.82", "", "5", "53.0", "0.92", "", "6", "61.0", "1.13"]}
+{"pcdb_id": 500612, "raw": ["500612", "020042", "0", "2019/Apr/25 12:56", "Brink Climate Systems B.V.", "Brink", "Flair 325 4/0 R EU", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.55", "92", "2", "29.0", "0.52", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.63", "90", "5", "53.0", "0.73", "90", "6", "61.0", "0.86", "89", "7", "69.0", "1.00", "89"]}
+{"pcdb_id": 500613, "raw": ["500613", "020042", "0", "2019/Apr/25 14:11", "Brink Climate Systems B.V.", "Brink", "Flair 400 4/0 R EU", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.48", "92", "2", "29.0", "0.49", "91", "3", "37.0", "0.53", "90", "4", "45.0", "0.63", "90", "5", "53.0", "0.74", "90", "6", "61.0", "0.90", "89", "7", "69.0", "1.08", "89"]}
+{"pcdb_id": 500614, "raw": ["500614", "020003", "0", "2019/Apr/15 14:49", "The Nuaire Group", "Nuaire", "MEV-X", "", "2019", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.25", "", "2", "29.0", "0.22", "", "3", "37.0", "0.23", "", "4", "45.0", "0.29", "", "5", "53.0", "0.35", "", "6", "61.0", "0.43"]}
+{"pcdb_id": 500615, "raw": ["500615", "020027", "0", "2019/May/02 12:07", "Brink Climate Systems BV", "EnviroVent", "EnergiSava 300B", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.66", "89", "2", "29.0", "0.62", "87", "3", "37.0", "0.66", "86", "4", "45.0", "0.74", "85", "5", "53.0", "0.86", "84", "6", "61.0", "1.04", "83", "7", "69.0", "1.21", "83"]}
+{"pcdb_id": 500616, "raw": ["500616", "020007", "0", "2019/May/08 11:44", "Titon Hardware Ltd", "Titon", "HRV20 HE Q Plus Eco", "", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.52", "91", "2", "29.0", "0.53", "91", "3", "37.0", "0.58", "90", "4", "45.0", "0.68", "90", "5", "53.0", "0.79", "89", "6", "61.0", "0.95", "89", "7", "69.0", "1.15", "88"]}
+{"pcdb_id": 500617, "raw": ["500617", "020038", "0", "2019/Jun/10 13:52", "Titon Hardware Ltd", "Beam", "AXCO MVHR C170", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.52", "91", "2", "29.0", "0.53", "91", "3", "37.0", "0.58", "90", "4", "45.0", "0.68", "90", "5", "53.0", "0.79", "89", "6", "61.0", "0.95", "89", "7", "69.0", "1.15", "88"]}
+{"pcdb_id": 500618, "raw": ["500618", "020084", "0", "2019/Aug/12 11:52", "FRÄNKISCHE ROHRWERKE", "FRÄNKISCHE", "profi-air 250 flex", "", "2019", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.84", "93", "2", "29.0", "0.80", "93", "3", "37.0", "0.87", "92", "4", "45.0", "1.01", "92", "5", "53.0", "1.18", "91", "6", "61.0", "1.42", "91"]}
+{"pcdb_id": 500619, "raw": ["500619", "020124", "0", "2019/Aug/08 14:47", "Orca Energija d.o.o.", "ORCA", "MAXI 350", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.62", "80", "2", "29.0", "0.56", "79", "3", "37.0", "0.61", "78", "4", "45.0", "0.72", "77", "5", "53.0", "0.87", "76", "6", "61.0", "1.07", "75", "7", "69.0", "1.32", "72"]}
+{"pcdb_id": 500620, "raw": ["500620", "020124", "0", "2019/Aug/08 14:42", "Orca Energija d.o.o.", "ORCA", "MAXI 550", "", "2017", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.63", "88", "3", "37.0", "0.63", "88", "4", "45.0", "0.72", "88", "5", "53.0", "0.84", "88", "6", "61.0", "0.98", "87", "7", "69.0", "1.16", "87"]}
+{"pcdb_id": 500621, "raw": ["500621", "020004", "0", "2019/Sep/12 11:47", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 155 WM", "", "2019", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.56", "92", "2", "29.0", "0.69", "91", "3", "37.0", "0.88", "90", "4", "45.0", "1.15", "89", "5", "53.0", "1.41", "88"]}
+{"pcdb_id": 500622, "raw": ["500622", "020004", "0", "2019/Sep/12 11:51", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 155 WMe", "", "2019", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.50", "90", "2", "29.0", "0.62", "88", "3", "37.0", "0.80", "86", "4", "45.0", "1.05", "85", "5", "53.0", "1.31", "84"]}
+{"pcdb_id": 500623, "raw": ["500623", "020004", "0", "2019/Sep/12 11:55", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 155 CM", "", "2019", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.57", "92", "2", "29.0", "0.71", "91", "3", "37.0", "0.92", "90"]}
+{"pcdb_id": 500624, "raw": ["500624", "020004", "0", "2019/Sep/13 09:35", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir 185 WM", "", "2019", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.57", "92", "2", "29.0", "0.64", "91", "3", "37.0", "0.76", "91", "4", "45.0", "0.96", "91"]}
+{"pcdb_id": 500625, "raw": ["500625", "020003", "0", "2019/Nov/27 11:11", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO5", "", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.63", "90", "2", "29.0", "0.61", "89", "3", "37.0", "0.68", "88", "4", "45.0", "0.79", "87", "5", "53.0", "0.91", "86", "6", "61.0", "1.09", "85", "7", "69.0", "1.27", "85"]}
+{"pcdb_id": 500626, "raw": ["500626", "020078", "0", "2020/Jan/03 10:55", "Systemair Fans & Spares Ltd", "Systemair", "VTR 100/B LITE", "", "2019", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "1.18", "77", "2", "29.0", "1.16", "77", "3", "37.0", "1.27", "76", "4", "45.0", "1.50", "75"]}
+{"pcdb_id": 500627, "raw": ["500627", "020139", "0", "2024/Dec/11 17:35", "Brink Climate Systems", "Ubbink", "Vigor W400 4/0 R GB", "", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.48", "92", "2", "29.0", "0.49", "91", "3", "37.0", "0.53", "90", "4", "45.0", "0.63", "90", "5", "53.0", "0.74", "90", "6", "61.0", "0.90", "89", "7", "69.0", "1.08", "89"]}
+{"pcdb_id": 500628, "raw": ["500628", "020139", "0", "2024/Dec/11 17:36", "Brink Climate Systems", "Ubbink", "Vigor W325 4/0 R GB", "", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.55", "92", "2", "29.0", "0.52", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.63", "90", "5", "53.0", "0.73", "90", "6", "61.0", "0.86", "89", "7", "69.0", "1.00", "89"]}
+{"pcdb_id": 500629, "raw": ["500629", "020139", "0", "2025/Jan/06 11:36", "Brink Climate Systems", "Ubbink", "F150", "", "2013", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.75", "88", "2", "29.0", "0.86", "85", "3", "37.0", "1.04", "84"]}
+{"pcdb_id": 500630, "raw": ["500630", "020139", "0", "2024/Nov/14 16:05", "Ubbink UK Ltd", "Ubbink", "F300", "", "2013", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.60", "90", "2", "29.0", "0.62", "90", "3", "37.0", "0.71", "87", "4", "45.0", "0.83", "86", "5", "53.0", "0.97", "85", "6", "61.0", "1.12", "84"]}
+{"pcdb_id": 500631, "raw": ["500631", "020003", "0", "2020/Mar/05 13:59", "The Nuaire Group", "Nuaire", "MEV-ECO", "", "2019", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.17", "", "3", "37.0", "0.20", "", "4", "45.0", "0.24", "", "5", "53.0", "0.30", "", "6", "61.0", "0.35"]}
+{"pcdb_id": 500632, "raw": ["500632", "020141", "0", "2020/Mar/13 15:54", "Blauberg", "WiseAir", "EC 350", "", "2020", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.66", "85", "2", "29.0", "0.60", "84", "3", "37.0", "0.63", "84", "4", "45.0", "0.71", "83", "5", "53.0", "0.82", "83", "6", "61.0", "0.97", "83", "7", "69.0", "1.16", "82"]}
+{"pcdb_id": 500633, "raw": ["500633", "020141", "0", "2020/Mar/13 15:51", "Blauberg", "WiseAir", "EC 550", "", "2020", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.71", "84", "2", "29.0", "0.65", "85", "3", "37.0", "0.68", "85", "4", "45.0", "0.76", "85", "5", "53.0", "0.88", "85", "6", "61.0", "1.02", "85", "7", "69.0", "1.20", "84"]}
+{"pcdb_id": 500634, "raw": ["500634", "020050", "0", "2020/May/05 12:13", "Aereco", "Aereco", "V5S Premium", "V5S1131 Semi-Rigid", "2014", "current", "", "1", "0", "2", "1", "", "5", "1", "21.0", "0.40", "", "2", "29.0", "0.35", "", "3", "37.0", "0.38", "", "4", "45.0", "0.36", "", "5", "53.0", "0.36"]}
+{"pcdb_id": 500635, "raw": ["500635", "020143", "0", "2020/May/11 12:37", "Thessla Green Sp. z o. o.", "THESSLAGREEN", "AirPack 4", "300h", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.78", "89", "2", "29.0", "0.76", "89", "3", "37.0", "0.78", "89", "4", "45.0", "0.87", "88", "5", "53.0", "0.99", "87", "6", "61.0", "1.15", "86", "7", "69.0", "1.36", "84"]}
+{"pcdb_id": 500636, "raw": ["500636", "020143", "0", "2020/May/11 12:33", "Thessla Green Sp. z o. o.", "THESSLAGREEN", "AirPack 4", "400h", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.79", "90", "2", "29.0", "0.75", "90", "3", "37.0", "0.78", "89", "4", "45.0", "0.89", "89", "5", "53.0", "1.01", "88", "6", "61.0", "1.19", "87", "7", "69.0", "1.40", "86"]}
+{"pcdb_id": 500637, "raw": ["500637", "020143", "0", "2020/May/11 12:28", "Thessla Green Sp. z o. o.", "THESSLAGREEN", "AirPack 4", "500h", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.81", "90", "2", "29.0", "0.73", "89", "3", "37.0", "0.78", "89", "4", "45.0", "0.88", "88", "5", "53.0", "0.99", "88", "6", "61.0", "1.14", "87", "7", "69.0", "1.37", "87"]}
+{"pcdb_id": 500638, "raw": ["500638", "020031", "0", "2020/Jun/23 10:32", "GENVEX AB", "NIBE", "ERS S10-400", "", "2020", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.79", "89", "2", "29.0", "0.73", "89", "3", "37.0", "0.75", "88", "4", "45.0", "0.83", "87", "5", "53.0", "0.94", "87", "6", "61.0", "1.09", "86", "7", "69.0", "1.28", "86"]}
+{"pcdb_id": 500639, "raw": ["500639", "020146", "0", "2020/Aug/17 10:51", "BUVA rationele bouwproducten BV", "BUVA Ratione Bouwprodukten BV", "EcoStream", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.57", "93", "2", "29.0", "0.53", "92", "3", "37.0", "0.56", "92", "4", "45.0", "0.64", "91", "5", "53.0", "0.73", "91", "6", "61.0", "0.87", "90", "7", "69.0", "1.02", "89"]}
+{"pcdb_id": 500640, "raw": ["500640", "020145", "0", "2023/Aug/25 15:17", "KERS Innovations UK Ltd", "KERS", "KERS MEV-W230", "", "2014", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.51", "", "2", "29.0", "0.57", "", "3", "37.0", "0.65", "", "4", "45.0", "0.84", "", "5", "53.0", "1.01", "", "6", "61.0", "1.26"]}
+{"pcdb_id": 500641, "raw": ["500641", "020017", "0", "2020/Sep/16 10:06", "Airflow Developments Ltd", "Airflow", "Duplexvent DV65 Entro-V", "", "2019", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "1.07", "81", "2", "29.0", "1.12", "81", "3", "37.0", "1.24", "81"]}
+{"pcdb_id": 500642, "raw": ["500642", "020017", "0", "2020/Sep/16 09:48", "Airflow Developments Ltd", "Airflow", "Duplexvent DV82 Entro-V", "", "2019", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.95", "79", "2", "29.0", "0.92", "80", "3", "37.0", "0.98", "80", "4", "45.0", "1.13", "80", "5", "53.0", "1.35", "80", "6", "61.0", "1.64", "80"]}
+{"pcdb_id": 500643, "raw": ["500643", "020017", "0", "2020/Sep/16 09:40", "Airflow Developments Ltd", "Airflow", "Duplexvent DV130 Entro-V", "", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.68", "83", "2", "29.0", "0.64", "83", "3", "37.0", "0.67", "83", "4", "45.0", "0.79", "84", "5", "53.0", "0.92", "83", "6", "61.0", "1.11", "83", "7", "69.0", "1.35", "83"]}
+{"pcdb_id": 500644, "raw": ["500644", "020002", "0", "2020/Nov/03 14:46", "Vent Axia Ltd", "Vent Axia", "MVDC - MS (2020)", "437634C", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.15", "", "2", "29.0", "0.14", "", "3", "37.0", "0.16", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500645, "raw": ["500645", "020002", "0", "2020/Nov/03 14:57", "Vent Axia Ltd", "Vent Axia", "MVDC - MSH (2020)", "443298B", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.15", "", "2", "29.0", "0.14", "", "3", "37.0", "0.16", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500646, "raw": ["500646", "020002", "0", "2020/Oct/22 15:10", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent H", "445655B", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500647, "raw": ["500647", "020002", "0", "2020/Oct/22 15:10", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent HX", "495360", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500648, "raw": ["500648", "020002", "0", "2020/Oct/22 15:12", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent HXCO2", "495361", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500649, "raw": ["500649", "020002", "0", "2020/Oct/22 15:13", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent Plus H", "407849A", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500650, "raw": ["500650", "020002", "0", "2020/Oct/22 14:53", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent Plus HX", "495362", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500651, "raw": ["500651", "020002", "0", "2020/Oct/22 15:05", "Vent Axia Ltd", "Vent Axia", "Sentinel Multivent Plus HXCO2", "495363", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500674, "raw": ["500674", "020018", "0", "2020/Dec/08 14:21", "Vent-Axia", "National Ventilation", "MON-MEVDC400", "", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.15", "", "2", "29.0", "0.14", "", "3", "37.0", "0.16", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500675, "raw": ["500675", "020018", "0", "2020/Dec/08 14:46", "Vent-Axia", "National Ventilation", "MON-MEVDCH400", "", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.15", "", "2", "29.0", "0.14", "", "3", "37.0", "0.16", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500676, "raw": ["500676", "020048", "0", "2020/Dec/08 14:55", "Vent-Axia", "Manrose", "MANI2000B", "", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.15", "", "2", "29.0", "0.14", "", "3", "37.0", "0.16", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500677, "raw": ["500677", "020041", "0", "2020/Dec/10 10:26", "Polypipe Ltd", "Domus Ventilation", "HRXE-HERA", "", "2020", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.52", "90", "2", "29.0", "0.59", "89", "3", "37.0", "0.77", "87", "4", "45.0", "1.00", "86", "5", "53.0", "1.23", "86"]}
+{"pcdb_id": 500678, "raw": ["500678", "020041", "0", "2020/Dec/10 10:39", "Polypipe Ltd", "Domus Ventilation", "HRXE-AURA", "", "2020", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.50", "90", "2", "29.0", "0.53", "90", "3", "37.0", "0.60", "89", "4", "45.0", "0.75", "88", "5", "53.0", "0.92", "88", "6", "61.0", "1.10", "87", "7", "69.0", "1.36", "87"]}
+{"pcdb_id": 500679, "raw": ["500679", "020042", "0", "2020/Nov/20 10:43", "Brink Climate Systems B.V.", "Brink", "Renovent Excellent P300", "", "2017", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.66", "89", "2", "29.0", "0.62", "87", "3", "37.0", "0.66", "86", "4", "45.0", "0.74", "85", "5", "53.0", "0.86", "84", "6", "61.0", "1.04", "83", "7", "69.0", "1.21", "83"]}
+{"pcdb_id": 500680, "raw": ["500680", "020027", "0", "2020/Dec/23 11:35", "EnviroVent Ltd", "EnviroVent", "MEVS2", "", "2020", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.30", "", "2", "29.0", "0.28", "", "3", "37.0", "0.29", "", "4", "45.0", "0.32", "", "5", "53.0", "0.36", "", "6", "61.0", "0.38"]}
+{"pcdb_id": 500681, "raw": ["500681", "020070", "0", "2021/Jan/25 19:03", "S&P UK Ventilation Systems Ltd", "S & P", "OZEO E Ecowatt 2", "9050514500 - 38/2020", "2018", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.19", "", "2", "29.0", "0.17", "", "3", "37.0", "0.17", "", "4", "45.0", "0.19", "", "5", "53.0", "0.21", "", "6", "61.0", "0.24"]}
+{"pcdb_id": 500682, "raw": ["500682", "020150", "0", "2020/Dec/23 10:06", "RDZ SpA", "RDZ by Altecnic", "CHR 100 FC", "", "2020", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "1.08", "86", "2", "29.0", "1.17", "85", "3", "37.0", "1.48", "83"]}
+{"pcdb_id": 500683, "raw": ["500683", "020150", "0", "2020/Dec/23 10:02", "RDZ SpA", "RDZ by Altecnic", "CHR 200 FC", "", "2020", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.78", "87", "2", "29.0", "0.79", "86", "3", "37.0", "0.95", "84", "4", "45.0", "1.14", "83", "5", "53.0", "1.47", "82"]}
+{"pcdb_id": 500684, "raw": ["500684", "020150", "0", "2020/Dec/23 09:58", "RDZ SpA", "RDZ by Altecnic", "CHR 400 FC", "", "2020", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.66", "91", "2", "29.0", "0.70", "90", "3", "37.0", "0.81", "89", "4", "45.0", "0.95", "87", "5", "53.0", "1.18", "87", "6", "61.0", "1.44", "86"]}
+{"pcdb_id": 500685, "raw": ["500685", "020150", "0", "2020/Dec/23 09:31", "RDZ SpA", "RDZ by Altecnic", "WHR 200", "", "2020", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.76", "84", "2", "29.0", "0.79", "84", "3", "37.0", "0.88", "83", "4", "45.0", "1.05", "82", "5", "53.0", "1.23", "81", "6", "61.0", "1.48", "81"]}
+{"pcdb_id": 500686, "raw": ["500686", "020047", "0", "2021/Mar/25 09:26", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-350CZPVU-R-E", "", "2020", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.86", "90", "2", "29.0", "0.80", "90", "3", "37.0", "0.84", "89", "4", "45.0", "0.96", "89", "5", "53.0", "1.08", "88", "6", "61.0", "1.28", "87"]}
+{"pcdb_id": 500687, "raw": ["500687", "020047", "0", "2021/Mar/25 09:26", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-350CZPVU-L-E", "", "2020", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.86", "90", "2", "29.0", "0.80", "90", "3", "37.0", "0.84", "89", "4", "45.0", "0.96", "89", "5", "53.0", "1.08", "88", "6", "61.0", "1.28", "87"]}
+{"pcdb_id": 500688, "raw": ["500688", "020047", "0", "2021/Mar/25 09:26", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-250CZPVU-R-E", "", "2020", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "90", "2", "29.0", "0.67", "89", "3", "37.0", "0.79", "88", "4", "45.0", "1.00", "87", "5", "53.0", "1.19", "87"]}
+{"pcdb_id": 500689, "raw": ["500689", "020047", "0", "2021/Mar/25 09:26", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-250CZPVU-L-E", "", "2020", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "90", "2", "29.0", "0.67", "89", "3", "37.0", "0.79", "88", "4", "45.0", "1.00", "87", "5", "53.0", "1.19", "87"]}
+{"pcdb_id": 500690, "raw": ["500690", "020070", "0", "2022/Aug/30 11:23", "Soler and Palau Ltd", "S & P", "OZEO E Ecowatt 2", "9050514500 38/2020 Semi-Rigid", "2018", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.25", "", "2", "29.0", "0.25", "", "3", "37.0", "0.26", "", "4", "45.0", "0.29", "", "5", "53.0", "0.32", "", "6", "61.0", "0.39"]}
+{"pcdb_id": 500691, "raw": ["500691", "020030", "0", "2021/Mar/16 17:29", "Aldes", "Aldes", "EASYHOME HYGRO COMPACT PREMIUM MW SP 90 semi rigid", "", "2019", "current", "", "1", "0", "2", "2", "", "4", "1", "21.0", "0.24", "", "2", "29.0", "0.19", "", "3", "37.0", "0.19", "", "4", "45.0", "0.28"]}
+{"pcdb_id": 500692, "raw": ["500692", "020030", "0", "2021/Mar/17 11:07", "Aldes", "Aldes", "EASYHOME HYGRO COMPACT PREMIUM MW SP 75 semi rigid", "", "2019", "current", "", "1", "0", "2", "2", "", "4", "1", "21.0", "0.24", "", "2", "29.0", "0.20", "", "3", "37.0", "0.20", "", "4", "45.0", "0.28"]}
+{"pcdb_id": 500693, "raw": ["500693", "020011", "0", "2021/Nov/11 10:29", "Vectaire Ltd", "Vectaire", "MIDIBY-AT", "", "2018", "current", "", "3", "0", "2", "1", "4", "4", "1", "21.0", "0.51", "93", "2", "29.0", "0.61", "91", "3", "37.0", "0.75", "90", "4", "45.0", "0.92", "89"]}
+{"pcdb_id": 500694, "raw": ["500694", "020011", "0", "2021/Nov/15 09:54", "Vectaire Ltd", "Vectaire", "MAXIBY-AT", "", "2018", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "0.45", "92", "2", "29.0", "0.47", "92", "3", "37.0", "0.54", "91", "4", "45.0", "0.66", "90", "5", "53.0", "0.80", "90", "6", "61.0", "0.99", "89", "7", "69.0", "1.21", "89"]}
+{"pcdb_id": 500695, "raw": ["500695", "020011", "0", "2021/Mar/01 17:24", "Vectaire Ltd", "Vectaire", "MAXIPLUS/BY/AT", "", "2018", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "0.56", "89", "2", "29.0", "0.47", "89", "3", "37.0", "0.50", "88", "4", "45.0", "0.56", "87", "5", "53.0", "0.66", "86", "6", "61.0", "0.78", "85", "7", "69.0", "0.94", "84"]}
+{"pcdb_id": 500696, "raw": ["500696", "020030", "0", "2021/Mar/17 11:07", "Aldes", "Aldes", "EASYHOME HYGRO PREMIUM SP 75 semi rgid", "", "2018", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.23", "", "2", "29.0", "0.20", "", "3", "37.0", "0.19", "", "4", "45.0", "0.28", "", "5", "53.0", "0.28", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500697, "raw": ["500697", "020030", "0", "2021/Mar/17 11:08", "Aldes", "Aldes", "EASYHOME HYGRO PREMIUM SP 90 semi rigid", "", "2018", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.23", "", "2", "29.0", "0.20", "", "3", "37.0", "0.19", "", "4", "45.0", "0.28", "", "5", "53.0", "0.28", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500698, "raw": ["500698", "020042", "0", "2021/Feb/25 08:52", "Brink Climate Systems B.V.", "Brink", "Flair 225 4/0L EU", "", "2020", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.62", "92", "2", "29.0", "0.64", "91", "3", "37.0", "0.69", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.96", "88", "6", "61.0", "1.17", "88"]}
+{"pcdb_id": 500699, "raw": ["500699", "020066", "0", "2021/Apr/26 08:53", "J Pichler GmbH", "Pichler", "08LG350V", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.65", "95", "2", "29.0", "0.60", "94", "3", "37.0", "0.62", "93", "4", "45.0", "0.70", "93", "5", "53.0", "0.76", "92", "6", "61.0", "0.90", "91", "7", "69.0", "1.06", "90"]}
+{"pcdb_id": 500700, "raw": ["500700", "020066", "0", "2021/Apr/26 08:53", "J Pichler GmbH", "Pichler", "08LG450V", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.74", "94", "2", "29.0", "0.67", "95", "3", "37.0", "0.67", "94", "4", "45.0", "0.74", "93", "5", "53.0", "0.82", "92", "6", "61.0", "0.96", "91", "7", "69.0", "1.11", "90"]}
+{"pcdb_id": 500701, "raw": ["500701", "020154", "0", "2021/Apr/26 12:14", "Vectaire", "Flakt Group", "EIS - 163", "", "2013", "current", "500366", "3", "0", "2", "1", "1", "7", "1", "21.0", "0.45", "92", "2", "29.0", "0.47", "92", "3", "37.0", "0.54", "91", "4", "45.0", "0.66", "90", "5", "53.0", "0.80", "90", "6", "61.0", "0.99", "89", "7", "69.0", "1.21", "89"]}
+{"pcdb_id": 500702, "raw": ["500702", "020154", "0", "2021/Apr/26 12:16", "Vectaire", "Flakt Group", "EIS-230", "", "2017", "current", "500530", "3", "1", "2", "1", "4", "7", "1", "21.0", "0.56", "89", "2", "29.0", "0.47", "89", "3", "37.0", "0.50", "88", "4", "45.0", "0.56", "87", "5", "53.0", "0.66", "86", "6", "61.0", "0.78", "85", "7", "69.0", "0.94", "84"]}
+{"pcdb_id": 500703, "raw": ["500703", "020154", "0", "2021/Apr/26 12:17", "Vectaire", "Flakt Group", "EIS - Flakt Master 55", "", "2018", "current", "500577", "3", "0", "2", "1", "4", "3", "1", "21.0", "0.93", "79", "2", "29.0", "1.09", "78", "3", "37.0", "1.36", "77"]}
+{"pcdb_id": 500704, "raw": ["500704", "020154", "0", "2021/Apr/26 12:17", "Vectaire", "Flakt Group", "EIS Flakt Master 80", "", "2015", "current", "500421", "3", "0", "2", "1", "1", "4", "1", "21.0", "0.75", "87", "2", "29.0", "0.89", "86", "3", "37.0", "1.00", "85", "4", "45.0", "1.37", "84"]}
+{"pcdb_id": 500705, "raw": ["500705", "020154", "0", "2021/Apr/26 12:18", "Vectaire", "Flakt Group", "EIS Flakt Master 107", "", "2018", "current", "500575", "3", "0", "2", "1", "4", "5", "1", "21.0", "0.72", "87", "2", "29.0", "0.75", "85", "3", "37.0", "0.85", "84", "4", "45.0", "1.04", "83", "5", "53.0", "1.23", "82"]}
+{"pcdb_id": 500706, "raw": ["500706", "020154", "0", "2021/Apr/26 12:18", "Vectaire", "Flakt Group", "EIS - MEV 100", "", "2011", "current", "500260", "4", "0", "2", "1", "", "5", "1", "21.0", "0.20", "", "2", "29.0", "0.26", "", "3", "37.0", "0.34", "", "4", "45.0", "0.44", "", "5", "53.0", "0.55"]}
+{"pcdb_id": 500707, "raw": ["500707", "020154", "0", "2021/Apr/26 12:18", "Vectaire", "Flakt Group", "EIS - MEV 230", "", "2017", "current", "500566", "1", "0", "2", "1", "", "6", "1", "21.0", "0.28", "", "2", "29.0", "0.27", "", "3", "37.0", "0.28", "", "4", "45.0", "0.36", "", "5", "53.0", "0.42", "", "6", "61.0", "0.52"]}
+{"pcdb_id": 500708, "raw": ["500708", "020154", "0", "2021/Apr/26 12:19", "Vectaire", "Flakt Group", "EIS-95", "", "2013", "current", "500367", "3", "0", "2", "1", "1", "4", "1", "21.0", "0.51", "93", "2", "29.0", "0.61", "91", "3", "37.0", "0.75", "90", "4", "45.0", "0.92", "89"]}
+{"pcdb_id": 500709, "raw": ["500709", "020156", "0", "2021/Apr/26 10:25", "Passive House Systems (PHS) Gmbh", "Passive House Systems", "PHS MEV_H", "Model H", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.19", "", "2", "29.0", "0.18", "", "3", "37.0", "0.18", "", "4", "45.0", "0.22", "", "5", "53.0", "0.25", "", "6", "61.0", "0.30"]}
+{"pcdb_id": 500710, "raw": ["500710", "020027", "0", "2021/Apr/26 10:37", "EnviroVent Ltd", "EnviroVent", "MEV160", "", "2021", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.19", "", "2", "29.0", "0.23", "", "3", "37.0", "0.27", "", "4", "45.0", "0.35", "", "5", "53.0", "0.44", "", "6", "61.0", "0.59"]}
+{"pcdb_id": 500711, "raw": ["500711", "020027", "0", "2021/Apr/26 10:40", "EnviroVent Ltd", "EnviroVent", "MEV300", "", "2021", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.19", "", "2", "29.0", "0.20", "", "3", "37.0", "0.22", "", "4", "45.0", "0.25", "", "5", "53.0", "0.31", "", "6", "61.0", "0.36"]}
+{"pcdb_id": 500712, "raw": ["500712", "020156", "0", "2021/Apr/26 10:25", "Passive House systems (PHS) Gmbh", "Passive House Systems", "PHS MEV_H", "+75mm Semi-rigid", "2014", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.22", "", "2", "29.0", "0.21", "", "3", "37.0", "0.21", "", "4", "45.0", "0.23", "", "5", "53.0", "0.26", "", "6", "61.0", "0.30"]}
+{"pcdb_id": 500716, "raw": ["500716", "020112", "0", "2021/May/24 10:24", "Blauberg UK Ltd", "Blauberg", "Komfort EC LB400", "S25", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.89", "91", "2", "29.0", "0.77", "91", "3", "37.0", "0.79", "90", "4", "45.0", "0.87", "90", "5", "53.0", "0.99", "89", "6", "61.0", "1.18", "89", "7", "69.0", "1.38", "88"]}
+{"pcdb_id": 500717, "raw": ["500717", "020073", "0", "2021/Jun/22 17:02", "Dantherm A/S", "Dantherm", "HCV460 P2", "", "2020", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.71", "89", "2", "29.0", "0.70", "88", "3", "37.0", "0.76", "88", "4", "45.0", "0.89", "87", "5", "53.0", "1.04", "85", "6", "61.0", "1.27", "85", "7", "69.0", "1.52", "84"]}
+{"pcdb_id": 500718, "raw": ["500718", "020156", "0", "2021/Jun/22 17:04", "Passive House Systems (PHS) Gmbh", "Passive House Systems", "PHS MEV_H", "+90mm Semi-Rigid", "2021", "current", "500710", "1", "0", "2", "1", "", "6", "1", "21.0", "0.21", "", "2", "29.0", "0.20", "", "3", "37.0", "0.20", "", "4", "45.0", "0.22", "", "5", "53.0", "0.24", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500719, "raw": ["500719", "020156", "0", "2021/Jun/22 17:03", "Passive House Systems (PHS) Gmbh", "Passive House Systems", "PHS", "HRV550-H", "2021", "current", "500468", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.57", "93", "2", "29.0", "0.58", "92", "3", "37.0", "0.63", "91", "4", "45.0", "0.73", "90", "5", "53.0", "0.86", "90", "6", "61.0", "1.04", "89", "7", "69.0", "1.23", "88"]}
+{"pcdb_id": 500720, "raw": ["500720", "020047", "0", "2021/Jul/26 17:20", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-500CZPVU-R-E", "", "2021", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.80", "91", "2", "29.0", "0.72", "90", "3", "37.0", "0.74", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.91", "88", "6", "61.0", "1.09", "88", "7", "69.0", "1.24", "88"]}
+{"pcdb_id": 500721, "raw": ["500721", "020047", "0", "2021/Jul/26 17:20", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-500CZPVU-L-E", "", "2021", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.80", "91", "2", "29.0", "0.72", "90", "3", "37.0", "0.74", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.91", "88", "6", "61.0", "1.09", "88", "7", "69.0", "1.24", "88"]}
+{"pcdb_id": 500722, "raw": ["500722", "020070", "0", "2021/Jul/26 13:50", "S&P UK Ventilation Systems Ltd", "S & P", "OZEO Flat H Ecowatt Semi Rigid", "9050344601", "2018", "current", "", "1", "0", "2", "2", "", "6", "1", "20.1", "0.38", "", "2", "28.0", "0.31", "", "3", "35.7", "0.27", "", "4", "43.1", "0.26", "", "5", "51.3", "0.28", "", "6", "59.3", "0.31"]}
+{"pcdb_id": 500723, "raw": ["500723", "020027", "0", "2021/Jul/08 09:38", "EnviroVent Ltd", "EnviroVent", "MEV160FT with 75mm semi-rigid layout", "", "2021", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.21", "", "2", "29.0", "0.26", "", "3", "37.0", "0.33", "", "4", "45.0", "0.39", "", "5", "53.0", "0.54"]}
+{"pcdb_id": 500724, "raw": ["500724", "020027", "0", "2021/Jul/08 09:39", "EnviroVent Ltd", "EnviroVent", "MEV160FT with 90mm semi-rigid layout", "", "2021", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.18", "", "2", "29.0", "0.22", "", "3", "37.0", "0.28", "", "4", "45.0", "0.35", "", "5", "53.0", "0.52"]}
+{"pcdb_id": 500725, "raw": ["500725", "020027", "0", "2021/Jul/08 09:41", "EnviroVent Ltd", "EnviroVent", "MEV300FT with 75mm semi-rigid layout", "", "2021", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.22", "", "2", "29.0", "0.22", "", "3", "37.0", "0.23", "", "4", "45.0", "0.27", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500726, "raw": ["500726", "020027", "0", "2021/Jul/08 09:42", "EnviroVent Ltd", "EnviroVent", "MEV300FT with 90mm semi-rigid layout", "", "2021", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.20", "", "2", "29.0", "0.20", "", "3", "37.0", "0.23", "", "4", "45.0", "0.25", "", "5", "53.0", "0.34"]}
+{"pcdb_id": 500727, "raw": ["500727", "020052", "0", "2021/Aug/18 15:40", "Brook Design Hardware Ltd", "Brookvent", "AirCycle 4.1", "", "2021", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "0.45", "93", "2", "29.0", "0.45", "92", "3", "37.0", "0.49", "91", "4", "45.0", "0.58", "90", "5", "53.0", "0.67", "88", "6", "61.0", "0.83", "87", "7", "69.0", "0.99", "86"]}
+{"pcdb_id": 500730, "raw": ["500730", "020039", "0", "2021/Sep/28 15:17", "H. Östberg AB", "Beam", "AXCO HERU 160", "", "2020", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "1.30", "73", "2", "29.0", "1.13", "77", "3", "37.0", "1.08", "79", "4", "45.0", "1.09", "80", "5", "53.0", "1.15", "81", "6", "61.0", "1.25", "81", "7", "69.0", "1.38", "81"]}
+{"pcdb_id": 500731, "raw": ["500731", "020039", "0", "2021/Sep/28 15:16", "H. Östberg AB", "Beam", "AXCO HERU 200", "", "2020", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "1.43", "69", "2", "29.0", "1.18", "72", "3", "37.0", "1.08", "74", "4", "45.0", "1.10", "76", "5", "53.0", "1.08", "78", "6", "61.0", "1.17", "79", "7", "69.0", "1.27", "79"]}
+{"pcdb_id": 500732, "raw": ["500732", "020016", "0", "2021/Sep/29 10:22", "ProAir Heat Recovery and Ventilation Systems Ltd", "ProAir", "FRPRO", "", "2020", "current", "090850", "1", "0", "2", "2", "", "6", "1", "21.0", "0.31", "", "2", "29.0", "0.30", "", "3", "37.0", "0.28", "", "4", "45.0", "0.29", "", "5", "53.0", "0.30", "", "6", "61.0", "0.34"]}
+{"pcdb_id": 500733, "raw": ["500733", "020007", "0", "2021/Oct/15 10:13", "Titon Hardware Ltd", "Titon", "HRV1.65 Q Plus Eco", "", "2021", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.46", "89", "2", "29.0", "0.54", "87", "3", "37.0", "0.65", "86", "4", "45.0", "0.84", "84", "5", "53.0", "1.05", "83", "6", "61.0", "1.27", "82"]}
+{"pcdb_id": 500734, "raw": ["500734", "020087", "0", "2021/Nov/18 16:39", "Panasonic HVAC UK Ltd", "Panasonic", "PAW-A2W-VENTA", "-R & - L", "2019", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "1.13", "72", "2", "29.0", "1.09", "76", "3", "37.0", "1.17", "77", "4", "45.0", "1.34", "78", "5", "53.0", "1.51", "78"]}
+{"pcdb_id": 500735, "raw": ["500735", "020145", "0", "2023/Aug/25 15:19", "KERS Innovations UK Ltd", "KERS", "KERS MEV-W200SL", "", "2015", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.51", "", "2", "29.0", "0.57", "", "3", "37.0", "0.65", "", "4", "45.0", "0.84", "", "5", "53.0", "1.01", "", "6", "61.0", "1.26"]}
+{"pcdb_id": 500736, "raw": ["500736", "020003", "0", "2021/Dec/16 09:23", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO2", "MRXBOXAB-ECO2B", "2021", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.55", "90", "2", "29.0", "0.65", "89", "3", "37.0", "0.80", "87", "4", "45.0", "1.01", "86", "5", "53.0", "1.26", "86"]}
+{"pcdb_id": 500738, "raw": ["500738", "020163", "0", "2022/Mar/02 16:46", "Titon Hardware Ltd", "Ventiza", "HRU360VL/R", "", "2018", "current", "500567", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.51", "89", "2", "29.0", "0.58", "87", "3", "37.0", "0.70", "86", "4", "45.0", "0.90", "84", "5", "53.0", "1.07", "83", "6", "61.0", "1.34", "82"]}
+{"pcdb_id": 500739, "raw": ["500739", "020163", "0", "2022/Mar/02 16:45", "Titon Hardware Ltd.", "Ventiza", "HRU220VL/R", "", "2015", "current", "500413", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.71", "87", "2", "29.0", "0.92", "85", "3", "37.0", "1.19", "85", "4", "45.0", "1.55", "84"]}
+{"pcdb_id": 500740, "raw": ["500740", "020163", "0", "2022/Feb/28 09:57", "Titon Hardware Ltd.", "Ventiza", "HRU400VL", "", "2015", "current", "500423", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.55", "90", "2", "29.0", "0.57", "90", "3", "37.0", "0.65", "89", "4", "45.0", "0.76", "88", "5", "53.0", "0.90", "87", "6", "61.0", "1.09", "86", "7", "69.0", "1.27", "85"]}
+{"pcdb_id": 500741, "raw": ["500741", "020007", "0", "2022/Mar/29 15:32", "Titon Hardware Ltd", "Titon", "HRV1.3 Q Plus Eco", "", "2021", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.75", "87", "2", "29.0", "0.97", "85", "3", "37.0", "1.28", "85", "4", "45.0", "1.66", "84"]}
+{"pcdb_id": 500742, "raw": ["500742", "020007", "0", "2022/Mar/29 12:32", "Titon Hardware Ltd", "Titon", "CME2.1 Q Plus CH", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.18", "", "3", "37.0", "0.20", "", "4", "45.0", "0.22", "", "5", "53.0", "0.28", "", "6", "61.0", "0.33"]}
+{"pcdb_id": 500743, "raw": ["500743", "020007", "0", "2022/Mar/29 12:33", "Titon Hardware Ltd", "Titon", "CME2.1 Q Plus A", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.18", "", "3", "37.0", "0.20", "", "4", "45.0", "0.22", "", "5", "53.0", "0.28", "", "6", "61.0", "0.33"]}
+{"pcdb_id": 500744, "raw": ["500744", "020007", "0", "2022/Mar/29 12:33", "Titon Hardware Ltd", "Titon", "CME2.1 Q Plus HA", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.18", "", "3", "37.0", "0.20", "", "4", "45.0", "0.22", "", "5", "53.0", "0.28", "", "6", "61.0", "0.33"]}
+{"pcdb_id": 500745, "raw": ["500745", "020007", "0", "2022/Mar/29 12:33", "Titon Hardware Ltd", "Titon", "CME2.1 Q Plus HALS", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.18", "", "3", "37.0", "0.20", "", "4", "45.0", "0.22", "", "5", "53.0", "0.28", "", "6", "61.0", "0.33"]}
+{"pcdb_id": 500746, "raw": ["500746", "020007", "0", "2022/Mar/29 12:33", "Titon Hardware Ltd", "Titon", "CME3.1 Q Plus CH", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.20", "", "5", "53.0", "0.23", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500747, "raw": ["500747", "020007", "0", "2022/Mar/29 12:33", "Titon Hardware Ltd", "Titon", "CME3.1 Q Plus CH", "", "2022", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.25", "", "2", "29.0", "0.24", "", "3", "37.0", "0.24", "", "4", "45.0", "0.25", "", "5", "53.0", "0.29"]}
+{"pcdb_id": 500748, "raw": ["500748", "020007", "0", "2022/Mar/29 12:33", "Titon Hardware Ltd", "Titon", "CME3.1 Q Plus A", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.20", "", "5", "53.0", "0.23", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500749, "raw": ["500749", "020007", "0", "2022/Mar/29 12:33", "Titon Hardware Ltd", "Titon", "CME3.1 Q Plus A", "", "2022", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.25", "", "2", "29.0", "0.24", "", "3", "37.0", "0.24", "", "4", "45.0", "0.25", "", "5", "53.0", "0.29"]}
+{"pcdb_id": 500750, "raw": ["500750", "020007", "0", "2022/Mar/29 12:34", "Titon Hardware Ltd", "Titon", "CME3.1 Q Plus HA", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.20", "", "5", "53.0", "0.23", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500751, "raw": ["500751", "020007", "0", "2022/Mar/29 12:34", "Titon Hardware Ltd", "Titon", "CME3.1 Q Plus HA", "", "2022", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.25", "", "2", "29.0", "0.24", "", "3", "37.0", "0.24", "", "4", "45.0", "0.25", "", "5", "53.0", "0.29"]}
+{"pcdb_id": 500752, "raw": ["500752", "020007", "0", "2022/Mar/29 12:31", "Titon Hardware Ltd", "Titon", "CME3.1 Q Plus HALS", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.20", "", "5", "53.0", "0.23", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500753, "raw": ["500753", "020007", "0", "2022/Mar/29 12:31", "Titon Hardware Ltd", "Titon", "CME3.1 Q Plus HALS", "", "2022", "current", "", "1", "0", "2", "2", "", "5", "1", "21.0", "0.25", "", "2", "29.0", "0.24", "", "3", "37.0", "0.24", "", "4", "45.0", "0.25", "", "5", "53.0", "0.29"]}
+{"pcdb_id": 500754, "raw": ["500754", "020017", "0", "2022/Mar/29 15:28", "Airflow Developments Ltd", "Airflow", "DV51 Adroit", "", "2020", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.78", "80", "2", "29.0", "0.84", "80", "3", "37.0", "0.99", "81", "4", "45.0", "1.24", "81"]}
+{"pcdb_id": 500758, "raw": ["500758", "020130", "0", "2022/Feb/24 14:55", "Vero Duco N.V.", "Duco", "DucoBox Energy Comfort 325", "", "2020", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.59", "91", "3", "37.0", "0.63", "91", "4", "45.0", "0.77", "90", "5", "53.0", "0.89", "90", "6", "61.0", "1.07", "90", "7", "69.0", "1.30", "90"]}
+{"pcdb_id": 500759, "raw": ["500759", "020016", "0", "2022/Apr/08 12:04", "ProAir Heat Recovery and Ventilation Systems Ltd", "ProAir", "PA600HLI", "", "2014", "current", "090630", "3", "0", "2", "1", "1", "5", "1", "21.0", "0.62", "93", "2", "29.0", "0.67", "92", "3", "37.0", "0.76", "91", "4", "45.0", "0.92", "91", "5", "53.0", "1.12", "90"]}
+{"pcdb_id": 500760, "raw": ["500760", "020084", "0", "2022/Apr/13 17:13", "FRÄNKISCHE ROHRWERKE", "FRÄNKISCHE", "profi-air 360 flex", "", "2021", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.71", "89", "2", "29.0", "0.70", "88", "3", "37.0", "0.76", "88", "4", "45.0", "0.89", "87", "5", "53.0", "1.04", "85", "6", "61.0", "1.27", "85", "7", "69.0", "1.52", "84"]}
+{"pcdb_id": 500761, "raw": ["500761", "020016", "0", "2022/Apr/29 13:30", "Jablotron Living Technology CZ s.r.o.", "ProAir", "Futura L", "", "2019", "current", "", "3", "1", "2", "1", "3", "4", "2", "29.0", "0.99", "92", "3", "37.0", "1.10", "91", "4", "45.0", "1.37", "90", "5", "53.0", "1.57", "89"]}
+{"pcdb_id": 500762, "raw": ["500762", "020130", "0", "2022/Apr/28 13:51", "Vero Duco N.V.", "Duco", "DucoBox Energy Premium 325 - 1ZS - R", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.58", "91", "3", "37.0", "0.63", "90", "4", "45.0", "0.75", "89", "5", "53.0", "0.87", "89", "6", "61.0", "1.03", "88", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500763, "raw": ["500763", "020130", "0", "2022/Apr/28 18:04", "Vero Duco N.V.", "Duco", "DucoBox Energy Premium 325 - 2ZS - L", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.58", "91", "3", "37.0", "0.63", "90", "4", "45.0", "0.75", "89", "5", "53.0", "0.87", "89", "6", "61.0", "1.03", "88", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500764, "raw": ["500764", "020130", "0", "2022/Apr/28 18:04", "Vero Duco N.V.", "Duco", "DucoBox Energy Premium 325 - 2ZS - R", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.58", "91", "3", "37.0", "0.63", "90", "4", "45.0", "0.75", "89", "5", "53.0", "0.87", "89", "6", "61.0", "1.03", "88", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500765, "raw": ["500765", "020130", "0", "2022/Apr/28 13:50", "Vero Duco N.V.", "Duco", "DucoBox Energy Premium 400 - 1ZS - L", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.58", "91", "3", "37.0", "0.63", "90", "4", "45.0", "0.75", "89", "5", "53.0", "0.87", "89", "6", "61.0", "1.03", "88", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500766, "raw": ["500766", "020130", "0", "2022/Apr/28 13:50", "Vero Duco N.V.", "Duco", "DucoBox Energy Premium 400 - 1ZS - R", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.58", "91", "3", "37.0", "0.63", "90", "4", "45.0", "0.75", "89", "5", "53.0", "0.87", "89", "6", "61.0", "1.03", "88", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500767, "raw": ["500767", "020130", "0", "2022/Apr/28 13:51", "Vero Duco N.V.", "Duco", "DucoBox Energy Premium 400 - 2ZS - R", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "91", "2", "29.0", "0.58", "91", "3", "37.0", "0.63", "90", "4", "45.0", "0.75", "89", "5", "53.0", "0.87", "89", "6", "61.0", "1.03", "88", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500768, "raw": ["500768", "020052", "0", "2022/Apr/29 13:36", "Brook Design Hardware Ltd", "Brookvent", "Airstream Ace", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.19", "", "2", "29.0", "0.19", "", "3", "37.0", "0.22", "", "4", "45.0", "0.28", "", "5", "53.0", "0.33", "", "6", "61.0", "0.41"]}
+{"pcdb_id": 500770, "raw": ["500770", "020175", "0", "2022/May/10 13:26", "Brink Climate Systems B.V", "WOLF", "CWL-2-325 4/0", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.55", "92", "2", "29.0", "0.52", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.63", "90", "5", "53.0", "0.73", "90", "6", "61.0", "0.86", "89", "7", "69.0", "1.00", "89"]}
+{"pcdb_id": 500771, "raw": ["500771", "020175", "0", "2022/May/10 13:31", "Brink Climate Systems B.V", "WOLF", "CWL-2-400 4/0", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.48", "92", "2", "29.0", "0.49", "91", "3", "37.0", "0.53", "90", "4", "45.0", "0.63", "90", "5", "53.0", "0.74", "90", "6", "61.0", "0.90", "89", "7", "69.0", "1.08", "89"]}
+{"pcdb_id": 500772, "raw": ["500772", "020003", "0", "2022/Jan/17 14:50", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO2.5", "", "2021", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.48", "90", "2", "29.0", "0.54", "89", "3", "37.0", "0.64", "88", "4", "45.0", "0.82", "87", "5", "53.0", "1.01", "86", "6", "61.0", "1.30", "86"]}
+{"pcdb_id": 500773, "raw": ["500773", "020003", "0", "2022/Jun/21 15:48", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO-LP2", "MRXBOXAB-EC0-LP2B", "2021", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.56", "78", "2", "29.0", "0.70", "79", "3", "37.0", "0.87", "79", "4", "45.0", "1.16", "79", "5", "53.0", "1.41", "79"]}
+{"pcdb_id": 500774, "raw": ["500774", "020003", "0", "2022/Jun/21 15:36", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO3", "MRXBOXAB-ECO3B", "2021", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.56", "90", "2", "29.0", "0.58", "90", "3", "37.0", "0.65", "89", "4", "45.0", "0.79", "88", "5", "53.0", "0.95", "88", "6", "61.0", "1.15", "87"]}
+{"pcdb_id": 500775, "raw": ["500775", "020031", "0", "2022/May/03 12:46", "Genvex AB", "NIBE", "ERS S10-500", "", "2021", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.82", "86", "2", "29.0", "0.87", "86", "3", "37.0", "0.87", "87", "4", "45.0", "1.04", "86", "5", "53.0", "1.21", "86", "6", "61.0", "1.46", "86"]}
+{"pcdb_id": 500780, "raw": ["500780", "020112", "0", "2022/Jul/19 09:56", "Blauberg UK Ltd", "Blauberg", "Komfort EC D5B 180", "", "2018", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.90", "88", "2", "29.0", "1.00", "86", "3", "37.0", "1.20", "85"]}
+{"pcdb_id": 500781, "raw": ["500781", "020047", "0", "2022/Aug/16 15:08", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-500CZPVU-L-E-1", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.80", "91", "2", "29.0", "0.72", "90", "3", "37.0", "0.74", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.91", "88", "6", "61.0", "1.09", "88", "7", "69.0", "1.24", "88"]}
+{"pcdb_id": 500782, "raw": ["500782", "020047", "0", "2022/Aug/16 15:08", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-500CZPVU-R-E-1", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.80", "91", "2", "29.0", "0.72", "90", "3", "37.0", "0.74", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.91", "88", "6", "61.0", "1.09", "88", "7", "69.0", "1.24", "88"]}
+{"pcdb_id": 500789, "raw": ["500789", "020041", "0", "2022/Oct/13 11:05", "The Nuaire Group", "Domus Ventilation", "HRXE-HERA", "-B", "2021", "current", "500677", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.55", "90", "2", "29.0", "0.65", "89", "3", "37.0", "0.80", "87", "4", "45.0", "1.01", "86", "5", "53.0", "1.26", "86"]}
+{"pcdb_id": 500790, "raw": ["500790", "020041", "0", "2022/Oct/13 11:05", "The Nuaire Group", "Domus Ventilation", "HRXE-AURA", "-B", "2021", "current", "500678", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "90", "2", "29.0", "0.58", "90", "3", "37.0", "0.65", "89", "4", "45.0", "0.79", "88", "5", "53.0", "0.95", "88", "6", "61.0", "1.15", "87", "7", "69.0", "1.26", "87"]}
+{"pcdb_id": 500791, "raw": ["500791", "020041", "0", "2022/Oct/13 11:01", "The Nuaire Group", "Domus Ventilation", "CMX-MULTI", "-B", "2021", "current", "500631", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.17", "", "3", "37.0", "0.20", "", "4", "45.0", "0.24", "", "5", "53.0", "0.30", "", "6", "61.0", "0.35"]}
+{"pcdb_id": 500792, "raw": ["500792", "020041", "0", "2022/Oct/13 11:01", "The Nuaire Group", "Domus Ventilation", "HRXE-ZEUS", "", "2022", "current", "500502", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.62", "94", "2", "29.0", "0.62", "93", "3", "37.0", "0.66", "93", "4", "45.0", "0.79", "92", "5", "53.0", "0.94", "91", "6", "61.0", "1.15", "91", "7", "69.0", "1.41", "91"]}
+{"pcdb_id": 500793, "raw": ["500793", "020003", "0", "2022/Oct/25 16:55", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO2", "MRXBOXAB-ECO2C", "2022", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.60", "90", "2", "29.0", "0.65", "89", "3", "37.0", "0.80", "87", "4", "45.0", "0.99", "86", "5", "53.0", "1.21", "86"]}
+{"pcdb_id": 500794, "raw": ["500794", "020003", "0", "2022/Oct/25 16:56", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO3", "MRXBOXAB-ECO3C", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.54", "90", "2", "29.0", "0.55", "90", "3", "37.0", "0.62", "89", "4", "45.0", "0.76", "88", "5", "53.0", "0.89", "88", "6", "61.0", "1.11", "87", "7", "69.0", "1.32", "87"]}
+{"pcdb_id": 500795, "raw": ["500795", "020003", "0", "2022/Oct/25 16:55", "The Nuaire Group", "Nuaire", "MEV-ECO", "MEV-ECO-C", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.22", "", "2", "29.0", "0.19", "", "3", "37.0", "0.23", "", "4", "45.0", "0.27", "", "5", "53.0", "0.32", "", "6", "61.0", "0.38"]}
+{"pcdb_id": 500796, "raw": ["500796", "020016", "0", "2022/Oct/26 11:13", "ProAir Heat Recovery and Ventilation Systems Ltd", "ProAir", "PA750LI", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.58", "86", "2", "29.0", "0.57", "87", "3", "37.0", "0.61", "88", "4", "45.0", "0.72", "88", "5", "53.0", "0.86", "88", "6", "61.0", "1.04", "88", "7", "69.0", "1.23", "87"]}
+{"pcdb_id": 500797, "raw": ["500797", "020122", "0", "2022/Nov/16 14:10", "Joule Ltd", "JOULE", "Modul-AIR All-E", "HHH-AEHP-00001", "2021", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.41", "", "2", "29.0", "0.37", "", "3", "37.0", "0.36", "", "4", "45.0", "0.39", "", "5", "53.0", "0.44", "", "6", "61.0", "0.59"]}
+{"pcdb_id": 500798, "raw": ["500798", "020070", "0", "2022/Dec/09 14:51", "S&P UK Ventilation Systems Ltd", "S & P", "SABIK 500", "", "2021", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.77", "84", "2", "29.0", "0.70", "84", "3", "37.0", "0.73", "85", "4", "45.0", "0.79", "84", "5", "53.0", "0.88", "85", "6", "61.0", "1.02", "85", "7", "69.0", "1.19", "85"]}
+{"pcdb_id": 500799, "raw": ["500799", "020193", "0", "2023/Jan/30 17:27", "ALNOR Systemy Wentylacji Sp. z o.o.", "ALNOR", "HRU-PremAIR-450-CF", "", "2018", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.53", "80", "2", "29.0", "0.50", "82", "3", "37.0", "0.56", "83", "4", "45.0", "0.67", "83", "5", "53.0", "0.79", "83", "6", "61.0", "0.95", "83", "7", "69.0", "1.15", "84"]}
+{"pcdb_id": 500800, "raw": ["500800", "020193", "0", "2023/Jan/30 17:29", "ALNOR Systemy Wentylacji Sp. z o.o.", "ALNOR", "HRU-SlimAIR-250", "", "2021", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "85", "2", "29.0", "0.59", "84", "3", "37.0", "0.69", "82", "4", "45.0", "0.84", "81", "5", "53.0", "1.02", "79", "6", "61.0", "1.26", "78", "7", "69.0", "1.53", "77"]}
+{"pcdb_id": 500801, "raw": ["500801", "020197", "0", "2023/Feb/01 10:09", "Ebac Ltd", "Ebac Ventilation", "VA32RWH", "", "2022", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.74", "88", "2", "29.0", "0.81", "87", "3", "37.0", "0.93", "86", "4", "45.0", "1.14", "84", "5", "53.0", "1.38", "84"]}
+{"pcdb_id": 500802, "raw": ["500802", "020027", "0", "2023/Feb/01 11:53", "Soler & Palau", "EnviroVent", "energiSava 200", "Issue B", "2022", "current", "", "3", "0", "2", "1", "4", "4", "1", "21.0", "0.79", "89", "2", "29.0", "0.91", "87", "3", "37.0", "1.14", "85", "4", "45.0", "1.43", "84"]}
+{"pcdb_id": 500803, "raw": ["500803", "020004", "0", "2023/Feb/23 16:21", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir Flex 250", "", "2022", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.68", "95", "2", "29.0", "0.63", "94", "3", "37.0", "0.68", "92", "4", "45.0", "0.77", "91", "5", "53.0", "0.87", "90", "6", "61.0", "1.03", "88"]}
+{"pcdb_id": 500804, "raw": ["500804", "020004", "0", "2023/Feb/23 16:17", "Zehnder Group UK Ltd", "Zehnder", "ComfoAir Flex 350", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "95", "2", "29.0", "0.58", "94", "3", "37.0", "0.62", "92", "4", "45.0", "0.73", "91", "5", "53.0", "0.85", "90", "6", "61.0", "1.00", "90", "7", "69.0", "1.16", "89"]}
+{"pcdb_id": 500807, "raw": ["500807", "020027", "0", "2023/Mar/08 09:43", "S&P", "EnviroVent", "Sabik 350", "", "2022", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.68", "91", "2", "29.0", "0.65", "90", "3", "37.0", "0.71", "89", "4", "45.0", "0.84", "89", "5", "53.0", "0.94", "88", "6", "61.0", "1.10", "87"]}
+{"pcdb_id": 500808, "raw": ["500808", "020002", "0", "2023/Mar/30 10:33", "Vent Axia Ltd", "Vent Axia", "MVDC-MSH Uniflex", "498502", "2022", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.15", "", "2", "29.0", "0.15", "", "3", "37.0", "0.16", "", "4", "45.0", "0.18"]}
+{"pcdb_id": 500809, "raw": ["500809", "020042", "0", "2023/Mar/20 16:56", "Brink Climate Systems B.V.", "Brink", "Flair 600 4/0 L EU", "", "2022", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.59", "94", "3", "37.0", "0.61", "94", "4", "45.0", "0.69", "94", "5", "53.0", "0.78", "93", "6", "61.0", "0.93", "92", "7", "69.0", "1.09", "92"]}
+{"pcdb_id": 500810, "raw": ["500810", "020042", "0", "2023/Mar/20 16:59", "Brink Climate Systems B.V.", "Brink", "Flair 450 4/0 L EU", "", "2022", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.59", "94", "3", "37.0", "0.61", "94", "4", "45.0", "0.69", "94", "5", "53.0", "0.78", "93", "6", "61.0", "0.93", "92", "7", "69.0", "1.09", "92"]}
+{"pcdb_id": 500811, "raw": ["500811", "020002", "0", "2023/Mar/30 12:53", "Vent Axia Ltd", "Vent Axia", "Sentinel Kinetic FH", "408167A", "2023", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.47", "89", "2", "29.0", "0.54", "88", "3", "37.0", "0.65", "86", "4", "45.0", "0.84", "84", "5", "53.0", "1.01", "84"]}
+{"pcdb_id": 500812, "raw": ["500812", "020060", "0", "2023/Apr/12 16:41", "Vent Axia", "Addvent", "AVWH2X", "", "2020", "current", "500644", "1", "0", "2", "1", "", "6", "1", "21.0", "0.15", "", "2", "29.0", "0.14", "", "3", "37.0", "0.16", "", "4", "45.0", "0.18", "", "5", "53.0", "0.21", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500813, "raw": ["500813", "020027", "0", "2023/Apr/13 11:24", "S&P UK Ventilation Systems Ltd", "EnviroVent", "Sabik 500", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.77", "84", "2", "29.0", "0.70", "84", "3", "37.0", "0.73", "85", "4", "45.0", "0.79", "85", "5", "53.0", "0.88", "85", "6", "61.0", "1.02", "85", "7", "69.0", "1.19", "85"]}
+{"pcdb_id": 500835, "raw": ["500835", "020027", "0", "2023/May/24 16:06", "EnviroVent Ltd", "EnviroVent", "energiSava 260", "Issue A", "2023", "current", "", "3", "0", "2", "1", "4", "5", "1", "21.0", "0.66", "90", "2", "29.0", "0.75", "87", "3", "37.0", "0.94", "85", "4", "45.0", "1.21", "84", "5", "53.0", "1.49", "83"]}
+{"pcdb_id": 500836, "raw": ["500836", "020027", "0", "2023/May/24 17:14", "EnviroVent Ltd", "EnviroVent", "energiSava 260", "Issue B", "2023", "current", "", "3", "0", "2", "1", "4", "5", "1", "21.0", "0.57", "88", "2", "29.0", "0.68", "85", "3", "37.0", "0.83", "83", "4", "45.0", "1.02", "82", "5", "53.0", "1.29", "81"]}
+{"pcdb_id": 500837, "raw": ["500837", "020027", "0", "2023/Dec/08 10:41", "EnviroVent Ltd", "EnviroVent", "energiSava 260", "Issue C", "2023", "current", "", "3", "0", "2", "1", "4", "5", "1", "21.0", "0.58", "80", "2", "29.0", "0.66", "80", "3", "37.0", "0.82", "79", "4", "45.0", "1.06", "79", "5", "53.0", "1.28", "79"]}
+{"pcdb_id": 500838, "raw": ["500838", "020122", "0", "2023/Jul/14 10:00", "Joule Ltd", "JOULE", "Modul-AIR All-E/ Green Comfort", "HHH-AEHP-00001/ HHH-GCPH-0001", "2021", "current", "", "4", "1", "2", "1", "", "7", "1", "21.0", "0.71", "", "2", "29.0", "0.65", "", "3", "37.0", "0.70", "", "4", "45.0", "0.76", "", "5", "53.0", "0.94", "", "6", "61.0", "1.11", "", "7", "69.0", "1.37"]}
+{"pcdb_id": 500839, "raw": ["500839", "020007", "0", "2023/Jul/27 12:36", "Titon Hardware Ltd", "Titon", "HRV4 Q Plus Eco", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.42", "91", "2", "29.0", "0.43", "90", "3", "37.0", "0.50", "89", "4", "45.0", "0.60", "88", "5", "53.0", "0.73", "87", "6", "61.0", "0.90", "86", "7", "69.0", "1.08", "86"]}
+{"pcdb_id": 500840, "raw": ["500840", "020007", "0", "2023/Jul/27 12:36", "Titon Hardware Ltd", "Titon", "HRV4.1 Q Plus Eco", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.43", "91", "2", "29.0", "0.47", "90", "3", "37.0", "0.55", "89", "4", "45.0", "0.68", "88", "5", "53.0", "0.83", "87", "6", "61.0", "1.03", "86", "7", "69.0", "1.24", "86"]}
+{"pcdb_id": 500841, "raw": ["500841", "020007", "0", "2023/Jul/27 12:36", "Titon Hardware Ltd", "Titon", "HRV4.25 Q Plus Eco", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.47", "91", "2", "29.0", "0.49", "90", "3", "37.0", "0.54", "89", "4", "45.0", "0.65", "88", "5", "53.0", "0.75", "87", "6", "61.0", "0.91", "86", "7", "69.0", "1.09", "86"]}
+{"pcdb_id": 500842, "raw": ["500842", "020211", "0", "2023/Aug/25 09:55", "Vasco bvba", "Vasco", "Vasco X350 - EasyFlow rigid oval duct system", "", "2017", "current", "", "3", "0", "2", "2", "3", "4", "1", "21.0", "0.85", "93", "2", "29.0", "0.78", "93", "3", "37.0", "0.83", "92", "4", "45.0", "0.89", "91"]}
+{"pcdb_id": 500843, "raw": ["500843", "020211", "0", "2023/Aug/25 09:55", "Vasco bvba", "Vasco", "Vasco X350 - 90mm semi-rigid duct system", "", "2017", "current", "", "3", "0", "2", "2", "3", "6", "1", "21.0", "0.84", "93", "2", "29.0", "0.76", "93", "3", "37.0", "0.80", "92", "4", "45.0", "0.88", "91", "5", "53.0", "0.96", "90", "6", "61.0", "1.06", "90"]}
+{"pcdb_id": 500844, "raw": ["500844", "020211", "0", "2023/Aug/25 09:54", "Vasco bvba", "Vasco", "X500 - EasyFlow rigid oval duct system", "", "2017", "current", "", "3", "0", "2", "2", "3", "4", "1", "21.0", "0.88", "92", "2", "29.0", "0.78", "91", "3", "37.0", "0.80", "90", "4", "45.0", "0.86", "90"]}
+{"pcdb_id": 500845, "raw": ["500845", "020211", "0", "2023/Aug/25 09:54", "Vasco bvba", "Vasco", "X500 - 90mm semi-rigid duct system", "", "2017", "current", "", "3", "0", "2", "2", "3", "6", "1", "21.0", "0.79", "92", "2", "29.0", "0.73", "91", "3", "37.0", "0.76", "90", "4", "45.0", "0.87", "90", "5", "53.0", "0.90", "90", "6", "61.0", "1.00", "89"]}
+{"pcdb_id": 500846, "raw": ["500846", "020002", "0", "2023/Sep/11 14:09", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq S", "499883", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.39", "93", "2", "29.0", "0.46", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.70", "91", "5", "53.0", "0.85", "90", "6", "61.0", "1.07", "89", "7", "69.0", "1.31", "89"]}
+{"pcdb_id": 500847, "raw": ["500847", "020002", "0", "2023/Sep/11 14:08", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq M", "499632", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.41", "93", "2", "29.0", "0.41", "93", "3", "37.0", "0.46", "92", "4", "45.0", "0.55", "92", "5", "53.0", "0.66", "91", "6", "61.0", "0.81", "91", "7", "69.0", "1.00", "90"]}
+{"pcdb_id": 500848, "raw": ["500848", "020002", "0", "2023/Sep/11 14:08", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq L", "499641", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "93", "2", "29.0", "0.53", "93", "3", "37.0", "0.56", "93", "4", "45.0", "0.62", "92", "5", "53.0", "0.72", "91", "6", "61.0", "0.84", "91", "7", "69.0", "1.01", "90"]}
+{"pcdb_id": 500849, "raw": ["500849", "020130", "0", "2023/Sep/25 15:07", "Vero Duco N.V.", "Duco", "DucoBox Energy Comfort D400", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "90", "2", "29.0", "0.53", "90", "3", "37.0", "0.57", "90", "4", "45.0", "0.65", "89", "5", "53.0", "0.76", "89", "6", "61.0", "0.90", "88", "7", "69.0", "1.08", "88"]}
+{"pcdb_id": 500850, "raw": ["500850", "020130", "0", "2023/Sep/25 15:01", "Vero Duco N.V.", "Duco", "DucoBox Energy Comfort Plus D350", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "90", "2", "29.0", "0.53", "90", "3", "37.0", "0.57", "90", "4", "45.0", "0.65", "89", "5", "53.0", "0.76", "89", "6", "61.0", "0.90", "88", "7", "69.0", "1.08", "88"]}
+{"pcdb_id": 500851, "raw": ["500851", "020130", "0", "2023/Sep/25 14:53", "Vero Duco N.V.", "Duco", "DucoBox Energy Comfort Plus D450", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "90", "2", "29.0", "0.53", "90", "3", "37.0", "0.57", "90", "4", "45.0", "0.65", "89", "5", "53.0", "0.76", "89", "6", "61.0", "0.90", "88", "7", "69.0", "1.08", "88"]}
+{"pcdb_id": 500852, "raw": ["500852", "020209", "0", "2023/Nov/15 08:55", "Airsmart BV", "AirSmart", "Ictus 350", "", "2021", "current", "", "3", "1", "2", "1", "3", "7", "1", "21.0", "0.68", "91", "2", "29.0", "0.66", "90", "3", "37.0", "0.70", "88", "4", "45.0", "0.81", "87", "5", "53.0", "0.96", "86", "6", "61.0", "1.12", "85", "7", "69.0", "1.31", "84"]}
+{"pcdb_id": 500853, "raw": ["500853", "020209", "0", "2023/Nov/15 08:55", "Airsmart BV", "AirSmart", "Ictus 450", "", "2021", "current", "", "3", "1", "2", "1", "3", "7", "1", "21.0", "0.65", "89", "2", "29.0", "0.62", "88", "3", "37.0", "0.68", "87", "4", "45.0", "0.80", "86", "5", "53.0", "0.95", "85", "6", "61.0", "1.07", "84", "7", "69.0", "1.30", "83"]}
+{"pcdb_id": 500854, "raw": ["500854", "020170", "0", "2023/Nov/30 10:08", "HEATPEX SP. Z O.O.", "HEATPEX", "ARIA VITALE 300", "", "2023", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.74", "88", "2", "29.0", "0.73", "88", "3", "37.0", "0.79", "86", "4", "45.0", "0.91", "85", "5", "53.0", "0.95", "85"]}
+{"pcdb_id": 500855, "raw": ["500855", "020170", "0", "2023/Nov/30 10:28", "HEATPEX SP. Z O.O.", "HEATPEX", "ARIA VITALE 450", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.84", "89", "2", "29.0", "0.81", "88", "3", "37.0", "0.89", "86", "4", "45.0", "1.06", "85", "5", "53.0", "1.13", "85", "6", "61.0", "1.32", "84", "7", "69.0", "1.43", "84"]}
+{"pcdb_id": 500856, "raw": ["500856", "020170", "0", "2023/Nov/30 10:28", "HEATPEX SP. Z O.O.", "HEATPEX", "ARIA VITALE 600", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.84", "89", "2", "29.0", "0.81", "88", "3", "37.0", "0.89", "86", "4", "45.0", "1.06", "85", "5", "53.0", "1.13", "85", "6", "61.0", "1.32", "84", "7", "69.0", "1.43", "84"]}
+{"pcdb_id": 500857, "raw": ["500857", "020018", "0", "2023/Nov/28 15:22", "National Ventilation", "National Ventilation", "Monsoon Energysaver Intelli-Plus S", "MEI-Plus S", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.39", "93", "2", "29.0", "0.46", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.70", "91", "5", "53.0", "0.85", "90", "6", "61.0", "1.07", "89", "7", "69.0", "1.31", "89"]}
+{"pcdb_id": 500858, "raw": ["500858", "020018", "0", "2023/Nov/28 15:23", "National Ventilation", "National Ventilation", "Monsoon Energysaver Intelli-Plus M", "MEI-Plus M", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.41", "93", "2", "29.0", "0.41", "93", "3", "37.0", "0.46", "92", "4", "45.0", "0.55", "92", "5", "53.0", "0.66", "91", "6", "61.0", "0.81", "91", "7", "69.0", "1.00", "90"]}
+{"pcdb_id": 500859, "raw": ["500859", "020018", "0", "2023/Nov/28 15:23", "National Ventilation", "National Ventilation", "Monsoon Energysaver Intelli-Plus L", "MEI-Plus L", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "93", "2", "29.0", "0.53", "93", "3", "37.0", "0.56", "93", "4", "45.0", "0.62", "92", "5", "53.0", "0.72", "91", "6", "61.0", "0.84", "91", "7", "69.0", "1.01", "90"]}
+{"pcdb_id": 500860, "raw": ["500860", "020223", "0", "2023/Dec/15 12:35", "Ecovolt Ltd", "Ecovolt", "EVAir", "", "2023", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.46", "", "2", "29.0", "0.33", "", "3", "37.0", "0.33", "", "4", "45.0", "0.39", "", "5", "53.0", "0.44", "", "6", "61.0", "0.54"]}
+{"pcdb_id": 500871, "raw": ["500871", "020002", "0", "2024/Jan/02 17:07", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq-Cool", "412380", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.39", "93", "2", "29.0", "0.46", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.70", "91", "5", "53.0", "0.85", "90", "6", "61.0", "1.07", "89", "7", "69.0", "1.31", "89"]}
+{"pcdb_id": 500872, "raw": ["500872", "020130", "0", "2024/Jan/04 12:16", "Vero Duco N.V.", "Duco", "DucoBox Energy Comfort D325", "", "2021", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.60", "91", "2", "29.0", "0.57", "91", "3", "37.0", "0.61", "91", "4", "45.0", "0.71", "90", "5", "53.0", "0.81", "90", "6", "61.0", "0.98", "89", "7", "69.0", "1.17", "89"]}
+{"pcdb_id": 500873, "raw": ["500873", "020030", "0", "2024/Jan/30 11:22", "Aldes", "Aldes", "InspirAir Top 450 Premium", "", "2021", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.52", "92", "3", "37.0", "0.57", "92", "4", "45.0", "0.67", "92", "5", "53.0", "0.81", "92", "6", "61.0", "1.01", "92", "7", "69.0", "1.27", "91"]}
+{"pcdb_id": 500874, "raw": ["500874", "020030", "0", "2024/Jan/31 12:48", "Aldes", "Aldes", "InspirAIR Top 300 Classic", "", "2021", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.51", "90", "2", "29.0", "0.48", "90", "3", "37.0", "0.54", "89", "4", "45.0", "0.64", "88", "5", "53.0", "0.76", "87", "6", "61.0", "0.94", "86", "7", "69.0", "1.16", "86"]}
+{"pcdb_id": 500876, "raw": ["500876", "020094", "0", "2024/Mar/08 15:45", "Viessmann Ltd", "Viessmann", "Vitovent 300-W", "H32S A225", "2020", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.62", "92", "2", "29.0", "0.64", "91", "3", "37.0", "0.69", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.96", "88", "6", "61.0", "1.17", "88"]}
+{"pcdb_id": 500877, "raw": ["500877", "020094", "0", "2024/Mar/08 15:46", "Viessmann Ltd", "Viessmann", "Vitovent 300-W", "H32S C325", "2020", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.55", "92", "2", "29.0", "0.52", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.63", "90", "5", "53.0", "0.73", "90", "6", "61.0", "0.86", "89", "7", "69.0", "1.00", "89"]}
+{"pcdb_id": 500878, "raw": ["500878", "020094", "0", "2024/Mar/08 15:47", "Viessmann Ltd", "Viessmann", "Vitovent 300-W", "H32S C400", "2020", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.48", "92", "2", "29.0", "0.49", "91", "3", "37.0", "0.53", "90", "4", "45.0", "0.63", "90", "5", "53.0", "0.74", "90", "6", "61.0", "0.90", "89", "7", "69.0", "1.08", "89"]}
+{"pcdb_id": 500879, "raw": ["500879", "020094", "0", "2024/Mar/08 15:48", "Viessmann Ltd", "Viessmann", "Vitovent 300-W", "H32S A600", "2020", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.59", "94", "3", "37.0", "0.61", "94", "4", "45.0", "0.69", "94", "5", "53.0", "0.78", "93", "6", "61.0", "0.93", "92", "7", "69.0", "1.09", "92"]}
+{"pcdb_id": 500880, "raw": ["500880", "020094", "0", "2024/Mar/08 15:49", "Viessmann Ltd", "Viessmann", "Vitovent 300-C", "H32S B150", "2016", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.75", "88", "2", "29.0", "0.86", "85", "3", "37.0", "1.04", "84"]}
+{"pcdb_id": 500881, "raw": ["500881", "020091", "0", "2024/Mar/20 15:10", "Sabiana", "Lindab", "RHR-CF-V", "280 PRO", "2022", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "91", "2", "29.0", "0.55", "90", "3", "37.0", "0.62", "90", "4", "45.0", "0.77", "89", "5", "53.0", "0.92", "88"]}
+{"pcdb_id": 500882, "raw": ["500882", "020091", "0", "2024/Mar/20 15:09", "SABIANA", "Lindab", "RHR-CF-V", "370 PRO", "2022", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.54", "91", "2", "29.0", "0.55", "91", "3", "37.0", "0.61", "90", "4", "45.0", "0.74", "89", "5", "53.0", "0.89", "89"]}
+{"pcdb_id": 500883, "raw": ["500883", "020091", "0", "2024/Mar/20 15:09", "SABIANA", "Lindab", "RHR-CF-V", "460 PRO", "2022", "current", "", "3", "0", "2", "1", "3", "5", "3", "37.0", "0.71", "90", "4", "45.0", "0.85", "89", "5", "53.0", "1.03", "89", "6", "61.0", "1.30", "89", "7", "69.0", "1.61", "89"]}
+{"pcdb_id": 500884, "raw": ["500884", "020091", "0", "2024/Mar/20 15:09", "SABIANA", "Lindab", "RHR-CF-V", "600 PRO", "2022", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.72", "91", "3", "37.0", "0.78", "90", "4", "45.0", "0.92", "90", "5", "53.0", "1.08", "89", "6", "61.0", "1.31", "89", "7", "69.0", "1.58", "89"]}
+{"pcdb_id": 500885, "raw": ["500885", "020091", "0", "2024/Mar/20 15:08", "SABIANA", "Lindab", "RHR-CF-V", "280 PRO EL / ER", "2022", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "91", "2", "29.0", "0.55", "90", "3", "37.0", "0.62", "90", "4", "45.0", "0.77", "89", "5", "53.0", "0.92", "88"]}
+{"pcdb_id": 500886, "raw": ["500886", "020091", "0", "2024/Mar/20 15:08", "SABIANA", "Lindab", "RHR-CF-V", "370 PRO EL / ER", "2022", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.54", "91", "2", "29.0", "0.55", "91", "3", "37.0", "0.61", "90", "4", "45.0", "0.74", "89", "5", "53.0", "0.89", "89"]}
+{"pcdb_id": 500887, "raw": ["500887", "020091", "0", "2024/Mar/20 15:08", "SABIANA", "Lindab", "RHR-CF-V", "460 PRO EL / ER", "2022", "current", "", "3", "0", "2", "1", "3", "5", "3", "37.0", "0.71", "90", "4", "45.0", "0.85", "89", "5", "53.0", "1.03", "89", "6", "61.0", "1.30", "89", "7", "69.0", "1.61", "89"]}
+{"pcdb_id": 500888, "raw": ["500888", "020091", "0", "2024/Mar/20 15:07", "SABIANA", "Lindab", "RHR-CF-V", "600 PRO EL / ER", "2022", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.72", "91", "3", "37.0", "0.78", "90", "4", "45.0", "0.92", "90", "5", "53.0", "1.08", "89", "6", "61.0", "1.31", "89", "7", "69.0", "1.58", "89"]}
+{"pcdb_id": 500889, "raw": ["500889", "020235", "0", "2024/Mar/20 09:18", "Sabiana S.p.A", "Sabiana SpA", "ENERGY SMART VERTICAL PRO", "ENY-SP-280", "2017", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "91", "2", "29.0", "0.55", "90", "3", "37.0", "0.62", "90", "4", "45.0", "0.77", "89", "5", "53.0", "0.92", "88"]}
+{"pcdb_id": 500890, "raw": ["500890", "020235", "0", "2024/Mar/20 09:18", "Sabiana S.p.A", "Sabiana SpA", "ENERGY SMART VERTICAL PRO", "ENY-SPEL/R-280", "2017", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "91", "2", "29.0", "0.55", "90", "3", "37.0", "0.62", "90", "4", "45.0", "0.77", "89", "5", "53.0", "0.92", "88"]}
+{"pcdb_id": 500891, "raw": ["500891", "020235", "0", "2024/Mar/20 09:17", "Sabiana S.p.A", "Sabiana SpA", "ENERGY SMART VERTICAL PRO", "ENY-SP-370", "2017", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.54", "91", "2", "29.0", "0.55", "91", "3", "37.0", "0.61", "90", "4", "45.0", "0.74", "89", "5", "53.0", "0.89", "89"]}
+{"pcdb_id": 500892, "raw": ["500892", "020235", "0", "2024/Mar/20 09:17", "Sabiana S.p.A", "Sabiana SpA", "ENERGY SMART VERTICAL PRO", "ENY-SPEL/R-370", "2017", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.54", "91", "2", "29.0", "0.55", "91", "3", "37.0", "0.61", "90", "4", "45.0", "0.74", "89", "5", "53.0", "0.89", "89"]}
+{"pcdb_id": 500893, "raw": ["500893", "020235", "0", "2024/Mar/20 09:17", "Sabiana S.p.A", "Sabiana SpA", "ENERGY SMART VERTICAL PRO", "ENY-SP-460", "2017", "current", "", "3", "0", "2", "1", "3", "5", "3", "37.0", "0.71", "90", "4", "45.0", "0.85", "89", "5", "53.0", "1.03", "89", "6", "61.0", "1.30", "89", "7", "69.0", "1.61", "89"]}
+{"pcdb_id": 500894, "raw": ["500894", "020235", "0", "2024/Mar/20 09:16", "Sabiana S.p.A", "Sabiana SpA", "ENERGY SMART VERTICAL PRO", "ENY-SPEL/R-460", "2017", "current", "", "3", "0", "2", "1", "3", "5", "3", "37.0", "0.71", "90", "4", "45.0", "0.85", "89", "5", "53.0", "1.03", "89", "6", "61.0", "1.30", "89", "7", "69.0", "1.61", "89"]}
+{"pcdb_id": 500895, "raw": ["500895", "020235", "0", "2024/Mar/20 09:16", "Sabiana S.p.A", "Sabiana SpA", "ENERGY SMART VERTICAL PRO", "ENY-SP-600", "2021", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.72", "91", "3", "37.0", "0.78", "90", "4", "45.0", "0.92", "90", "5", "53.0", "1.08", "89", "6", "61.0", "1.31", "89", "7", "69.0", "1.58", "89"]}
+{"pcdb_id": 500896, "raw": ["500896", "020235", "0", "2024/Mar/20 09:15", "Sabiana S.p.A", "Sabiana SpA", "ENERGY SMART VERTICAL PRO", "ENY-SPEL/R-600", "2021", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.72", "91", "3", "37.0", "0.78", "90", "4", "45.0", "0.92", "90", "5", "53.0", "1.08", "89", "6", "61.0", "1.31", "89", "7", "69.0", "1.58", "89"]}
+{"pcdb_id": 500900, "raw": ["500900", "020002", "0", "2024/May/15 13:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq SC", "411077", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.39", "93", "2", "29.0", "0.46", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.70", "91", "5", "53.0", "0.85", "90", "6", "61.0", "1.07", "89", "7", "69.0", "1.31", "89"]}
+{"pcdb_id": 500901, "raw": ["500901", "020002", "0", "2024/May/15 13:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq MC", "499638", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.41", "93", "2", "29.0", "0.41", "93", "3", "37.0", "0.46", "92", "4", "45.0", "0.55", "92", "5", "53.0", "0.66", "91", "6", "61.0", "0.81", "91", "7", "69.0", "1.00", "90"]}
+{"pcdb_id": 500902, "raw": ["500902", "020002", "0", "2024/May/15 13:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq LC", "499647", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "93", "2", "29.0", "0.53", "93", "3", "37.0", "0.56", "93", "4", "45.0", "0.62", "92", "5", "53.0", "0.72", "91", "6", "61.0", "0.84", "91", "7", "69.0", "1.01", "90"]}
+{"pcdb_id": 500903, "raw": ["500903", "020002", "0", "2024/May/15 13:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq SCP RH", "499890", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.39", "93", "2", "29.0", "0.46", "92", "3", "37.0", "0.55", "91", "4", "45.0", "0.70", "91", "5", "53.0", "0.85", "90", "6", "61.0", "1.07", "89", "7", "69.0", "1.31", "89"]}
+{"pcdb_id": 500904, "raw": ["500904", "020002", "0", "2024/May/15 13:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq MCP RH", "499639", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.41", "93", "2", "29.0", "0.41", "93", "3", "37.0", "0.46", "92", "4", "45.0", "0.55", "92", "5", "53.0", "0.66", "91", "6", "61.0", "0.81", "91", "7", "69.0", "1.00", "90"]}
+{"pcdb_id": 500905, "raw": ["500905", "020002", "0", "2024/May/15 13:33", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq LCP RH", "499648", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "93", "2", "29.0", "0.53", "93", "3", "37.0", "0.56", "93", "4", "45.0", "0.62", "92", "5", "53.0", "0.72", "91", "6", "61.0", "0.84", "91", "7", "69.0", "1.01", "90"]}
+{"pcdb_id": 500906, "raw": ["500906", "020027", "0", "2024/May/24 16:47", "S&P", "EnviroVent", "Sabik 350 E", "", "2022", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.54", "83", "2", "29.0", "0.55", "81", "3", "37.0", "0.56", "80", "4", "45.0", "0.66", "78", "5", "53.0", "0.78", "76", "6", "61.0", "0.97", "75"]}
+{"pcdb_id": 500907, "raw": ["500907", "020027", "0", "2024/May/24 16:47", "S&P", "EnviroVent", "Sabik 500 E", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.71", "84", "2", "29.0", "0.65", "84", "3", "37.0", "0.64", "82", "4", "45.0", "0.75", "81", "5", "53.0", "0.87", "80", "6", "61.0", "1.00", "78", "7", "69.0", "1.18", "77"]}
+{"pcdb_id": 500908, "raw": ["500908", "020027", "0", "2024/May/24 16:47", "S&P", "EnviroVent", "Altair 120 H", "", "2023", "current", "", "3", "0", "2", "1", "1", "2", "1", "21.0", "0.77", "80", "2", "29.0", "1.00", "80"]}
+{"pcdb_id": 500909, "raw": ["500909", "020027", "0", "2024/May/24 16:48", "S&P", "EnviroVent", "Altair 160 H", "", "2023", "current", "", "3", "0", "2", "1", "1", "3", "1", "21.0", "0.65", "83", "2", "29.0", "0.75", "79", "3", "37.0", "0.94", "75"]}
+{"pcdb_id": 500910, "raw": ["500910", "020031", "0", "2024/May/31 12:13", "NIBE Energy Systems Ltd", "NIBE", "NIBE S735-7 R EM 1X230V UK", "", "2023", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.65", "", "2", "29.0", "0.56", "", "3", "37.0", "0.53", "", "4", "45.0", "0.57", "", "5", "53.0", "0.59", "", "6", "61.0", "0.66"]}
+{"pcdb_id": 500911, "raw": ["500911", "020031", "0", "2024/May/31 12:12", "NIBE Energy Systems Ltd", "NIBE", "S735-7 R EM 1X230V UK + SAM S42", "", "2023", "current", "", "4", "1", "2", "1", "", "6", "1", "21.0", "1.21", "", "2", "29.0", "1.11", "", "3", "37.0", "1.13", "", "4", "45.0", "1.25", "", "5", "53.0", "1.36", "", "6", "61.0", "1.62"]}
+{"pcdb_id": 500913, "raw": ["500913", "020050", "0", "2024/Jun/26 09:56", "Aereco SAS", "Aereco", "V4A2", "V4A2 Premium", "2024", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.16", "", "4", "45.0", "0.20", "", "5", "53.0", "0.23", "", "6", "61.0", "0.28"]}
+{"pcdb_id": 500914, "raw": ["500914", "020050", "0", "2024/Jun/26 09:59", "Aereco Ltd", "Aereco", "V4A2", "V4A2 75mm semi-rigid", "2024", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.18", "", "4", "45.0", "0.20", "", "5", "53.0", "0.24", "", "6", "61.0", "0.29"]}
+{"pcdb_id": 500915, "raw": ["500915", "020130", "0", "2024/Jul/19 08:47", "Vero Duco N.V.", "Duco", "DucoBox Energy Comfort Plus D550 UK", "", "2022", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.66", "88", "2", "29.0", "0.61", "88", "3", "37.0", "0.64", "88", "4", "45.0", "0.71", "88", "5", "53.0", "0.81", "88", "6", "61.0", "0.95", "87", "7", "69.0", "1.11", "87"]}
+{"pcdb_id": 500916, "raw": ["500916", "020045", "0", "2024/Jul/31 10:01", "Daikin Europe NV", "Daikin Altherma", "EKHHEU200CV37", "", "2024", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.40", "", "2", "29.0", "0.41", "", "3", "37.0", "0.46", "", "4", "45.0", "0.58", "", "5", "53.0", "0.71", "", "6", "61.0", "0.90"]}
+{"pcdb_id": 500917, "raw": ["500917", "020045", "0", "2024/Jul/31 10:03", "Daikin Europe NV", "Daikin Altherma", "EKHHEU260CV37", "", "2024", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.41", "", "2", "29.0", "0.41", "", "3", "37.0", "0.45", "", "4", "45.0", "0.55", "", "5", "53.0", "0.70", "", "6", "61.0", "0.89"]}
+{"pcdb_id": 500918, "raw": ["500918", "020240", "0", "2024/Aug/14 10:09", "Systemair Ltd", "Systemair", "SAVE VTR 150/B", "", "2018", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.98", "69", "2", "29.0", "1.03", "71", "3", "37.0", "1.21", "73", "4", "45.0", "1.50", "73"]}
+{"pcdb_id": 500919, "raw": ["500919", "020030", "0", "2024/Sep/24 08:30", "Aldes", "Exhausto", "VEX 40 T Classic", "", "2021", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.51", "90", "2", "29.0", "0.48", "90", "3", "37.0", "0.54", "89", "4", "45.0", "0.64", "88", "5", "53.0", "0.76", "87", "6", "61.0", "0.94", "86", "7", "69.0", "1.16", "86"]}
+{"pcdb_id": 500920, "raw": ["500920", "020237", "0", "2024/Sep/16 16:05", "Siber Zone S.L.U", "SIBER", "SF ECO", "Higro", "2023", "current", "", "1", "0", "2", "1", "", "4", "1", "21.0", "0.27", "", "2", "29.0", "0.28", "", "3", "37.0", "0.30", "", "4", "45.0", "0.27"]}
+{"pcdb_id": 500925, "raw": ["500925", "020002", "0", "2024/Oct/17 12:30", "Vent Axia Ltd", "Vent Axia", "Sentinel Econiq-Cool L", "413775", "2024", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "93", "2", "29.0", "0.53", "93", "3", "37.0", "0.56", "93", "4", "45.0", "0.62", "92", "5", "53.0", "0.72", "91", "6", "61.0", "0.84", "91", "7", "69.0", "1.01", "90"]}
+{"pcdb_id": 500928, "raw": ["500928", "020139", "0", "2024/Dec/11 17:35", "Ubbink UK Ltd", "Ubbink", "Vigor W600 4/0 L GB", "", "", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.59", "94", "3", "37.0", "0.61", "94", "4", "45.0", "0.69", "94", "5", "53.0", "0.78", "93", "6", "61.0", "0.93", "92", "7", "69.0", "1.09", "92"]}
+{"pcdb_id": 500929, "raw": ["500929", "020030", "0", "2024/Dec/09 14:05", "Aldes", "Aldes", "InspirAIR Side 180 Classic (DHU)", "", "2024", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.67", "87", "2", "29.0", "0.74", "84", "3", "37.0", "0.90", "82", "4", "45.0", "1.15", "81", "5", "53.0", "1.41", "79"]}
+{"pcdb_id": 500930, "raw": ["500930", "020030", "0", "2024/Dec/09 13:30", "Aldes", "Aldes", "InspirAIR Side 300 Classic (DHU)", "", "2024", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.56", "90", "2", "29.0", "0.57", "89", "3", "37.0", "0.65", "87", "4", "45.0", "0.81", "85", "5", "53.0", "0.97", "83", "6", "61.0", "1.19", "83", "7", "69.0", "1.45", "82"]}
+{"pcdb_id": 500931, "raw": ["500931", "020139", "0", "2024/Dec/11 17:34", "Brink", "Ubbink", "Vigor W450 4/0 L GB", "", "2018", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.59", "94", "3", "37.0", "0.61", "94", "4", "45.0", "0.69", "94", "5", "53.0", "0.78", "93", "6", "61.0", "0.93", "92", "7", "69.0", "1.09", "92"]}
+{"pcdb_id": 500932, "raw": ["500932", "020139", "0", "2024/Dec/11 17:34", "Ubbink UK Ltd", "Ubbink", "Vigor W225 4/0 L GB", "", "", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.62", "92", "2", "29.0", "0.64", "91", "3", "37.0", "0.69", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.96", "88", "6", "61.0", "1.17", "88"]}
+{"pcdb_id": 500935, "raw": ["500935", "020130", "0", "2025/Jan/31 10:17", "Vero Duco N.V.", "Duco", "DucoBox Energy Sky D275 UK", "", "2024", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.64", "93", "2", "29.0", "0.63", "92", "3", "37.0", "0.68", "91", "4", "45.0", "0.83", "90", "5", "53.0", "0.97", "90", "6", "61.0", "1.16", "90", "7", "69.0", "1.39", "89"]}
+{"pcdb_id": 500936, "raw": ["500936", "020130", "0", "2025/Jan/31 10:18", "Vero Duco N.V.", "Duco", "DucoBox Silent Connect UK", "00004455", "2013", "current", "", "1", "0", "2", "1", "", "6", "1", "21.4", "0.31", "", "2", "29.0", "0.26", "", "3", "37.0", "0.25", "", "4", "45.0", "0.26", "", "5", "53.6", "0.29", "", "6", "61.1", "0.32"]}
+{"pcdb_id": 500937, "raw": ["500937", "020031", "0", "2024/Sep/26 09:56", "NIBE Energy Systems Ltd", "NIBE", "NIBE S735-4 R EM 1X230V UK", "", "2023", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.65", "", "2", "29.0", "0.56", "", "3", "37.0", "0.53", "", "4", "45.0", "0.57", "", "5", "53.0", "0.59", "", "6", "61.0", "0.66"]}
+{"pcdb_id": 500938, "raw": ["500938", "020031", "0", "2024/Sep/26 09:52", "NIBE Energy Systems Ltd", "NIBE", "S735-4 R EM 1X230V UK + SAM S42", "", "2023", "current", "", "4", "1", "2", "1", "", "6", "1", "21.0", "1.21", "", "2", "29.0", "1.11", "", "3", "37.0", "1.13", "", "4", "45.0", "1.25", "", "5", "53.0", "1.36", "", "6", "61.0", "1.62"]}
+{"pcdb_id": 500939, "raw": ["500939", "020016", "0", "2025/Feb/24 16:38", "ProAir Heat Recovery and Ventilation Systems Ltd", "ProAir", "PA700LI", "", "2024", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.58", "95", "2", "29.0", "0.55", "95", "3", "37.0", "0.56", "94", "4", "45.0", "0.59", "93", "5", "53.0", "0.68", "93", "6", "61.0", "0.75", "92", "7", "69.0", "0.88", "91"]}
+{"pcdb_id": 500940, "raw": ["500940", "020047", "0", "2025/Feb/18 11:48", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-250CZPVU-L-E-2", "", "2024", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "90", "2", "29.0", "0.67", "89", "3", "37.0", "0.79", "88", "4", "45.0", "1.00", "87", "5", "53.0", "1.19", "87"]}
+{"pcdb_id": 500941, "raw": ["500941", "020047", "0", "2025/Feb/18 11:48", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-250CZPVU-R-E-2", "", "2024", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "90", "2", "29.0", "0.67", "89", "3", "37.0", "0.79", "88", "4", "45.0", "1.00", "87", "5", "53.0", "1.19", "87"]}
+{"pcdb_id": 500942, "raw": ["500942", "020047", "0", "2025/Feb/18 11:48", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-350CZPVU-L-E-2", "", "2024", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.86", "90", "2", "29.0", "0.80", "90", "3", "37.0", "0.84", "89", "4", "45.0", "0.96", "89", "5", "53.0", "1.08", "88", "6", "61.0", "1.28", "87"]}
+{"pcdb_id": 500943, "raw": ["500943", "020047", "0", "2025/Feb/18 11:49", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-350CZPVU-R-E-2", "", "2024", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.86", "90", "2", "29.0", "0.80", "90", "3", "37.0", "0.84", "89", "4", "45.0", "0.96", "89", "5", "53.0", "1.08", "88", "6", "61.0", "1.28", "87"]}
+{"pcdb_id": 500944, "raw": ["500944", "020047", "0", "2025/Feb/18 11:49", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-500CZPVU-L-E-2", "", "2024", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.80", "91", "2", "29.0", "0.72", "90", "3", "37.0", "0.74", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.91", "88", "6", "61.0", "1.09", "88", "7", "69.0", "1.24", "88"]}
+{"pcdb_id": 500945, "raw": ["500945", "020047", "0", "2025/Feb/18 11:49", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-500CZPVU-R-E-2", "", "2024", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.80", "91", "2", "29.0", "0.72", "90", "3", "37.0", "0.74", "90", "4", "45.0", "0.82", "89", "5", "53.0", "0.91", "88", "6", "61.0", "1.09", "88", "7", "69.0", "1.24", "88"]}
+{"pcdb_id": 500946, "raw": ["500946", "020038", "0", "2025/Feb/20 15:52", "Titon Hardware Ltd", "Beam", "Axco MEV130 AIP", "", "2022", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.17", "", "2", "29.0", "0.16", "", "3", "37.0", "0.17", "", "4", "45.0", "0.20", "", "5", "53.0", "0.23", "", "6", "61.0", "0.26"]}
+{"pcdb_id": 500947, "raw": ["500947", "020016", "0", "2025/Feb/24 16:13", "ProAir Heat Recovery and Ventilation Systems Ltd", "ProAir", "PA700HLI", "", "2024", "current", "", "3", "0", "2", "1", "1", "7", "1", "21.0", "0.65", "93", "2", "29.0", "0.67", "93", "3", "37.0", "0.75", "93", "4", "45.0", "0.88", "92", "5", "53.0", "1.05", "91", "6", "61.0", "1.26", "90", "7", "69.0", "1.53", "90"]}
+{"pcdb_id": 500948, "raw": ["500948", "020073", "0", "2025/Feb/27 15:42", "Dantherm Air Handling A/S", "Dantherm", "RCC220 P2", "", "2024", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "1.00", "86", "2", "29.0", "1.19", "84", "3", "37.0", "1.49", "82"]}
+{"pcdb_id": 500949, "raw": ["500949", "020065", "0", "2025/Feb/18 09:40", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "VRC-W 600 Premium", "204714", "2024", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.46", "92", "3", "37.0", "0.49", "92", "4", "45.0", "0.55", "91", "5", "53.0", "0.63", "91", "6", "61.0", "0.75", "90", "7", "69.0", "0.90", "90"]}
+{"pcdb_id": 500950, "raw": ["500950", "020065", "0", "2025/Feb/18 09:40", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "VRC-W 600 E Premium", "204715", "2024", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.43", "87", "3", "37.0", "0.45", "85", "4", "45.0", "0.52", "83", "5", "53.0", "0.60", "82", "6", "61.0", "0.74", "80", "7", "69.0", "0.86", "79"]}
+{"pcdb_id": 500951, "raw": ["500951", "020065", "0", "2025/Feb/18 09:41", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "VRC-W 450 Premium", "204940", "2024", "current", "204940", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.46", "92", "3", "37.0", "0.49", "92", "4", "45.0", "0.55", "91", "5", "53.0", "0.63", "91", "6", "61.0", "0.75", "90", "7", "69.0", "0.90", "90"]}
+{"pcdb_id": 500952, "raw": ["500952", "020065", "0", "2025/Feb/18 09:41", "Stiebel Eltron UK Ltd", "Stiebel Eltron", "VRC-W 450 E Premium", "204941", "2024", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.43", "87", "3", "37.0", "0.45", "85", "4", "45.0", "0.52", "83", "5", "53.0", "0.60", "82", "6", "61.0", "0.74", "80", "7", "69.0", "0.86", "79"]}
+{"pcdb_id": 500953, "raw": ["500953", "020248", "0", "2025/Feb/24 16:54", "Qvantum Energi AB", "Qvantum", "QE4", "", "2024", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.27", "", "2", "29.0", "0.32", "", "3", "37.0", "0.41", "", "4", "45.0", "0.54", "", "5", "53.0", "0.68", "", "6", "61.0", "0.91"]}
+{"pcdb_id": 500954, "raw": ["500954", "020248", "0", "2025/Feb/24 16:47", "Qvantum Energi AB", "Qvantum", "QE6", "", "2024", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.27", "", "2", "29.0", "0.32", "", "3", "37.0", "0.41", "", "4", "45.0", "0.54", "", "5", "53.0", "0.68", "", "6", "61.0", "0.91"]}
+{"pcdb_id": 500955, "raw": ["500955", "020204", "0", "2025/Mar/27 16:29", "Airbot Technologies AS", "AIROBOT", "AIROBOT-V3-HRV-R-W", "", "2022", "current", "", "3", "0", "2", "1", "4", "6", "1", "21.0", "0.81", "88", "2", "29.0", "0.79", "87", "3", "37.0", "0.87", "86", "4", "45.0", "1.04", "85", "5", "53.0", "1.23", "85", "6", "61.0", "1.51", "84"]}
+{"pcdb_id": 500956, "raw": ["500956", "020038", "0", "2025/Mar/28 15:05", "Titon Hardware", "Beam", "AXCO C440", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.42", "91", "2", "29.0", "0.43", "90", "3", "37.0", "0.50", "89", "4", "45.0", "0.60", "88", "5", "53.0", "0.73", "87", "6", "61.0", "0.90", "86", "7", "69.0", "1.08", "86"]}
+{"pcdb_id": 500957, "raw": ["500957", "020038", "0", "2025/Sep/17 09:51", "Titon Hardware Ltd", "Beam", "AXCO C570", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.47", "91", "2", "29.0", "0.49", "90", "3", "37.0", "0.54", "89", "4", "45.0", "0.65", "88", "5", "53.0", "0.75", "87", "6", "61.0", "0.91", "86", "7", "69.0", "1.09", "86"]}
+{"pcdb_id": 500958, "raw": ["500958", "020242", "0", "2025/Apr/28 15:36", "Valsir Spa", "ARIOSA HV 170 E", "ARIOSA HV 170 Enthalpy", "", "2023", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "0.61", "85", "2", "29.0", "0.68", "84", "3", "37.0", "0.82", "83"]}
+{"pcdb_id": 500959, "raw": ["500959", "020242", "0", "2025/Apr/28 15:37", "Valsir Spa", "ARIOSA HV 170 S", "ARIOSA HV 170 Sensible", "", "2023", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.65", "90", "2", "29.0", "0.70", "89", "3", "37.0", "0.83", "89", "4", "45.0", "1.04", "87"]}
+{"pcdb_id": 500960, "raw": ["500960", "020242", "0", "2025/Apr/28 15:38", "Valsir Spa", "ARIOSA HV  250 E", "ARIOSA HV 250 Enthalpy", "", "2023", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "85", "2", "29.0", "0.69", "84", "3", "37.0", "0.84", "83", "4", "45.0", "1.05", "83", "5", "53.0", "1.30", "82"]}
+{"pcdb_id": 500961, "raw": ["500961", "020242", "0", "2025/Apr/28 15:40", "Valsir Spa", "ARIOSA HV  250 S", "ARIOSA HV 250 Sensible", "", "2023", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.64", "90", "2", "29.0", "0.70", "89", "3", "37.0", "0.88", "89", "4", "45.0", "1.10", "87", "5", "53.0", "1.38", "87"]}
+{"pcdb_id": 500962, "raw": ["500962", "020248", "0", "2025/Apr/28 16:47", "Qvantum Energy Technology UK Limited", "Qvantum", "QE4 + QS", "", "2025", "current", "", "4", "1", "2", "1", "", "6", "1", "21.0", "0.55", "", "2", "29.0", "0.66", "", "3", "37.0", "0.86", "", "4", "45.0", "1.08", "", "5", "53.0", "1.35", "", "6", "61.0", "1.75"]}
+{"pcdb_id": 500963, "raw": ["500963", "020248", "0", "2025/Apr/28 16:47", "Qvantum Energy Technology UK Limited", "Qvantum", "QE6 + QS", "", "2025", "current", "", "4", "1", "2", "1", "", "6", "1", "21.0", "0.55", "", "2", "29.0", "0.66", "", "3", "37.0", "0.83", "", "4", "45.0", "1.08", "", "5", "53.0", "1.35", "", "6", "61.0", "1.75"]}
+{"pcdb_id": 500964, "raw": ["500964", "020130", "0", "2025/May/23 12:41", "Vero Duco N.V.", "Duco", "DucoBox Reno UK", "00004948", "2023", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.16", "", "2", "29.0", "0.19", "", "3", "37.0", "0.20", "", "4", "45.0", "0.22", "", "5", "53.0", "0.24", "", "6", "61.0", "0.27"]}
+{"pcdb_id": 500966, "raw": ["500966", "020087", "0", "2025/Jun/26 11:19", "Sinergia Srl", "Panasonic", "P-VEN15XQAZE5", "", "2023", "current", "", "3", "0", "2", "1", "4", "4", "1", "21.0", "0.80", "87", "2", "29.0", "0.88", "84", "3", "37.0", "1.11", "84", "4", "45.0", "1.48", "83"]}
+{"pcdb_id": 500967, "raw": ["500967", "020087", "0", "2025/Jun/26 11:20", "Sinergia Srl", "Panasonic", "P-VEN20XQAZE5", "", "2023", "current", "", "3", "0", "2", "1", "4", "6", "1", "21.0", "0.81", "88", "2", "29.0", "0.77", "87", "3", "37.0", "0.91", "85", "4", "45.0", "1.06", "85", "5", "53.0", "1.22", "84", "6", "61.0", "1.50", "83"]}
+{"pcdb_id": 500968, "raw": ["500968", "020087", "0", "2025/Jun/26 11:26", "Sinergia Srl", "Panasonic", "P-VEN30XQAZE5", "", "2023", "current", "", "3", "0", "2", "1", "4", "5", "1", "21.0", "0.75", "88", "2", "29.0", "0.82", "86", "3", "37.0", "0.97", "85", "4", "45.0", "1.15", "84", "5", "53.0", "1.31", "84"]}
+{"pcdb_id": 500969, "raw": ["500969", "020087", "0", "2025/Jun/26 11:28", "Sinergia Srl", "Panasonic", "P-VEN40XQAVE5", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.70", "90", "2", "29.0", "0.64", "89", "3", "37.0", "0.76", "88", "4", "45.0", "0.82", "88", "5", "53.0", "0.96", "87", "6", "61.0", "1.19", "87", "7", "69.0", "1.39", "87"]}
+{"pcdb_id": 500970, "raw": ["500970", "020087", "0", "2025/Jun/26 11:31", "Sinergia Srl", "Panasonic", "P-VEN45XQAHE5", "", "2023", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "0.72", "90", "2", "29.0", "0.72", "88", "3", "37.0", "0.74", "88", "4", "45.0", "0.88", "85", "5", "53.0", "1.05", "84", "6", "61.0", "1.20", "84", "7", "69.0", "1.43", "83"]}
+{"pcdb_id": 500971, "raw": ["500971", "020087", "0", "2025/Jun/26 11:36", "Sinergia Srl", "Panasonic", "P-VEN45XQAVE5", "", "2023", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.78", "91", "2", "29.0", "0.66", "89", "3", "37.0", "0.69", "90", "4", "45.0", "0.80", "88", "5", "53.0", "0.97", "88", "6", "61.0", "1.18", "87", "7", "69.0", "1.37", "87"]}
+{"pcdb_id": 500972, "raw": ["500972", "020242", "0", "2025/Jun/26 15:58", "Valsir Spa", "ARIOSA 330 S", "ARIOSA HV 330 Sensible", "", "2025", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.69", "88", "2", "29.0", "0.77", "86", "3", "37.0", "0.88", "85", "4", "45.0", "1.08", "84", "5", "53.0", "1.28", "84"]}
+{"pcdb_id": 500973, "raw": ["500973", "020242", "0", "2025/Jun/26 16:02", "Valsir Spa", "ARIOSA 330 E", "ARIOSA HV 330 Enthalpy", "", "2025", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.73", "84", "2", "29.0", "0.74", "83", "3", "37.0", "0.86", "82", "4", "45.0", "1.05", "82", "5", "53.0", "1.27", "81"]}
+{"pcdb_id": 500974, "raw": ["500974", "020240", "0", "2025/Jun/26 10:27", "Systemair Ltd", "Systemair", "Save VTR 275/B L", "", "2023", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.84", "68", "2", "29.0", "0.84", "70", "3", "37.0", "0.91", "72", "4", "45.0", "1.08", "72", "5", "53.0", "1.24", "73", "6", "61.1", "1.47", "72"]}
+{"pcdb_id": 500975, "raw": ["500975", "020112", "0", "2025/Jun/26 11:04", "Blauberg UK Ltd", "Blauberg", "Passiv-180-H", "", "2024", "current", "", "3", "0", "2", "1", "3", "4", "1", "21.0", "0.57", "89", "2", "29.0", "0.66", "87", "3", "37.0", "0.85", "86", "4", "45.0", "1.11", "85"]}
+{"pcdb_id": 500976, "raw": ["500976", "020084", "0", "2025/Jul/07 15:19", "FRÄNKISCHE ROHRWERKE", "FRÄNKISCHE", "profi-air 130 flat", "", "2024", "current", "", "3", "0", "2", "1", "3", "3", "1", "21.0", "1.00", "86", "2", "29.0", "1.19", "84", "3", "37.0", "1.49", "82"]}
+{"pcdb_id": 500977, "raw": ["500977", "020042", "0", "2025/Jul/23 09:00", "Brink Climate Systems B.V.", "Brink", "Ease 200", "", "2025", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "86", "2", "29.0", "0.72", "85", "3", "37.0", "0.89", "84", "4", "45.0", "1.16", "84", "5", "53.0", "1.44", "83"]}
+{"pcdb_id": 500981, "raw": ["500981", "020009", "0", "2025/Aug/08 12:22", "Vortice Ltd", "Vortice", "Invisible Mini Top", "", "2020", "current", "", "3", "0", "2", "1", "3", "2", "1", "21.0", "1.14", "76", "2", "29.0", "1.48", "73"]}
+{"pcdb_id": 500982, "raw": ["500982", "020287", "0", "2025/Aug/05 09:46", "Rega Ventilation", "RegaVent", "250RS", "", "2025", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.94", "87", "2", "29.0", "0.94", "86", "3", "37.0", "1.06", "84", "4", "45.0", "1.25", "83", "5", "53.0", "1.50", "81"]}
+{"pcdb_id": 500983, "raw": ["500983", "020047", "0", "2025/Sep/12 11:35", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-520CZPVU-R-E", "", "2025", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.80", "87", "2", "29.0", "0.74", "88", "3", "37.0", "0.76", "88", "4", "45.0", "0.84", "88", "5", "53.0", "0.94", "87", "6", "61.0", "1.10", "86", "7", "69.0", "1.27", "86"]}
+{"pcdb_id": 500984, "raw": ["500984", "020047", "0", "2025/Sep/12 11:37", "Mitsubishi Electric Europe B.V.", "Mitsubishi Electric", "VL-520CZPVU-L-E", "", "2025", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.80", "87", "2", "29.0", "0.74", "88", "3", "37.0", "0.76", "88", "4", "45.0", "0.84", "88", "5", "53.0", "0.94", "87", "6", "61.0", "1.10", "86", "7", "69.0", "1.27", "86"]}
+{"pcdb_id": 500985, "raw": ["500985", "020288", "0", "2025/Aug/04 16:16", "Airsmart", "Airsmart", "ICTUS 250 Wall", "", "2025", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.58", "93", "2", "29.0", "0.53", "93", "3", "37.0", "0.55", "93", "4", "45.0", "0.62", "92", "5", "53.0", "0.72", "91", "6", "61.0", "0.86", "91", "7", "69.0", "1.04", "90"]}
+{"pcdb_id": 500986, "raw": ["500986", "020288", "0", "2025/Aug/04 16:16", "Airsmart", "Airsmart", "ICTUS 350 Wall", "", "2025", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.58", "93", "2", "29.0", "0.53", "93", "3", "37.0", "0.55", "93", "4", "45.0", "0.62", "92", "5", "53.0", "0.72", "91", "6", "61.0", "0.86", "91", "7", "69.0", "1.04", "90"]}
+{"pcdb_id": 500987, "raw": ["500987", "020288", "0", "2025/Aug/04 16:17", "Airsmart", "Airsmart", "ICTUS 450 Wall", "", "2025", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "93", "2", "29.0", "0.56", "94", "3", "37.0", "0.57", "93", "4", "45.0", "0.65", "93", "5", "53.0", "0.75", "92", "6", "61.0", "0.88", "92", "7", "69.0", "1.02", "91"]}
+{"pcdb_id": 500988, "raw": ["500988", "020288", "0", "2025/Aug/04 16:17", "Airsmart", "Airsmart", "ICTUS 550 Wall", "", "2025", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.59", "93", "2", "29.0", "0.56", "94", "3", "37.0", "0.57", "93", "4", "45.0", "0.65", "93", "5", "53.0", "0.75", "92", "6", "61.0", "0.88", "92", "7", "69.0", "1.02", "91"]}
+{"pcdb_id": 500989, "raw": ["500989", "020145", "0", "2025/Sep/23 13:43", "KERS Innovations UK Ltd", "KERS Energy Recovery", "KERS MEV 230", "", "2020", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.34", "", "2", "29.0", "0.32", "", "3", "37.0", "0.33", "", "4", "45.0", "0.40", "", "5", "53.0", "0.47", "", "6", "61.0", "0.56"]}
+{"pcdb_id": 500990, "raw": ["500990", "020145", "0", "2025/Sep/23 13:43", "KERS Innovations UK Ltd", "KERS Energy Recovery", "KERS MEV 160", "", "2020", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.34", "", "2", "29.0", "0.32", "", "3", "37.0", "0.33", "", "4", "45.0", "0.40", "", "5", "53.0", "0.47", "", "6", "61.0", "0.56"]}
+{"pcdb_id": 500991, "raw": ["500991", "020145", "0", "2025/Sep/23 13:43", "KERS Innovations UK Ltd", "KERS Energy Recovery", "KERS MEV 300", "", "2020", "current", "", "1", "1", "2", "1", "", "6", "1", "21.0", "0.34", "", "2", "29.0", "0.32", "", "3", "37.0", "0.33", "", "4", "45.0", "0.40", "", "5", "53.0", "0.47", "", "6", "61.0", "0.56"]}
+{"pcdb_id": 500993, "raw": ["500993", "020226", "0", "2025/Oct/31 09:18", "Airfi", "Airfi", "Model 60", "", "2019", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.96", "78", "2", "29.0", "0.95", "78", "3", "37.0", "1.07", "78", "4", "45.0", "1.23", "79", "5", "53.0", "1.46", "79"]}
+{"pcdb_id": 500994, "raw": ["500994", "020226", "0", "2025/Oct/31 09:17", "Airfi", "Airfi", "Model 150", "", "2019", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.83", "73", "2", "29.0", "0.75", "75", "3", "37.0", "0.80", "77", "4", "45.0", "0.88", "78", "5", "53.0", "1.07", "78", "6", "61.0", "1.19", "79", "7", "69.0", "1.38", "79"]}
+{"pcdb_id": 500995, "raw": ["500995", "020052", "0", "2025/Nov/03 16:40", "Brook Design Hardware Ltd", "Brookvent", "Airstream ACE 75mm Semi-Rigid", "", "2022", "current", "", "1", "0", "2", "2", "", "6", "1", "21.0", "0.20", "", "2", "29.0", "0.21", "", "3", "37.0", "0.25", "", "4", "45.0", "0.29", "", "5", "53.0", "0.34", "", "6", "61.0", "0.42"]}
+{"pcdb_id": 500996, "raw": ["500996", "020240", "0", "2025/Nov/03 16:33", "Systemair Ltd", "Systemair", "SAVE VTR 350/B L", "", "2025", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.88", "73", "2", "29.0", "0.82", "76", "3", "37.0", "0.83", "78", "4", "45.0", "0.93", "79", "5", "53.0", "1.03", "79", "6", "61.0", "1.19", "80", "7", "69.0", "1.36", "80"]}
+{"pcdb_id": 501001, "raw": ["501001", "020287", "0", "2025/Nov/28 09:24", "Rega Ventilation", "RegaVent", "600RS", "", "2025", "current", "", "3", "0", "2", "1", "3", "6", "2", "29.0", "0.82", "87", "3", "37.0", "0.80", "87", "4", "45.0", "0.87", "86", "5", "53.0", "1.00", "85", "6", "61.0", "1.19", "84", "7", "69.0", "1.33", "83"]}
+{"pcdb_id": 501003, "raw": ["501003", "020003", "0", "2026/Jan/19 11:41", "The Nuaire Group", "Nuaire", "MRXBOXAB-ECO-VM1", "", "2025", "current", "", "3", "0", "2", "1", "3", "2", "1", "21.0", "0.75", "83", "2", "29.0", "0.95", "81"]}
+{"pcdb_id": 501004, "raw": ["501004", "020204", "0", "2026/Jan/21 11:01", "Airbot Technologies AS", "AIROBOT", "V6-HRV", "", "2025", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.91", "95", "2", "29.0", "0.86", "94", "3", "37.0", "0.88", "94", "4", "45.0", "0.99", "93", "5", "53.0", "1.10", "92", "6", "61.0", "1.26", "92", "7", "69.0", "1.49", "91"]}
+{"pcdb_id": 501005, "raw": ["501005", "020090", "0", "2026/Jan/19 15:26", "Aerauliqa SRL", "Elta", "HAVA 120HV", "", "2025", "current", "", "3", "0", "2", "2", "1", "1", "1", "21.0", "1.16", "82"]}
+{"pcdb_id": 501006, "raw": ["501006", "020090", "0", "2026/Jan/19 15:29", "Aerauliqa SRL", "Elta", "HAVA 180H", "", "2025", "current", "", "3", "0", "2", "1", "4", "3", "1", "21.0", "0.78", "86", "2", "29.0", "0.83", "84", "3", "37.0", "0.96", "82"]}
+{"pcdb_id": 501007, "raw": ["501007", "020090", "0", "2026/Jan/19 15:32", "Aerauliqa SRL", "Elta", "HAVA 280V", "", "2025", "current", "", "3", "0", "2", "1", "4", "4", "1", "21.0", "0.76", "91", "2", "29.0", "0.89", "90", "3", "37.0", "1.09", "88", "4", "45.0", "1.39", "87"]}
+{"pcdb_id": 501008, "raw": ["501008", "020090", "0", "2026/Jan/19 15:34", "Aerauliqa SRL", "Elta", "HAVA 340H", "", "2025", "current", "", "3", "0", "2", "1", "4", "5", "1", "21.0", "0.78", "90", "2", "29.0", "0.83", "88", "3", "37.0", "0.96", "86", "4", "45.0", "1.18", "84", "5", "53.0", "1.42", "83"]}
+{"pcdb_id": 501009, "raw": ["501009", "020090", "0", "2026/Jan/19 15:39", "Aerauliqa SRL", "Elta", "HAVA 400V", "", "2025", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "0.64", "84", "2", "29.0", "0.60", "84", "3", "37.0", "0.63", "84", "4", "45.0", "0.72", "83", "5", "53.0", "0.85", "82", "6", "61.0", "1.03", "82", "7", "69.0", "1.24", "81"]}
+{"pcdb_id": 501010, "raw": ["501010", "020090", "0", "2026/Jan/19 15:42", "Aerauliqa SRL", "Elta", "HAVA 550V", "", "2025", "current", "", "3", "0", "2", "1", "4", "7", "1", "21.0", "0.62", "90", "2", "29.0", "0.61", "89", "3", "37.0", "0.64", "89", "4", "45.0", "0.78", "88", "5", "53.0", "0.92", "88", "6", "61.0", "1.08", "87", "7", "69.0", "1.28", "87"]}
+{"pcdb_id": 501011, "raw": ["501011", "020139", "0", "2026/Jan/26 13:38", "Brink Climate Systems B.V.", "Ubbink", "Ubiflux Compact W200", "", "2024", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "86", "2", "29.0", "0.72", "85", "3", "37.0", "0.89", "84", "4", "45.0", "1.16", "84", "5", "53.0", "1.44", "83"]}
+{"pcdb_id": 501012, "raw": ["501012", "020050", "0", "2026/Feb/25 08:59", "Aereco Ltd", "Aereco", "C4A", "C4A 75mm Semi-Rigid", "2025", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.24", "", "2", "29.0", "0.22", "", "3", "37.0", "0.22", "", "4", "45.0", "0.26", "", "5", "53.0", "0.30", "", "6", "61.0", "0.34"]}
+{"pcdb_id": 501013, "raw": ["501013", "020050", "0", "2026/Feb/25 09:00", "Aereco Ltd", "Aereco", "C4A", "C4A 90mm Semi-Rigid", "2025", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.28", "", "2", "29.0", "0.25", "", "3", "37.0", "0.26", "", "4", "45.0", "0.27", "", "5", "53.0", "0.32", "", "6", "61.0", "0.37"]}
+{"pcdb_id": 501014, "raw": ["501014", "020050", "0", "2026/Feb/25 09:01", "Aereco Ltd", "Aereco", "C4A", "C4A Rigid Duct", "2025", "current", "", "1", "0", "2", "1", "", "6", "1", "21.0", "0.22", "", "2", "29.0", "0.26", "", "3", "37.0", "0.24", "", "4", "45.0", "0.27", "", "5", "53.0", "0.31", "", "6", "61.0", "0.33"]}
+{"pcdb_id": 501015, "raw": ["501015", "020003", "0", "2026/Feb/09 15:04", "The Nuaire Group", "Nuaire", "MRXBOX-PH350", "", "2026", "current", "", "3", "0", "2", "1", "3", "7", "1", "21.0", "0.67", "94", "2", "29.0", "0.66", "94", "3", "37.0", "0.72", "93", "4", "45.0", "0.82", "93", "5", "53.0", "0.97", "92", "6", "61.0", "1.19", "91", "7", "69.0", "1.41", "91"]}
+{"pcdb_id": 501016, "raw": ["501016", "020004", "0", "2026/Mar/30 15:39", "Zehnder Group UK Ltd", "Zehnder", "EVO 2", "EVO2-HRV-Z1-RW", "2026", "current", "", "3", "0", "2", "1", "3", "5", "1", "21.0", "0.62", "89", "2", "29.0", "0.67", "86", "3", "37.0", "0.84", "85", "4", "45.0", "1.06", "83", "5", "53.0", "1.34", "83"]}
+{"pcdb_id": 501017, "raw": ["501017", "020004", "0", "2026/Mar/30 15:42", "Zehnder Group UK Ltd", "Zehnder", "EVO 3", "EVO3-HRV-Z1-RW", "2026", "current", "", "3", "0", "2", "1", "3", "6", "1", "21.0", "0.50", "90", "2", "29.0", "0.54", "88", "3", "37.0", "0.65", "87", "4", "45.0", "0.80", "86", "5", "53.0", "0.97", "85", "6", "61.0", "1.25", "84"]}
+{"pcdb_id": 501018, "raw": ["501018", "020004", "0", "2026/Mar/30 15:45", "Zehnder Group UK Ltd", "Zehnder", "EVO 4", "EVO4-HRV-Z1-RW", "2026", "current", "", "3", "1", "2", "1", "3", "6", "2", "29.0", "0.71", "89", "3", "37.0", "0.74", "87", "4", "45.0", "0.91", "86", "5", "53.0", "1.07", "85", "6", "61.0", "1.30", "85", "7", "69.0", "1.56", "84"]}
diff --git a/domain/sap10_calculator/tables/pcdb/etl.py b/domain/sap10_calculator/tables/pcdb/etl.py
index c34bc5138..1f26117f8 100644
--- a/domain/sap10_calculator/tables/pcdb/etl.py
+++ b/domain/sap10_calculator/tables/pcdb/etl.py
@@ -16,10 +16,12 @@ from pathlib import Path
 from domain.sap10_calculator.tables.pcdb.parser import (
     DecentralisedMevRecord,
     GasOilBoilerRecord,
+    MvhrRecord,
     MvInUseFactorsRecord,
     RawPcdbRecord,
     parse_table_105,
     parse_table_322,
+    parse_table_323,
     parse_table_329,
     parse_table_raw,
 )
@@ -27,6 +29,7 @@ from domain.sap10_calculator.tables.pcdb.parser import (
 
 _TABLE_105_OUTPUT_FILENAME: str = "pcdb_table_105_gas_oil_boilers.jsonl"
 _TABLE_322_OUTPUT_FILENAME: str = "pcdb_table_322_decentralised_mev.jsonl"
+_TABLE_323_OUTPUT_FILENAME: str = "pcdb_table_323_centralised_mev_mvhr.jsonl"
 _TABLE_329_OUTPUT_FILENAME: str = "pcdb_table_329_mv_in_use_factors.jsonl"
 # Tables ingested as `RawPcdbRecord` (pcdb_id + raw) — per-field typing is
 # deferred to follow-up slices when the cert-side wiring for each table
@@ -84,6 +87,14 @@ def run_etl(*, source: Path, output_dir: Path) -> None:
             for r in parse_table_322(dat_text)
         ],
     )
+    # Table 323 (Centralised MEV and MVHR) — typed via `parse_table_323`,
+    # exposing the per-wet-room SFP + heat-recovery-efficiency test points
+    # for the SAP 10.2 §2.6.4/§2.6.6 MVHR cascade. Stored as raw row +
+    # typed-on-load (consistent with Table 322).
+    _write_ndjson(
+        output_path=output_dir / _TABLE_323_OUTPUT_FILENAME,
+        records=[_mvhr_record_to_jsonable(r) for r in parse_table_323(dat_text)],
+    )
     # Table 329 (MV In-Use Factors) — typed via `parse_table_329`,
     # exposing the per-ducting-type SFP IUF multipliers for "no
     # approved scheme" installations (the only variant our cohort
@@ -112,6 +123,13 @@ def _decentralised_mev_record_to_jsonable(
     return {"pcdb_id": record.pcdb_id, "raw": list(record.raw)}
 
 
+def _mvhr_record_to_jsonable(record: MvhrRecord) -> dict[str, object]:
+    """Serialise a typed Table 323 record as `{pcdb_id, raw}` — same
+    shape as the other typed tables; the lookup re-decodes via
+    `parse_centralised_mv_row` at import time."""
+    return {"pcdb_id": record.pcdb_id, "raw": list(record.raw)}
+
+
 def _mv_in_use_factors_record_to_jsonable(
     record: MvInUseFactorsRecord,
 ) -> dict[str, object]:
diff --git a/domain/sap10_calculator/tables/pcdb/parser.py b/domain/sap10_calculator/tables/pcdb/parser.py
index 1b4dc80ed..4e34195ff 100644
--- a/domain/sap10_calculator/tables/pcdb/parser.py
+++ b/domain/sap10_calculator/tables/pcdb/parser.py
@@ -523,10 +523,18 @@ def parse_table_322(dat_text: str) -> list[DecentralisedMevRecord]:
 # pcdb10.dat carries Format 432 (header `$329,432,4,2021,11,25,2`), an
 # extended-field version of spec Format 430. The spec's first 4 fields
 # (system_type + 3 SFP factors for "no approved scheme") align with the
-# Format 432 layout positions 0-3 — the only positions this slice
-# decodes. Trailing fields (MVHR adjustments + "with-scheme" variants +
-# additional Format 432 columns) are preserved verbatim in `raw` for
-# follow-up slices.
+# Format 432 layout positions 0-3. Format 432 expands each "adjustment"
+# block to 7 columns (3 SFP + 4 MVHR-efficiency) and carries THREE
+# blocks (positions 1-7 "no scheme", 8-14 "with scheme", 15-21 a third
+# variant), then the timestamp. The MVHR efficiency-IUF columns within a
+# block are 4 (vs Format 430's documented 2: uninsulated/insulated); the
+# 3rd (index +6 within the block) is the "ducts inside the heated
+# envelope" factor — worksheet-proven against simulated case 49 (Vent
+# Axia 500140, system_type 3 → 0.90) and cross-checked against the
+# default-data row (system_type 10 → 0.70, = SAP 10.2 Table 4g default
+# heat-recovery in-use factor 0.70). The outside-envelope efficiency
+# columns (indices +4/+5/+7) and the with-scheme blocks are preserved
+# verbatim in `raw` (no corpus/worksheet fixture exercises them yet).
 #
 # System types per PCDF Spec §A.20 field 1:
 #   1  = centralised MEV
@@ -539,6 +547,10 @@ _MV_IUF_IDX_SYSTEM_TYPE: Final[int] = 0
 _MV_IUF_IDX_SFP_FLEX_NO_SCHEME: Final[int] = 1
 _MV_IUF_IDX_SFP_RIGID_NO_SCHEME: Final[int] = 2
 _MV_IUF_IDX_SFP_NO_DUCT_NO_SCHEME: Final[int] = 3
+# MVHR heat-recovery efficiency in-use factor, "no approved scheme" block,
+# ducts inside the heated envelope (Format 432 position 6 = block-1 eff
+# column index +2). See the block-layout note above.
+_MV_IUF_IDX_MVHR_EFF_INSIDE_NO_SCHEME: Final[int] = 6
 
 
 @dataclass(frozen=True)
@@ -562,6 +574,10 @@ class MvInUseFactorsRecord:
     sfp_iuf_flexible_no_scheme: Optional[float]
     sfp_iuf_rigid_no_scheme: Optional[float]
     sfp_iuf_no_duct_no_scheme: Optional[float]
+    # MVHR heat-recovery efficiency in-use factor for ducts inside the
+    # heated envelope, "no approved scheme" block (Format 432). None for
+    # system types that carry no heat-recovery efficiency (1/2/5).
+    mvhr_efficiency_iuf_inside_no_scheme: Optional[float]
     raw: tuple[str, ...]
 
 
@@ -588,6 +604,11 @@ def parse_mv_in_use_factors_row(row: str) -> MvInUseFactorsRecord:
         sfp_iuf_no_duct_no_scheme=_parse_optional_float(
             fields[_MV_IUF_IDX_SFP_NO_DUCT_NO_SCHEME]
         ),
+        mvhr_efficiency_iuf_inside_no_scheme=(
+            _parse_optional_float(fields[_MV_IUF_IDX_MVHR_EFF_INSIDE_NO_SCHEME])
+            if len(fields) > _MV_IUF_IDX_MVHR_EFF_INSIDE_NO_SCHEME
+            else None
+        ),
         raw=fields,
     )
 
@@ -629,3 +650,118 @@ def parse_decentralised_mev_row(row: str) -> DecentralisedMevRecord:
         fan_configs=tuple(configs),
         raw=fields,
     )
+
+
+# Table 323 (Centralised MEV and MVHR) — PCDF Spec Rev 6b §A.18 Format 426.
+# pcdb10.dat carries Format 431 (header `$323,431,...`), which extends spec
+# Format 426 by (a) slotting an extra blank "replacement_id" field between
+# `final_year` (idx 9) and `main_type` (idx 11, mirroring Table 322's
+# layout) and (b) compressing each per-configuration test group to a
+# 4-field tuple `(num_wet_rooms, applicable_flow_l_per_s, sfp, efficiency)`
+# — the spec's "Fan speed setting" + duplicate flow fields are dropped.
+#
+# Field 11 "Main type" (PCDF §A.18): 1=centralised MEV, 3=balanced
+# whole-house MV WITH heat recovery, 4=...without heat recovery,
+# 5=positive input ventilation. Only type 3 with a non-blank efficiency
+# is MVHR (24a); the rest are extract/PIV and carry no heat-recovery
+# efficiency.
+#
+# Each test group's leading field is the number of wet rooms; SAP 10.2
+# §2.6.4 ("MVHR ... SFP is a single value depending on the number of wet
+# rooms") selects the group whose wet-room count matches the dwelling
+# lodgement. Worksheet-proven on simulated case 49 (000565, 2 wet rooms,
+# Vent Axia Sentinel Kinetic B 500140 → group 2 = flow 21.0, SFP 0.88,
+# efficiency 91%).
+_CMV_IDX_BRAND_NAME: Final[int] = 5
+_CMV_IDX_MODEL_NAME: Final[int] = 6
+_CMV_IDX_MODEL_QUALIFIER: Final[int] = 7
+_CMV_IDX_MAIN_TYPE: Final[int] = 11
+_CMV_IDX_DUCT_TESTED: Final[int] = 13  # 1=flexible, 2=rigid (PCDF §A.18 f.13)
+_CMV_IDX_NUM_CONFIGS: Final[int] = 16
+_CMV_GROUP_START: Final[int] = 17
+_CMV_GROUP_STRIDE: Final[int] = 4  # (wet_rooms, flow, sfp, efficiency)
+_CMV_MAIN_TYPE_MVHR: Final[int] = 3
+
+
+@dataclass(frozen=True)
+class MvhrDataPoint:
+    """One per-configuration test result from a Table 323 PCDB record.
+
+    `num_wet_rooms` is the configuration's wet-room count (the SAP 10.2
+    §2.6.4 selector); `flow_rate_l_per_s` is the applicable test flow
+    rate; `sfp_w_per_l_per_s` is the raw Specific Fan Power; `efficiency_pct`
+    is the raw MVHR heat-exchanger efficiency in % (None for MEV/PIV
+    records that carry no heat recovery). All are pre-in-use-factor.
+    """
+
+    num_wet_rooms: int
+    flow_rate_l_per_s: Optional[float]
+    sfp_w_per_l_per_s: Optional[float]
+    efficiency_pct: Optional[float]
+
+
+@dataclass(frozen=True)
+class MvhrRecord:
+    """PCDB Table 323 (Centralised MEV and MVHR) typed record.
+
+    SAP 10.2 §2.6.4/§2.6.6 — a balanced whole-house MVHR system lodges a
+    single SFP + heat-exchanger efficiency per wet-room configuration in
+    the PCDB. SAP selects the data point matching the dwelling's wet-room
+    count; the raw values are multiplied by the PCDB Table 329 in-use
+    factors before use (SFP → fan electricity (230a); efficiency → the
+    (23c) effective-air-change credit in equation (2)).
+
+    Reference: PCDF Spec Rev 6b §A.18 (Format 426 in spec, Format 431 in
+    pcdb10.dat).
+    """
+
+    pcdb_id: int
+    brand_name: str
+    model_name: str
+    model_qualifier: str
+    main_type: Optional[int]  # =3 for balanced whole-house MV (with/without HR)
+    duct_type_tested: Optional[int]  # 1=flexible, 2=rigid
+    data_points: tuple[MvhrDataPoint, ...]
+    raw: tuple[str, ...]
+
+
+def parse_centralised_mv_row(row: str) -> MvhrRecord:
+    """Decode one Table 323 (Centralised MEV / MVHR) Format-431 row into a
+    typed `MvhrRecord`. The header block holds the pcdb_id + manufacturer
+    identifiers + main type + tested duct type; the variable-length test
+    block carries one 4-field group per wet-room configuration."""
+    fields = tuple(row.rstrip("\r\n").split(","))
+    num_configs = _parse_optional_int(fields[_CMV_IDX_NUM_CONFIGS]) or 0
+    points: list[MvhrDataPoint] = []
+    for j in range(num_configs):
+        start = _CMV_GROUP_START + j * _CMV_GROUP_STRIDE
+        if start + _CMV_GROUP_STRIDE > len(fields):
+            break
+        wet_rooms_str = fields[start].strip()
+        if not wet_rooms_str:
+            continue
+        points.append(
+            MvhrDataPoint(
+                num_wet_rooms=int(wet_rooms_str),
+                flow_rate_l_per_s=_parse_optional_float(fields[start + 1]),
+                sfp_w_per_l_per_s=_parse_optional_float(fields[start + 2]),
+                efficiency_pct=_parse_optional_float(fields[start + 3]),
+            )
+        )
+    return MvhrRecord(
+        pcdb_id=int(fields[0]),
+        brand_name=fields[_CMV_IDX_BRAND_NAME],
+        model_name=fields[_CMV_IDX_MODEL_NAME],
+        model_qualifier=fields[_CMV_IDX_MODEL_QUALIFIER],
+        main_type=_parse_optional_int(fields[_CMV_IDX_MAIN_TYPE]),
+        duct_type_tested=_parse_optional_int(fields[_CMV_IDX_DUCT_TESTED]),
+        data_points=tuple(points),
+        raw=fields,
+    )
+
+
+def parse_table_323(dat_text: str) -> list[MvhrRecord]:
+    """Walk a PCDB dat string, yielding parsed Table 323 (Centralised MEV
+    and MVHR) records via `parse_centralised_mv_row`. Mirror of
+    `parse_table_322` for the decentralised-MEV table."""
+    return [parse_centralised_mv_row(row) for row in _walk_table_records(dat_text, "323")]
diff --git a/domain/sap10_calculator/tables/table_12a.py b/domain/sap10_calculator/tables/table_12a.py
index ab5394f10..63345d914 100644
--- a/domain/sap10_calculator/tables/table_12a.py
+++ b/domain/sap10_calculator/tables/table_12a.py
@@ -262,6 +262,33 @@ _RULE_3_TEN_HOUR_CODES: Final[frozenset[int]] = frozenset(
     + [691, 692, 693, 694, 699]  # electric room heaters (Table 4a)
 )
 
+# §12 Unknown-meter exception: "main heating is ground source or water source
+# heat pump" makes the dwelling dual even though the same heat pump on a Single
+# meter stays standard. This is the GROUND/WATER-source subset of Table 4a
+# (SAP 10.2 PDF p.176-177): ground 211/215/221/225 + warm-air 521/525, water
+# 213/216/223/226 + warm-air 523/526. AIR-source (214/217/224/227, 524/527) is
+# DELIBERATELY EXCLUDED — the spec names only ground/water source. A heat pump
+# lodged via a PCDB database index without one of these SAP codes can't have
+# its source type read from the code alone (coverage gap: rare, 0 corpus certs).
+_GROUND_OR_WATER_SOURCE_HEAT_PUMP_CODES: Final[frozenset[int]] = frozenset(
+    {211, 215, 221, 225, 521, 525}   # ground source (radiator + warm-air)
+    | {213, 216, 223, 226, 523, 526}  # water source (radiator + warm-air)
+)
+
+# The heating codes whose *presence* implies an off-peak (dual) meter: electric
+# CPSU (Rule 1) and storage-based electric (Rule 2). These charge overnight and
+# cannot run economically on a single rate, so the §12 dispatch already infers
+# off-peak for them when the meter is Unknown (see `tariff_dispatch`). Exposed so
+# *synthesis* (Landlord-Override / EPC-Prediction) can pair a coherent off-peak
+# meter with such a system from the SAP code alone — the single source of "which
+# systems are off-peak". Rule 3 (direct-acting electric, heat pumps, room
+# heaters) is deliberately NOT here: those run on demand and live on single-rate
+# meters too. A "Dual" meter on any of these lets the §12 dispatch resolve the
+# specific tariff (CPSU → 10-hour, storage → 7-hour).
+OFF_PEAK_IMPLYING_HEATING_CODES: Final[frozenset[int]] = (
+    _RULE_1_CPSU_CODES | _RULE_2_STORAGE_CODES
+)
+
 
 def _meter_is_unknown(meter_type: object) -> bool:
     """True when the meter is the RdSAP "Unknown" sentinel (code 3 / the
@@ -285,6 +312,7 @@ def rdsap_tariff_for_cert(
     main_2_sap_code: Optional[int] = None,
     main_1_is_heat_pump_database: bool = False,
     main_2_is_heat_pump_database: bool = False,
+    water_is_off_peak_dual_immersion: bool = False,
 ) -> Tariff:
     """RdSAP 10 §12 page 62 — full meter+heating tariff dispatch.
 
@@ -308,6 +336,12 @@ def rdsap_tariff_for_cert(
     Table 362 heat-pump record. Callers compute this via
     `heat_pump_record(main_heating_index_number) is not None`.
 
+    `water_is_off_peak_dual_immersion` signals the §12 Unknown-meter
+    exception "water heating ... intended to run off an off-peak tariff"
+    via the text-box "dual electric immersion" system (whc 903 + dual
+    immersion). On an Unknown meter this is enough to make the dwelling
+    "dual"; the 7-/10-hour choice then follows Rules 1-4 on the main.
+
     Cert 000565 (Main 1 SAP code 224 ASHP + Dual meter) → Rule 3 →
     TEN_HOUR, matching the worksheet's "10 Hour Off Peak" lodging.
     """
@@ -337,21 +371,45 @@ def rdsap_tariff_for_cert(
     # Dual meter — §12 Rules 1-4, where Rule 4 is the 7-hour default.
     if base is Tariff.SEVEN_HOUR:
         return _rules_1_to_3() or Tariff.SEVEN_HOUR
-    # "Unknown" meter (code 3): the assessor didn't record the tariff, but
-    # an electric CPSU (Rule 1) or STORAGE (Rule 2) main is physical
-    # evidence the dwelling is on an off-peak tariff — these charge
-    # overnight at the low rate and cannot run economically on a single
-    # rate, so the tariff is implied. Direct-acting electric / room heaters
-    # / heat pumps (Rule 3) are NOT off-peak evidence (they run on demand
-    # and exist on single-rate meters too), so they keep STANDARD here
-    # rather than being mis-billed 100% at the off-peak low rate. A
-    # non-electric main also keeps STANDARD (no Rule 4 default — Unknown
-    # must not force off-peak on a gas dwelling).
+    # "Unknown" meter (code 3, inaccessible): §12 (PDF p.62) — "treat as
+    # single meter EXCEPT where: main heating OR WATER HEATING are intended to
+    # run off an off-peak tariff (per systems listed in the text box above) or
+    # main heating is ground source or water source heat pump. If that results
+    # in a dual meter, assign tariff per rules 1 to 4." The text-box off-peak
+    # systems are electric storage heaters (401-409), underfloor (421/422),
+    # dry-core/water-storage boiler (193/195), CPSU (192), and DUAL ELECTRIC
+    # IMMERSION. So the off-peak trigger is NOT "any electric main" — a
+    # direct-acting / room-heater main on its own keeps the dwelling on a
+    # single meter (STANDARD); it only goes off-peak when one of the text-box
+    # systems is present. Once triggered, the meter becomes "dual" and the
+    # 7-hour/10-hour choice is made by the SAME Rules 1-4 on the main heating
+    # (so e.g. room heaters + dual immersion → Rule 3 → 10-hour).
+    #
+    # Worksheet-validated (2026-06-23, Khalim's "simulated case 48": main 691
+    # room heaters + Unknown meter + 903 DUAL electric immersion): Elmhurst
+    # SAP 57; ours 45 when this stayed STANDARD, 55 once the dual-immersion
+    # trigger routes it through Rule 3 → 10-hour (7-hour gives 45 — confirms
+    # 10-hour). The dual-immersion trigger flips exactly ONE corpus cert
+    # (Apartment 241, the genuine -5.38 under-rater, main 691 + 903 dual
+    # immersion); every other Unknown+dual-immersion cert already has a
+    # storage main (Rule 2). Single-immersion 691 certs (Flat 7, Flat 2) and
+    # whc-909 instantaneous certs correctly STAY standard — they carry no
+    # text-box off-peak system. The §12 third exception bullet ("main heating
+    # is ground source or water source heat pump") is the
+    # `_GROUND_OR_WATER_SOURCE_HEAT_PUMP_CODES` check — AIR-source heat pumps
+    # (214/224 etc.) are NOT a trigger and stay standard (e.g. corpus certs
+    # "3/10 Bedford House", main 214 ASHP on Unknown meters — verified 2026-06-
+    # 23 they keep STANDARD). No corpus cert carries a GSHP/WSHP on an Unknown
+    # meter, so this trigger is a spec-completeness forward guard (0 impact).
     if _meter_is_unknown(meter_type):
-        if main_codes & _RULE_1_CPSU_CODES:
-            return Tariff.TEN_HOUR
-        if main_codes & _RULE_2_STORAGE_CODES:
-            return Tariff.SEVEN_HOUR
+        off_peak_evidence = (
+            bool(main_codes & _RULE_1_CPSU_CODES)
+            or bool(main_codes & _RULE_2_STORAGE_CODES)
+            or bool(main_codes & _GROUND_OR_WATER_SOURCE_HEAT_PUMP_CODES)
+            or water_is_off_peak_dual_immersion
+        )
+        if off_peak_evidence:
+            return _rules_1_to_3() or Tariff.SEVEN_HOUR
         return Tariff.STANDARD
     # Single (code 2) or any other explicit non-off-peak meter.
     return base
diff --git a/domain/sap10_calculator/tables/table_32.py b/domain/sap10_calculator/tables/table_32.py
index 8377fe862..5bcb7863b 100644
--- a/domain/sap10_calculator/tables/table_32.py
+++ b/domain/sap10_calculator/tables/table_32.py
@@ -17,6 +17,7 @@ from __future__ import annotations
 
 from typing import Final, Optional
 
+from domain.sap10_calculator.exceptions import UnpricedFuelCode
 from domain.sap10_calculator.tables.table_12a import Tariff
 
 
@@ -106,6 +107,16 @@ API_FUEL_TO_TABLE_32: Final[dict[int, int]] = {
     10: 30, 11: 42, 12: 43, 13: 44, 14: 11, 15: 12, 16: 22, 17: 9,
     18: 75, 19: 76, 20: 51, 21: 52, 22: 53, 23: 55, 24: 54, 25: 41,
     26: 1, 27: 2, 28: 4, 29: 30, 30: 42, 31: 43, 32: 44, 33: 11,
+    # SAP Table 12 code 39 = "electricity, any tariff" (epc_codes.csv main_fuel
+    # 39 = "electricity, unspecified tariff"; spec footnote (j): defines an
+    # electric system, cost/CO2/PE = standard electricity). Resolve to standard
+    # electricity (30) so it classifies as electric and prices at the standard
+    # rate — otherwise it now raises UnpricedFuelCode (was: mis-rated non-electric).
+    # TODO (Khalim): "any tariff" collapses to the STANDARD electricity rate. In
+    # future, resolve 39 to the dwelling's actual tariff (meter_type → off-peak
+    # 7h/10h/18h/24h vs standard) so off-peak electric heating is priced at the
+    # off-peak rate rather than always standard.
+    39: 30,
 }
 
 # Gov-API `main_fuel_type` enum codes whose value COLLIDES with a
@@ -121,11 +132,17 @@ API_FUEL_TO_TABLE_32: Final[dict[int, int]] = {
 #   33 = coal — Table-32 code 33 is the electricity 10-hour low rate
 #        7.5 p vs house coal 3.67 p (and `is_electric_fuel_code(33)`
 #        wrongly classified the coal main as electric).
-# DEFERRED (not included): API 9 = dual fuel (mineral + wood) is also a
-# collision (Table-32 9 = LPG SC11F 3.48 p vs dual fuel 3.99 p) but the
-# 0.45 p delta nets neutral-to-negative on the (outlier-dominated)
-# dual-fuel certs and shifts them in a direction not yet understood —
-# investigate separately.
+#   9  = dual fuel (mineral + wood) — Table-32 code 9 is LPG SC11F
+#        3.48 p vs dual fuel 3.99 p. The gov-API lodges API enum 9 for a
+#        dual-fuel appliance (description "Room heaters, dual fuel
+#        (mineral and wood)"), but the same-value Table-32 lookup returns
+#        LPG 3.48 p, under-pricing the (mostly secondary) dual-fuel heat.
+#        A prior session deferred this as "direction not understood"
+#        while the EPC PE/CO2 lens was confounded by the climate-cascade
+#        bug (fixed in fc7c4d2d); on the corrected lens the dual-fuel
+#        secondary cohort over-rates (SAP too high = cost too low) by
+#        +0.55 signed, and pricing UP to the dual-fuel 3.99 p row reduces
+#        that over-rate — the correct direction.
 #
 # COMMUNITY FUELS (handled elsewhere, NOT here): API 30 (waste
 # combustion), 31 (biomass) and 32 (biogas) — all "(community)" in the
@@ -140,7 +157,7 @@ API_FUEL_TO_TABLE_32: Final[dict[int, int]] = {
 # cert_to_inputs), where the community meaning is unambiguous. Community
 # fuels 20/25 do not collide with an electricity code, so they resolve
 # correctly through the heat-network path without any special handling.
-_GOV_API_COLLISION_FUELS: Final[frozenset[int]] = frozenset({5, 33})
+_GOV_API_COLLISION_FUELS: Final[frozenset[int]] = frozenset({5, 9, 33})
 
 
 def canonical_fuel_code(fuel_code: Optional[int]) -> Optional[int]:
@@ -178,8 +195,16 @@ STANDING_CHARGE_GBP_PER_YR: Final[dict[int, float]] = {
 def unit_price_p_per_kwh(fuel_code: Optional[int]) -> float:
     """Unit price (p/kWh) for the given fuel code. Accepts either a
     Table 32 code or a gov API `main_fuel_type` / `water_heating_fuel`
-    enum; translates the latter via `API_FUEL_TO_TABLE_32`. Unknown →
-    mains gas (3.48 p/kWh)."""
+    enum; translates the latter via `API_FUEL_TO_TABLE_32`.
+
+    `None` (no fuel lodged) → mains-gas default; callers resolve a
+    "no system" before pricing. A concrete but UNRECOGNISED code raises
+    `UnpricedFuelCode` rather than silently defaulting to the gas price —
+    an unhandled fuel billed at 3.48 p/kWh mis-costs the dwelling (the
+    same failure mode as the dual-main wood-vs-electric over-cost). The
+    strict-raise surfaces the gap at the price boundary; 0 corpus certs
+    hit it today (every lodged fuel resolves), so the raise is a guard
+    against future / unmapped fuels, mirroring `MissingMainFuelType`."""
     if fuel_code is None:
         return _DEFAULT_P_PER_KWH
     if fuel_code in UNIT_PRICE_P_PER_KWH:
@@ -187,7 +212,7 @@ def unit_price_p_per_kwh(fuel_code: Optional[int]) -> float:
     translated = API_FUEL_TO_TABLE_32.get(fuel_code)
     if translated is not None and translated in UNIT_PRICE_P_PER_KWH:
         return UNIT_PRICE_P_PER_KWH[translated]
-    return _DEFAULT_P_PER_KWH
+    raise UnpricedFuelCode(fuel_code)
 
 
 def standing_charge_gbp(fuel_code: Optional[int]) -> float:
diff --git a/domain/sap10_calculator/worksheet/heat_transmission.py b/domain/sap10_calculator/worksheet/heat_transmission.py
index 0fed5174a..32ae5bf75 100644
--- a/domain/sap10_calculator/worksheet/heat_transmission.py
+++ b/domain/sap10_calculator/worksheet/heat_transmission.py
@@ -129,6 +129,25 @@ _DEFAULT_STOREY_HEIGHT_M: Final[float] = 2.5
 _CONSERVATORY_WALL_THICKNESS_MM: Final[int] = 300
 # SAP10.2 §3.2 curtain/blind thermal resistance applied to windows (and
 # roof windows) — turns raw window U into the worksheet's (27) effective U.
+#
+# PERMANENT SHUTTERS ARE DELIBERATELY NOT APPLIED. RdSAP 10 Table 24 note
+# (PDF p.51) genuinely specifies a larger R in formula (2) for permanent
+# shutters (0.13 uninsulated / 0.16 insulated) instead of this 0.04 curtain
+# allowance — but the accredited Elmhurst engine ("SAP 10 WORKSHEET ...
+# Version 10.2, February 2022") does NOT implement it, and the lodged
+# register we target was produced by that engine. Proven on Khalim's
+# "simulated case 46" worksheet: its INSULATED-shutter window (Metal,
+# U_raw 1.74) bills on (27) at U_eff 1.6268 = 1/(1/1.74 + 0.04), NOT the
+# R=0.16 value 1.3611; its UNINSULATED-shutter window (Wood, U_raw 1.69)
+# bills at 1.5830 = 1/(1/1.69 + 0.04), not the R=0.13 value 1.3856 — i.e.
+# R=0.04 on every window regardless of the lodged shutter type. A reverted
+# trial (`_window_added_resistance_m2k_per_w`, in git history) re-broke the
+# Elmhurst-pinned 000565 e2e fixture. The gov-API path was separately tested
+# (2026-06-21): 13 corpus certs lodge shuttered windows; applying the spec R
+# WORSENS cohort MAE 1.067 -> 1.245 (8 of 13 certs move away from lodged,
+# cert 41 +2.19 -> +3.94) while only band-gaming +3 borderline under-raters
+# into within-0.5 — net negative, and it would diverge from the very engine
+# that produced the lodged SAPs. Re-enable only if Elmhurst ships the clause.
 _WINDOW_CURTAIN_RESISTANCE_M2K_PER_W: Final[float] = 0.04
 
 # SAP10 glazing-type code (the cascade enum used on `SapWindow.glazing_type`,
@@ -171,7 +190,12 @@ def _synthesised_window_u_raw(windows: Optional[Sequence[SapWindow]]) -> float:
         if isinstance(code, int)
         else ("double", None)
     )
-    return u_window(installed_year=year, glazing_type=glaze, frame_type=w.frame_material)
+    return u_window(
+        installed_year=year,
+        glazing_type=glaze,
+        frame_type=w.frame_material,
+        glazing_gap=w.glazing_gap,
+    )
 # RdSAP10 §15 "Rounding of data" (p.66): "All element areas (gross)
 # including window areas and conservatory wall area: 2 d.p." plus
 # "U-values: 2 d.p.". This is the data-passed-to-SAP-calculator
@@ -1166,6 +1190,16 @@ def heat_transmission_from_cert(
         # lodgement is authoritative. Mirrors the roof's "another dwelling
         # above" override above. Cert 2115-4121-4711-9361-3686.
         part_floor_is_party = "another dwelling below" in (part.floor_type or "").lower()
+        # A part whose floor_type is a GROUND floor sits in contact with the
+        # ground (RdSAP 10 §3.12) and is therefore a heat-loss floor, even when
+        # the dwelling-level flat heuristic (`_dwelling_exposure`) defaults a
+        # flat to has_exposed_floor=False. The Elmhurst Summary path lodges a
+        # ground-floor flat's position as a "Ground floor" floor_type (not the
+        # API floor_heat_loss=1 exposed code), so without this signal the
+        # cascade dropped its ground floor entirely — simulated case 45 (a
+        # ground-floor flat the mapper labelled "Top-floor flat"): worksheet
+        # (28a) = 47.0 × 0.54 = 25.38 W/K billed as 0, over-rating by +7 SAP.
+        part_floor_is_ground = "ground floor" in (part.floor_type or "").lower()
         # A floor lodged as a heat-loss floor — *exposed* (API
         # floor_heat_loss=1 → `is_exposed_floor`, "an exposed floor if there
         # is an open space below") or *above a partially heated space* (API
@@ -1178,6 +1212,7 @@ def heat_transmission_from_cert(
         # the "another dwelling below" party signal overrides it downward.
         part_has_exposed_floor = (
             exposure.has_exposed_floor or is_exposed_floor or is_above_partial
+            or part_floor_is_ground
         ) and not part_floor_is_party
         floor_area_total = _round_half_up(
             geom["ground_floor_area_m2"] if part_has_exposed_floor else 0.0,
diff --git a/domain/sap10_calculator/worksheet/water_heating.py b/domain/sap10_calculator/worksheet/water_heating.py
index bf0dd475f..dad601e22 100644
--- a/domain/sap10_calculator/worksheet/water_heating.py
+++ b/domain/sap10_calculator/worksheet/water_heating.py
@@ -960,7 +960,9 @@ def water_heating_from_cert(
     combi = (
         combi_loss_monthly_kwh_override
         if combi_loss_monthly_kwh_override is not None
-        else combi_loss_monthly_kwh_table_3a_keep_hot_time_clock()
+        else combi_loss_monthly_kwh_table_3a_row_1_no_keep_hot(
+            daily_hot_water_monthly_l_per_day=daily_total,
+        )
     )
     zero12 = (0.0,) * 12
     solar_storage = (
diff --git a/domain/sap10_ml/rdsap_uvalues.py b/domain/sap10_ml/rdsap_uvalues.py
index 33b9741c9..6687491f0 100644
--- a/domain/sap10_ml/rdsap_uvalues.py
+++ b/domain/sap10_ml/rdsap_uvalues.py
@@ -226,6 +226,26 @@ def _u_stone_thin_wall_age_a_to_e(
     return None
 
 
+def _table_3_stone_thickness(band: str, country: Country) -> int:
+    """RdSAP 10 §3.5 Table 3 (PDF p.20) — default stone wall thickness (mm)
+    used "only when the wall thickness could not be measured".
+
+    Stone row:  A-D = 500, E = 450, F-H = 420, I+ = 450.
+    Scotland footnote (*): add 200 mm for bands A and B, 100 mm for other
+    bands. Only A-E reach this helper (the §5.6 formula gate), so the F+
+    branches are defensive.
+    """
+    if band in ("A", "B", "C", "D"):
+        base = 500
+    elif band == "E":
+        base = 450
+    else:
+        base = 420
+    if country == Country.SCT:
+        base += 200 if band in ("A", "B") else 100
+    return base
+
+
 def _u_brick_thin_wall_age_a_to_e(wall_thickness_mm: int) -> float:
     """RdSAP 10 §5.7 Table 13 (PDF p.41) — default U-value for an
     uninsulated solid brick wall by lodged thickness, age bands A-E.
@@ -419,14 +439,16 @@ _CAVITY_FILLED_ENG: Final[list[float]] = [
 # entries that differ from the England base.
 _COUNTRY_KLM_OVERRIDES: Final[dict[Country, dict[tuple[int, int], dict[str, float]]]] = {
     Country.SCT: {
-        # Scotland Cavity-as-built K-M: 0.25, 0.22, 0.17 (vs ENG 0.30, 0.28, 0.26).
-        (WALL_CAVITY, 0): {"H": 0.45, "K": 0.25, "L": 0.22, "M": 0.17},
-        (WALL_STONE_GRANITE, 0): {"H": 0.45, "K": 0.25, "L": 0.22, "M": 0.17},
-        (WALL_STONE_SANDSTONE, 0): {"H": 0.45, "K": 0.25, "L": 0.22, "M": 0.17},
-        (WALL_SOLID_BRICK, 0): {"H": 0.45, "K": 0.25, "L": 0.22, "M": 0.17},
-        (WALL_TIMBER_FRAME, 0): {"K": 0.25, "L": 0.22, "M": 0.17},
-        (WALL_SYSTEM_BUILT, 0): {"H": 0.45, "K": 0.25, "L": 0.22, "M": 0.17},
-        (WALL_COB, 0): {"K": 0.25, "L": 0.22, "M": 0.17},
+        # Scotland (Table 7, PDF p.35) as-built bands that diverge from the
+        # England base: H 0.60→0.45 (not timber/cob, which are already 0.40/
+        # 0.60), J 0.35→0.30 (ALL types), K 0.30→0.25, L 0.28→0.22, M 0.26→0.17.
+        (WALL_CAVITY, 0): {"H": 0.45, "J": 0.30, "K": 0.25, "L": 0.22, "M": 0.17},
+        (WALL_STONE_GRANITE, 0): {"H": 0.45, "J": 0.30, "K": 0.25, "L": 0.22, "M": 0.17},
+        (WALL_STONE_SANDSTONE, 0): {"H": 0.45, "J": 0.30, "K": 0.25, "L": 0.22, "M": 0.17},
+        (WALL_SOLID_BRICK, 0): {"H": 0.45, "J": 0.30, "K": 0.25, "L": 0.22, "M": 0.17},
+        (WALL_TIMBER_FRAME, 0): {"J": 0.30, "K": 0.25, "L": 0.22, "M": 0.17},
+        (WALL_SYSTEM_BUILT, 0): {"H": 0.45, "J": 0.30, "K": 0.25, "L": 0.22, "M": 0.17},
+        (WALL_COB, 0): {"J": 0.30, "K": 0.25, "L": 0.22, "M": 0.17},
     },
     Country.NIR: {
         (WALL_CAVITY, 0): {"M": 0.18},
@@ -567,28 +589,53 @@ def u_wall(
     ctry = country if country is not None else Country.ENG
     age_idx = _age_index(age_band)
     band = _AGE_BANDS[age_idx]
-    # RdSAP 10 §5.6 (PDF p.40) — uninsulated stone wall thin-wall
-    # formula, age bands A-E. Fires only when a documentary wall
-    # thickness is lodged (per §5.3 documentary-evidence rule).
-    # §5.8 + Table 14 dry-line adjustment applies on top.
+    # RdSAP 10 Tables 6-10 stone rows + footnote (a) (PDF p.33-39), §5.6
+    # formula (PDF p.40), §5.8 + Table 14 (PDF p.41-42). A documentary wall
+    # thickness (per §5.3) routes stone in age bands A-E off the §5.6 formula,
+    # NOT the flat Table-6 typical-thickness default:
+    #   - Bands A-D: pure §5.6 formula, UNCAPPED. The stone rows read
+    #     "According to 5.6" with NO 1.7 entry, because a thin/standard solid
+    #     stone wall genuinely loses more than the typical default (sandstone
+    #     400 mm → 1.90, granite 120 mm → 3.89).
+    #   - Band E: the stone row reads "1.7 a"; footnote (a) = "Or from
+    #     equations in 5.6 if the calculated U-value is less than 1.7" →
+    #     U_E = min(formula, 1.7). Scotland sandstone/limestone age E defaults
+    #     to 1.5 (Table 7), granite/whinstone stays 1.7. The 1.7 (1.5) cap
+    #     belongs ONLY at age E, never A-D.
+    # The insulation STATE is NOT a gate: an "as built / insulation Unknown"
+    # lodgement (`wall_insulation_type` None or 4) takes the formula too. Cert
+    # 000565 Ext1 (granite 50 mm, age E, insulation Unknown) → min(6.09, 1.7)
+    # = 1.70, matching the U985 worksheet WITHOUT a flat-table detour — the
+    # age-E cap, not an insulation gate, is what produces the 1.70.
     #
-    # Table 6 footnote (a) (PDF p.34): "Or from equations in 5.6 if
-    # the calculated U-value is less than 1.7." The cap applies only
-    # to the AS-BUILT (no insulation, no dry-line) Table 6 row — for
-    # thin walls where §5.6 gives U ≥ 1.7 (e.g. granite at W=50 mm
-    # yields 6.09 → use Table 6 default 1.7 instead). When the wall
-    # is dry-lined or insulated, the raw §5.6 result feeds the §5.8
-    # chain as the input U₀ — the Table 6 footnote doesn't cap that
-    # path (verified empirically against cert 000565 Main alt_wall_1:
-    # granite W=120 mm dry-lined → U₀=3.88 raw + dry-line → 2.34
-    # matches worksheet, NOT 1.7 + dry-line → 1.32).
+    # When no documentary thickness is lodged, §3.5 Table 3 (PDF p.20) gives
+    # the default thickness to feed the formula (stone A-D = 500 mm, E = 450,
+    # Scotland +200/+100) — NOT a flat 1.7. This matches Elmhurst: an age-B
+    # granite as-built wall with unknown thickness defaults to 500 mm →
+    # 45.315 × 500^(-0.513) = 1.87 (sandstone → 1.68).
     if (
-        wall_thickness_mm is not None
-        and band in _STONE_AGE_A_TO_E
+        band in _STONE_AGE_A_TO_E
         and construction in (WALL_STONE_GRANITE, WALL_STONE_SANDSTONE)
     ):
-        u0 = _u_stone_thin_wall_age_a_to_e(construction, wall_thickness_mm)
+        w = (
+            wall_thickness_mm
+            if wall_thickness_mm is not None
+            else _table_3_stone_thickness(band, ctry)
+        )
+        u0 = _u_stone_thin_wall_age_a_to_e(construction, w)
         if u0 is not None:
+            # Footnote (a) cap is age-E only: clamp the as-built U to the
+            # Table-6/7 age-E default (1.7, or 1.5 for Scotland sandstone/
+            # limestone) when the §5.6 formula exceeds it. A-D stay uncapped.
+            if band == "E":
+                e_default = (
+                    1.5
+                    if ctry == Country.SCT
+                    and construction == WALL_STONE_SANDSTONE
+                    else 1.7
+                )
+                if u0 >= e_default:
+                    u0 = e_default
             # RdSAP 10 §5.8 + Table 14 (PDF p.41-42) — added External/Internal
             # insulation on a stone wall: U = 1/(1/U₀ + R_ins), with U₀ the
             # RAW §5.6 stone result (the Table-6 footnote (a) 1.7 cap does NOT
@@ -628,8 +675,12 @@ def u_wall(
                         Decimal("0.01"), rounding=ROUND_HALF_UP
                     )
                 )
-            if u0 >= 1.7:
-                return 1.7  # Table-6 row cap per footnote (a)
+            # As-built (uninsulated, not dry-lined) stone wall, age A-E:
+            # return the §5.6 result — uncapped for A-D, age-E-capped above.
+            # A thin solid stone wall genuinely has U > 1.7 (sandstone 400 mm
+            # = 1.90, granite 120 mm = 3.89); capping A-D to 1.7 under-counts
+            # fabric loss and over-rates. Confirmed against Elmhurst (age-B
+            # sandstone 400 mm → 1.90) and the §5.6 Table-12 formula tests.
             return u0
     known_types = {
         WALL_STONE_GRANITE, WALL_STONE_SANDSTONE, WALL_SOLID_BRICK, WALL_CAVITY,
@@ -788,20 +839,21 @@ _ROOF_RAFTERS_BY_THICKNESS: Final[list[tuple[int, float]]] = [
     (400, 0.14),
 ]
 
-# Table 18 rafters column: pitched-roof "insulation at rafters" default U
-# by age band when the thickness cannot be determined. RdSAP 10 §5.11
-# Table 18 (PDF p.45). Identical to the joist column (1) for bands A-G
+# Table 18 column (2) "Pitched, insulation at rafters": pitched-roof default
+# U by age band when the thickness cannot be determined. RdSAP 10 §5.11
+# Table 18 (PDF p.46). Identical to the joist column (1) for bands A-G
 # (2.30 → 0.40), then diverges higher (H 0.35 vs 0.30, I 0.35 vs 0.26,
-# J/K 0.20 vs 0.16, L 0.18 vs 0.16). Unlike the loft-joist default this
-# does NOT collapse to the optimistic 0.40 "assume modern retrofit" floor
-# at old bands — a rafter cavity cannot be topped up from the loft, so an
-# unknown-thickness rafter roof keeps the as-built age-band U (band F
-# 0.68, band E 1.50, A-D 2.30). Worksheet-validated by simulated case 41
-# Ext3 (band F, R Rafters, As Built → P960 §3 (30) U=0.68).
+# J/K 0.20 vs 0.16, L 0.18 vs 0.16) before converging to 0.15 at band M.
+# Unlike the loft-joist default this does NOT collapse to the optimistic
+# 0.40 "assume modern retrofit" floor at old bands — a rafter cavity cannot
+# be topped up from the loft, so an unknown-thickness rafter roof keeps the
+# as-built age-band U (band F 0.68, band E 1.50, A-D 2.30). Worksheet-
+# validated by simulated case 41 Ext3 (band F, R Rafters, As Built → P960
+# §3 (30) U=0.68).
 _ROOF_RAFTERS_BY_AGE: Final[dict[str, float]] = {
     "A": 2.30, "B": 2.30, "C": 2.30, "D": 2.30, "E": 1.50,
     "F": 0.68, "G": 0.40, "H": 0.35, "I": 0.35, "J": 0.20,
-    "K": 0.20, "L": 0.18, "M": 0.18,
+    "K": 0.20, "L": 0.18, "M": 0.15,
 }
 
 # Table 18 column (3): flat-roof default U by age band when thickness unknown.
@@ -1349,12 +1401,51 @@ def u_exposed_floor(
 # ---------------------------------------------------------------------------
 
 
+# RdSAP 10 Table 24 (PDF p.50-51) — pre-2002 (Scotland pre-2003 / NI pre-2006)
+# double and triple glazing split by glazing gap between panes: 6 mm, 12 mm,
+# and 16 mm or more, each with a PVC/wooden and a metal-frame U-value. The
+# 2002+ and 2022+ rows are gap-independent ("any" gap). (pvc, metal) per gap:
+_PRE_2002_DOUBLE_U_BY_GAP: Final[dict[str, tuple[float, float]]] = {
+    "6": (3.1, 3.7), "12": (2.8, 3.4), "16+": (2.7, 3.3),
+}
+_PRE_2002_TRIPLE_U_BY_GAP: Final[dict[str, tuple[float, float]]] = {
+    "6": (2.4, 2.9), "12": (2.1, 2.6), "16+": (2.0, 2.5),
+}
+
+
+def _glazing_gap_row(glazing_gap: "str | int | None") -> str:
+    """Map a lodged glazing gap to its Table 24 row key ("6" / "12" / "16+").
+
+    The cert lodges discrete gaps as the int 6 or 12 or the string "16+"
+    (RdSAP-Schema `glazing_gap`). Unknown gap (None) defaults to the 12 mm
+    row — the spec's typical pre-2002 sealed unit. Robust to intermediate
+    integers: <=8 → 6 mm, >=15 → 16 mm-or-more, else 12 mm."""
+    if glazing_gap is None:
+        return "12"
+    if isinstance(glazing_gap, str):
+        s = glazing_gap.strip().lower()
+        if "16" in s or "+" in s:
+            return "16+"
+        try:
+            g = int(float(s))
+        except ValueError:
+            return "12"
+    else:
+        g = int(glazing_gap)
+    if g <= 8:
+        return "6"
+    if g >= 15:
+        return "16+"
+    return "12"
+
+
 def u_window(
     installed_year: Optional[int],
     glazing_type: Optional[str],
     frame_type: Optional[str],
+    glazing_gap: "str | int | None" = None,
 ) -> float:
-    """RdSAP10 window U-value in W/m^2K, never null."""
+    """RdSAP10 window U-value in W/m^2K, never null (RdSAP 10 Table 24)."""
     if glazing_type is None and installed_year is None and frame_type is None:
         return 2.5
     glaze = (glazing_type or "double").lower()
@@ -1367,13 +1458,15 @@ def u_window(
 
     # double/triple glazing — period bands.
     if installed_year is not None and installed_year >= 2022:
-        return 1.4
+        # Table 24 "2022 or later" row: PVC/wood 1.4, metal 1.6.
+        return 1.6 if metal else 1.4
     if installed_year is not None and installed_year >= 2002:
         return 2.2 if metal else 2.0
-    # pre-2002 double/triple default to 12mm gap row.
-    if glaze == "triple":
-        return 2.6 if metal else 2.1
-    return 3.4 if metal else 2.8
+    # pre-2002 double/triple — Table 24 splits by glazing gap (6/12/16+ mm).
+    gap_row = _glazing_gap_row(glazing_gap)
+    table = _PRE_2002_TRIPLE_U_BY_GAP if glaze == "triple" else _PRE_2002_DOUBLE_U_BY_GAP
+    pvc_u, metal_u = table[gap_row]
+    return metal_u if metal else pvc_u
 
 
 # ---------------------------------------------------------------------------
diff --git a/domain/sap10_ml/tests/_fixtures.py b/domain/sap10_ml/tests/_fixtures.py
index 2c7c3b684..d3fae7e21 100644
--- a/domain/sap10_ml/tests/_fixtures.py
+++ b/domain/sap10_ml/tests/_fixtures.py
@@ -13,6 +13,7 @@ from typing import Optional, Union
 
 from datatypes.epc.domain.epc_property_data import (
     BuildingPartIdentifier,
+    EnergyElement,
     EpcPropertyData,
     InstantaneousWwhrs,
     MainHeatingDetail,
@@ -157,6 +158,7 @@ def make_building_part(
     wall_thickness_measured: bool = True,
     party_wall_construction: Union[int, str] = 1,
     roof_construction: Optional[int] = 4,
+    roof_insulation_location: Optional[Union[int, str]] = None,
     floor_dimensions: Optional[list[SapFloorDimension]] = None,
     sap_room_in_roof: Optional[SapRoomInRoof] = None,
     floor_type: Optional[str] = None,
@@ -170,6 +172,7 @@ def make_building_part(
         wall_thickness_measured=wall_thickness_measured,
         party_wall_construction=party_wall_construction,
         roof_construction=roof_construction,
+        roof_insulation_location=roof_insulation_location,
         sap_floor_dimensions=floor_dimensions
         if floor_dimensions is not None
         else [make_floor_dimension()],
@@ -264,6 +267,7 @@ def make_minimal_sap10_epc(
     sap_heating: Optional[SapHeating] = None,
     photovoltaic_arrays: Optional[list[PhotovoltaicArray]] = None,
     photovoltaic_supply_percent_roof_area: Optional[int] = None,
+    pv_connection: Optional[int] = None,
     mains_gas: bool = True,
     electricity_smart_meter_present: bool = False,
     gas_smart_meter_present: bool = False,
@@ -277,6 +281,7 @@ def make_minimal_sap10_epc(
     pressure_test: Optional[int] = None,
     sap_ventilation: Optional[SapVentilation] = None,
     postcode: str = "A1 1AA",
+    roofs: Optional[list[EnergyElement]] = None,
 ) -> EpcPropertyData:
     """Construct a minimal valid SAP10 EpcPropertyData with parametrisable targets."""
     return EpcPropertyData(
@@ -287,7 +292,7 @@ def make_minimal_sap10_epc(
         address_line_1="1 Test Street",
         postcode=postcode,
         post_town="Testtown",
-        roofs=[],
+        roofs=list(roofs) if roofs is not None else [],
         walls=[],
         floors=[],
         main_heating=[],
@@ -304,6 +309,7 @@ def make_minimal_sap10_epc(
         sap_energy_source=SapEnergySource(
             mains_gas=mains_gas,
             meter_type="Single",
+            pv_connection=pv_connection,
             pv_battery_count=pv_battery_count,
             wind_turbines_count=wind_turbines_count,
             gas_smart_meter_present=gas_smart_meter_present,
diff --git a/domain/sap10_ml/tests/test_rdsap_uvalues.py b/domain/sap10_ml/tests/test_rdsap_uvalues.py
index 38efc93cc..4fb51f422 100644
--- a/domain/sap10_ml/tests/test_rdsap_uvalues.py
+++ b/domain/sap10_ml/tests/test_rdsap_uvalues.py
@@ -421,6 +421,42 @@ def test_u_wall_scotland_age_band_m_returns_country_specific_table7_value() -> N
     assert result == pytest.approx(0.17, abs=0.001)
 
 
+def test_u_wall_scotland_age_band_j_returns_0_30_not_england_0_35_per_table7() -> None:
+    # Arrange — RdSAP 10 Table 7 (Scotland, PDF p.35) as-built band J is
+    # 0.30 for every uninsulated wall type, vs the England base 0.35
+    # (Table 6). The _COUNTRY_KLM_OVERRIDES[SCT] dicts previously listed
+    # H/K/L/M but omitted J, so a Scotland band-J cavity wrongly fell
+    # through to England's 0.35.
+
+    # Act
+    result = u_wall(
+        country=Country.SCT,
+        age_band="J",
+        construction=WALL_CAVITY,
+        insulation_thickness_mm=0,
+    )
+
+    # Assert
+    assert result == pytest.approx(0.30, abs=0.001)
+
+
+def test_u_wall_scotland_age_band_j_timber_frame_returns_0_30_per_table7() -> None:
+    # Arrange — the J=0.30 override applies to all 7 as-built wall types,
+    # including timber frame (England base J = 0.35). Guards the type whose
+    # Scotland override has no H entry (timber H already 0.40 in England).
+
+    # Act
+    result = u_wall(
+        country=Country.SCT,
+        age_band="J",
+        construction=WALL_TIMBER_FRAME,
+        insulation_thickness_mm=0,
+    )
+
+    # Assert
+    assert result == pytest.approx(0.30, abs=0.001)
+
+
 def test_u_wall_timber_frame_as_built_age_band_a_returns_table6_value() -> None:
     # Arrange — Timber frame as built, age A, England -> 2.5 W/m^2K.
 
@@ -826,13 +862,14 @@ def test_u_wall_stone_granite_age_g_with_wall_thickness_ignores_5_6_formula_per_
     assert abs(result - 0.60) <= 1e-3
 
 
-def test_u_wall_stone_granite_age_a_without_wall_thickness_returns_table_6_age_a_default() -> None:
-    # Arrange — §5.6 formula only fires when a wall thickness is
-    # lodged. Without documentary wall-thickness evidence, fall back
-    # to the Table 6 row (which represents typical thickness). For
-    # age A stone granite without thickness, the cascade preserves
-    # its existing "as-built typical" U value rather than the formula
-    # extrapolation.
+def test_u_wall_stone_granite_age_a_without_wall_thickness_uses_table_3_default_500mm() -> None:
+    # Arrange — when no documentary wall thickness is lodged, RdSAP 10 §3.5
+    # Table 3 (PDF p.20) supplies the default stone thickness (A-D = 500 mm),
+    # which feeds the §5.6 formula — NOT a flat 1.7. This matches Elmhurst:
+    # an as-built granite/whinstone wall with unknown thickness defaults to
+    # 500 mm → U = 45.315 × 500^(-0.513) = 1.8693. (The earlier 1.7
+    # expectation was a setup error: Table 6 reads "According to 5.6" for
+    # bands A-D, with no 1.7 entry.)
 
     # Act
     result = u_wall(
@@ -845,8 +882,138 @@ def test_u_wall_stone_granite_age_a_without_wall_thickness_returns_table_6_age_a
         wall_thickness_mm=None,
     )
 
-    # Assert — _TYPICAL_STONE_UNINSULATED at age A = 1.7 (cohort default).
-    assert abs(result - 1.7) <= 1e-3
+    # Assert — §5.6 formula at the Table-3 default 500 mm.
+    assert abs(result - 1.8693) <= 1e-3
+
+
+def test_u_wall_stone_sandstone_age_b_without_wall_thickness_uses_table_3_default_500mm() -> None:
+    # Arrange — sandstone/limestone variant of the Table-3 default: age B,
+    # unknown thickness → 500 mm → 54.876 × 500^(-0.561) = 1.6798. This is
+    # the "500 mm → sandstone 1.68" Elmhurst default.
+
+    # Act
+    result = u_wall(
+        country=Country.ENG,
+        age_band="B",
+        construction=WALL_STONE_SANDSTONE,
+        insulation_thickness_mm=None,
+        insulation_present=False,
+        wall_insulation_type=4,
+        wall_thickness_mm=None,
+    )
+
+    # Assert
+    assert abs(result - 1.6798) <= 1e-3
+
+
+def test_u_wall_stone_sandstone_scotland_age_a_without_thickness_adds_200mm_per_table_3() -> None:
+    # Arrange — Table 3 Scotland footnote (*): add 200 mm for bands A and B.
+    # Age-A Scotland sandstone unknown thickness → 500 + 200 = 700 mm →
+    # 54.876 × 700^(-0.561) = 1.3909 (< 1.7, no age-E cap at band A).
+
+    # Act
+    result = u_wall(
+        country=Country.SCT,
+        age_band="A",
+        construction=WALL_STONE_SANDSTONE,
+        insulation_thickness_mm=None,
+        insulation_present=False,
+        wall_insulation_type=4,
+        wall_thickness_mm=None,
+    )
+
+    # Assert
+    assert abs(result - 1.3909) <= 1e-3
+
+
+def test_u_wall_stone_granite_age_e_50mm_caps_at_table6_default_1_7() -> None:
+    # Arrange — RdSAP 10 Table 6 (England, PDF p.33-34) stone row reads
+    # "1.7 a" at age E, footnote (a) = "Or from equations in 5.6 if the
+    # calculated U-value is less than 1.7". A 50 mm granite wall's §5.6
+    # formula gives U = 45.315 × 50^(-0.513) = 6.09 (> 1.7), so the age-E
+    # default 1.7 stands → min(6.09, 1.7) = 1.70. The cap is age-E ONLY:
+    # bands A-D are uncapped (120 mm age-A granite = 3.89). Insulation is
+    # Unknown (wall_insulation_type None) — no longer a gate. Cert 000565
+    # BP Ext1 is this fixture (U985 worksheet U = 1.70).
+
+    # Act
+    result = u_wall(
+        country=Country.ENG,
+        age_band="E",
+        construction=WALL_STONE_GRANITE,
+        insulation_thickness_mm=None,
+        insulation_present=False,
+        wall_insulation_type=None,
+        dry_lined=False,
+        wall_thickness_mm=50,
+    )
+
+    # Assert
+    assert abs(result - 1.70) <= 1e-3
+
+
+def test_u_wall_stone_sandstone_age_e_thick_wall_uses_5_6_formula_below_1_7() -> None:
+    # Arrange — footnote (a) at age E: use the §5.6 formula when it gives
+    # < 1.7. A 600 mm sandstone wall → U = 54.876 × 600^(-0.561) = 1.5165
+    # (< 1.7), so the formula value is used, NOT the 1.7 default.
+
+    # Act
+    result = u_wall(
+        country=Country.ENG,
+        age_band="E",
+        construction=WALL_STONE_SANDSTONE,
+        insulation_thickness_mm=None,
+        insulation_present=False,
+        wall_insulation_type=None,
+        dry_lined=False,
+        wall_thickness_mm=600,
+    )
+
+    # Assert
+    assert abs(result - 1.5165) <= 1e-3
+
+
+def test_u_wall_stone_sandstone_scotland_age_e_caps_at_1_5_not_1_7() -> None:
+    # Arrange — RdSAP 10 Table 7 (Scotland, PDF p.35) sandstone/limestone
+    # age E default is "1.5 a" (granite/whinstone stays 1.7). A 500 mm
+    # sandstone wall's §5.6 formula = 54.876 × 500^(-0.561) = 1.68 (> 1.5),
+    # so the Scotland age-E default 1.5 stands → min(1.68, 1.5) = 1.50.
+
+    # Act
+    result = u_wall(
+        country=Country.SCT,
+        age_band="E",
+        construction=WALL_STONE_SANDSTONE,
+        insulation_thickness_mm=None,
+        insulation_present=False,
+        wall_insulation_type=None,
+        dry_lined=False,
+        wall_thickness_mm=500,
+    )
+
+    # Assert
+    assert abs(result - 1.50) <= 1e-3
+
+
+def test_u_wall_stone_granite_scotland_age_e_50mm_stays_capped_at_1_7() -> None:
+    # Arrange — Scotland granite/whinstone age E default is 1.7 (only
+    # sandstone/limestone drops to 1.5, Table 7 PDF p.35). A 50 mm granite
+    # wall's formula 6.09 (> 1.7) → min(6.09, 1.7) = 1.70, NOT 1.5.
+
+    # Act
+    result = u_wall(
+        country=Country.SCT,
+        age_band="E",
+        construction=WALL_STONE_GRANITE,
+        insulation_thickness_mm=None,
+        insulation_present=False,
+        wall_insulation_type=None,
+        dry_lined=False,
+        wall_thickness_mm=50,
+    )
+
+    # Assert
+    assert abs(result - 1.70) <= 1e-3
 
 
 def test_u_wall_curtain_wall_missing_age_lodgement_defaults_to_pre_2023_u_2p0_per_rdsap_5_18() -> None:
@@ -1098,6 +1265,25 @@ def test_u_roof_at_rafters_unknown_thickness_uses_table18_rafters_age_band() ->
     assert abs(band_c - 2.30) <= 0.001
 
 
+def test_u_roof_at_rafters_unknown_thickness_age_m_returns_0_15_per_table18() -> None:
+    # Arrange — RdSAP 10 Table 18 column (2) "Pitched, insulation at
+    # rafters" (PDF p.46): band M = 0.15 (footnote (1) only, no country
+    # variation — the whole M row converges to 0.15). The rafters column
+    # diverges above the joist column at H-L (0.35/0.35/0.20/0.20/0.18)
+    # but rejoins it at M = 0.15; the table previously carried 0.18 here.
+
+    # Act
+    band_m = u_roof(
+        country=Country.ENG,
+        age_band="M",
+        insulation_thickness_mm=None,
+        insulation_at_rafters=True,
+    )
+
+    # Assert
+    assert abs(band_m - 0.15) <= 0.001
+
+
 def test_u_roof_unknown_age_band_falls_back_to_mid_range() -> None:
     # Arrange — nothing known.
 
@@ -1562,6 +1748,42 @@ def test_u_window_post_2022_pvc_returns_low_table24_value() -> None:
     assert result == pytest.approx(1.4, abs=0.001)
 
 
+def test_u_window_post_2022_metal_returns_table24_1_6_not_pvc_1_4() -> None:
+    # Arrange — Table 24 "2022 or later" row (PDF p.51): PVC/wooden frame
+    # 1.4, METAL frame 1.6. The metal frame variant was previously ignored
+    # (1.4 returned for both), under-counting metal-frame heat loss.
+
+    # Act
+    result = u_window(installed_year=2023, glazing_type="double", frame_type="metal")
+
+    # Assert
+    assert result == pytest.approx(1.6, abs=0.001)
+
+
+def test_u_window_pre_2002_double_glazing_gap_selects_table24_row() -> None:
+    # Arrange — RdSAP 10 Table 24 (PDF p.50) pre-2002 double glazing splits
+    # by glazing gap (PVC/wooden frame): 6 mm → 3.1, 12 mm → 2.8, 16 mm or
+    # more → 2.7. The cert lodges the gap as the int 6/12 or the string
+    # "16+"; unknown gap defaults to the 12 mm row.
+
+    # Act / Assert
+    assert u_window(installed_year=None, glazing_type="double", frame_type="pvc", glazing_gap=6) == pytest.approx(3.1, abs=0.001)
+    assert u_window(installed_year=None, glazing_type="double", frame_type="pvc", glazing_gap=12) == pytest.approx(2.8, abs=0.001)
+    assert u_window(installed_year=None, glazing_type="double", frame_type="pvc", glazing_gap="16+") == pytest.approx(2.7, abs=0.001)
+    assert u_window(installed_year=None, glazing_type="double", frame_type="pvc", glazing_gap=None) == pytest.approx(2.8, abs=0.001)
+
+
+def test_u_window_pre_2002_triple_glazing_gap_and_metal_frame_select_table24_row() -> None:
+    # Arrange — Table 24 pre-2002 triple glazing: 6 mm → 2.4, 12 mm → 2.1,
+    # 16 mm+ → 2.0 (PVC); metal frame adds +0.5 per the metal column
+    # (6 → 2.9, 12 → 2.6, 16+ → 2.5).
+
+    # Act / Assert
+    assert u_window(installed_year=None, glazing_type="triple", frame_type="pvc", glazing_gap="16+") == pytest.approx(2.0, abs=0.001)
+    assert u_window(installed_year=None, glazing_type="triple", frame_type="metal", glazing_gap=6) == pytest.approx(2.9, abs=0.001)
+    assert u_window(installed_year=None, glazing_type="triple", frame_type="metal", glazing_gap="16+") == pytest.approx(2.5, abs=0.001)
+
+
 def test_u_window_falls_back_to_mid_range_when_unknown() -> None:
     # Arrange — nothing known.
 
diff --git a/domain/tasks/tasks.py b/domain/tasks/tasks.py
index 177258d6c..ead253ab6 100644
--- a/domain/tasks/tasks.py
+++ b/domain/tasks/tasks.py
@@ -17,6 +17,7 @@ class TaskStatus(str, Enum):
 class Source(str, Enum):
     PORTFOLIO = "portfolio_id"
     HUBSPOT_DEAL = "hubspot_deal_id"
+    PROPERTY = "property_id"
 
 
 @dataclass
diff --git a/infrastructure/epc_client/_retry.py b/infrastructure/epc_client/_retry.py
deleted file mode 100644
index d37f5e9c0..000000000
--- a/infrastructure/epc_client/_retry.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import time
-from typing import Callable, TypeVar
-
-from infrastructure.epc_client.exceptions import EpcRateLimitError
-
-T = TypeVar("T")
-
-
-def call_with_retry(
-    fn: Callable[[], T],
-    max_retries: int = 5,
-    backoff_base: float = 1.0,
-    backoff_multiplier: float = 2.0,
-    max_backoff: float = 60.0,
-) -> T:
-    last_exc: EpcRateLimitError | None = None
-    for attempt in range(max_retries + 1):
-        try:
-            return fn()
-        except EpcRateLimitError as exc:
-            last_exc = exc
-            if attempt < max_retries:
-                if exc.retry_after is not None:
-                    delay = exc.retry_after
-                else:
-                    delay = backoff_base * (backoff_multiplier ** attempt)
-                time.sleep(min(delay, max_backoff))
-    raise last_exc  # type: ignore[misc]
diff --git a/infrastructure/epc_client/epc_client_service.py b/infrastructure/epc_client/epc_client_service.py
index 16cd4d2f6..692b10a2f 100644
--- a/infrastructure/epc_client/epc_client_service.py
+++ b/infrastructure/epc_client/epc_client_service.py
@@ -10,7 +10,7 @@ from infrastructure.epc_client.exceptions import (
     EpcNotFoundError,
     EpcRateLimitError,
 )
-from infrastructure.epc_client._retry import call_with_retry
+from infrastructure.http_retry import call_with_retry
 from datatypes.epc.domain.epc_property_data import EpcPropertyData
 from datatypes.epc.domain.mapper import EpcPropertyDataMapper
 from datatypes.epc.search import EpcSearchResult
@@ -18,6 +18,8 @@ from datatypes.epc.search import EpcSearchResult
 
 class EpcClientService:
     BASE_URL = "https://api.get-energy-performance-data.communities.gov.uk"
+    # The gov API's per-UPRN search latency is variable: usually ~0.2s but with
+    # intermittent slow spells.
     REQUEST_TIMEOUT = 10.0
 
     def __init__(self, auth_token: str) -> None:
diff --git a/infrastructure/epc_client/exceptions.py b/infrastructure/epc_client/exceptions.py
index fb7d96fac..af28fb744 100644
--- a/infrastructure/epc_client/exceptions.py
+++ b/infrastructure/epc_client/exceptions.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from infrastructure.http_retry import TransientHttpError
 
 
 class EpcApiError(Exception):
@@ -9,9 +9,7 @@ class EpcNotFoundError(EpcApiError):
     """Raised when the API returns 404."""
 
 
-class EpcRateLimitError(EpcApiError):
-    """Raised when the API returns 429 and all retries are exhausted."""
-
-    def __init__(self, message: str, retry_after: Optional[float] = None) -> None:
-        super().__init__(message)
-        self.retry_after = retry_after
+class EpcRateLimitError(EpcApiError, TransientHttpError):
+    """Raised when the API returns 429. A ``TransientHttpError`` so the shared
+    ``call_with_retry`` retries it (honouring ``Retry-After``), while remaining an
+    ``EpcApiError`` for callers that catch the EPC hierarchy."""
diff --git a/infrastructure/http_retry.py b/infrastructure/http_retry.py
new file mode 100644
index 000000000..e345129d4
--- /dev/null
+++ b/infrastructure/http_retry.py
@@ -0,0 +1,71 @@
+"""Shared transient-failure retry for the HTTP source clients.
+
+The retry *mechanism* is generic; each client owns the *policy* of what counts as
+transient. A caller signals "retry this" by raising ``TransientHttpError``
+(carrying any server-advised ``retry_after``); transport-level errors (read /
+connect timeouts, connection resets) are always treated as transient.
+``call_with_retry`` backs off exponentially between attempts — honouring
+``retry_after`` when present — and re-raises the last error once attempts are
+exhausted, leaving the caller to decide how to surface it (the EPC client lets it
+propagate; postcodes.io soft-fails to the seed postcode).
+"""
+
+from __future__ import annotations
+
+import random
+import time
+from typing import Callable, Optional, TypeVar
+
+import httpx
+
+T = TypeVar("T")
+
+
+class TransientHttpError(Exception):
+    """A failure worth retrying. ``retry_after`` is the server-advised delay (a
+    429's ``Retry-After``), used in place of the computed backoff when present."""
+
+    def __init__(self, message: str, retry_after: Optional[float] = None) -> None:
+        super().__init__(message)
+        self.retry_after = retry_after
+
+
+def call_with_retry(
+    fn: Callable[[], T],
+    max_retries: int = 5,
+    backoff_base: float = 1.0,
+    backoff_multiplier: float = 2.0,
+    max_backoff: float = 60.0,
+    jitter: bool = False,
+) -> T:
+    """Retry ``fn`` on transient failures — ``TransientHttpError`` (e.g. a 429)
+    and ``httpx.TransportError`` (read/connect timeouts, connection resets) —
+    backing off exponentially, or by the error's ``retry_after`` when it carries
+    one. Non-transient failures propagate immediately; the last transient error
+    is re-raised once ``max_retries`` is exhausted.
+
+    ``jitter`` applies **full jitter** to the *computed* backoff (a server-advised
+    ``retry_after`` is honoured exactly): the delay becomes a uniform random draw
+    in ``[0, computed_backoff]``. This de-synchronises retries across many
+    concurrent callers so they don't re-collide in lockstep — the "synchronised
+    requests look like a DDoS" failure mode Google's Solar API best-practices warn
+    about, and the cause of the 429 storm under 32 concurrent containers."""
+    last_exc: Optional[Exception] = None
+    for attempt in range(max_retries + 1):
+        try:
+            return fn()
+        except (TransientHttpError, httpx.TransportError) as exc:
+            last_exc = exc
+            if attempt < max_retries:
+                retry_after = (
+                    exc.retry_after if isinstance(exc, TransientHttpError) else None
+                )
+                if retry_after is not None:
+                    delay = min(retry_after, max_backoff)
+                else:
+                    delay = min(backoff_base * (backoff_multiplier**attempt), max_backoff)
+                    if jitter:
+                        delay = random.uniform(0.0, delay)
+                time.sleep(delay)
+    assert last_exc is not None
+    raise last_exc
diff --git a/infrastructure/landlord_overrides/landlord_override_reader_postgres_repository.py b/infrastructure/landlord_overrides/landlord_override_reader_postgres_repository.py
index 79b851f33..4d02b0d59 100644
--- a/infrastructure/landlord_overrides/landlord_override_reader_postgres_repository.py
+++ b/infrastructure/landlord_overrides/landlord_override_reader_postgres_repository.py
@@ -25,9 +25,24 @@ from infrastructure.postgres.landlord_property_type_override_table import (
 from infrastructure.postgres.landlord_roof_type_override_table import (
     LandlordRoofTypeOverrideRow,
 )
+from infrastructure.postgres.landlord_construction_age_band_override_table import (
+    LandlordConstructionAgeBandOverrideRow,
+)
+from infrastructure.postgres.landlord_glazing_override_table import (
+    LandlordGlazingOverrideRow,
+)
+from infrastructure.postgres.landlord_main_fuel_override_table import (
+    LandlordMainFuelOverrideRow,
+)
+from infrastructure.postgres.landlord_main_heating_system_override_table import (
+    LandlordMainHeatingSystemOverrideRow,
+)
 from infrastructure.postgres.landlord_wall_type_override_table import (
     LandlordWallTypeOverrideRow,
 )
+from infrastructure.postgres.landlord_water_heating_override_table import (
+    LandlordWaterHeatingOverrideRow,
+)
 from repositories.landlord_overrides.landlord_override_reader import (
     LandlordOverrideReader,
 )
@@ -38,6 +53,11 @@ _ROW_TYPES: dict[str, type] = {
     "built_form_type": LandlordBuiltFormTypeOverrideRow,
     "wall_type": LandlordWallTypeOverrideRow,
     "roof_type": LandlordRoofTypeOverrideRow,
+    "main_fuel": LandlordMainFuelOverrideRow,
+    "glazing": LandlordGlazingOverrideRow,
+    "construction_age_band": LandlordConstructionAgeBandOverrideRow,
+    "water_heating": LandlordWaterHeatingOverrideRow,
+    "main_heating_system": LandlordMainHeatingSystemOverrideRow,
 }
 
 
diff --git a/infrastructure/postcodes_io/__init__.py b/infrastructure/postcodes_io/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/infrastructure/postcodes_io/postcodes_io_client.py b/infrastructure/postcodes_io/postcodes_io_client.py
new file mode 100644
index 000000000..7216d1b14
--- /dev/null
+++ b/infrastructure/postcodes_io/postcodes_io_client.py
@@ -0,0 +1,145 @@
+"""postcodes.io adapter — a coordinate (or seed postcode) → the real unit
+postcodes physically near it.
+
+The gov EPC API only searches a *full* real postcode — no outcode/prefix, no
+radius, no lat/long (confirmed against its OpenAPI spec). So to broaden an
+EPC-Prediction cohort beyond the target's own postcode we must first discover the
+real unit postcodes around it. postcodes.io's free, keyless ``nearest`` endpoint
+does exactly that: given a point it returns the unit postcodes within a radius,
+nearest first.
+
+Failure is deliberately non-fatal: any error (network, unknown seed, missing
+coordinates) returns just the seed postcode, so broadening degrades to "no
+broadening" rather than breaking prediction.
+"""
+
+from __future__ import annotations
+
+from typing import Any, Optional
+
+import httpx
+
+from domain.geospatial.coordinates import Coordinates
+from infrastructure.http_retry import TransientHttpError, call_with_retry
+
+
+class PostcodesIoClient:
+    BASE_URL = "https://api.postcodes.io"
+    REQUEST_TIMEOUT = 10.0
+    # Transient failures (transport errors, 429s, 5xx) are retried with
+    # exponential backoff; everything else (and exhaustion) soft-fails to the
+    # seed, so broadening never breaks prediction.
+    MAX_RETRIES = 3
+    BACKOFF_BASE = 0.5
+    BACKOFF_MULTIPLIER = 2.0
+    MAX_BACKOFF = 8.0
+
+    def __init__(self, *, radius_m: int = 1000, limit: int = 30) -> None:
+        """``radius_m`` bounds how far the broadened cohort reaches; ``limit``
+        caps how many nearby postcodes are returned (and so the per-gate-out
+        fetch cost)."""
+        self._radius_m = radius_m
+        self._limit = limit
+
+    def nearby(
+        self, postcode: str, coordinates: Optional[Coordinates] = None
+    ) -> list[str]:
+        """The real unit postcodes within ``radius_m`` of ``postcode`` — nearest
+        first, the seed always included — or just ``[postcode]`` when the seed's
+        coordinates cannot be resolved or the lookup fails.
+
+        ``coordinates`` (the target's own, resolved from its UPRN) is used when
+        given, sparing a postcode→centroid round-trip; otherwise postcodes.io
+        resolves the seed postcode's centroid itself."""
+        point = coordinates if coordinates is not None else self._centroid_of(postcode)
+        if point is None:
+            return [postcode]
+        found = self._nearest_to(point)
+        ordered = [postcode] + [p for p in found if p != postcode]
+        return ordered[: self._limit]
+
+    def _centroid_of(self, postcode: str) -> Optional[Coordinates]:
+        result = self._get(f"/postcodes/{postcode.replace(' ', '')}")
+        if result is None:
+            return None
+        latitude: Any = result.get("latitude")
+        longitude: Any = result.get("longitude")
+        if latitude is None or longitude is None:
+            return None
+        return Coordinates(longitude=float(longitude), latitude=float(latitude))
+
+    def _nearest_to(self, point: Coordinates) -> list[str]:
+        results = self._get_list(
+            "/postcodes",
+            {
+                "lon": point.longitude,
+                "lat": point.latitude,
+                "radius": self._radius_m,
+                "limit": self._limit,
+            },
+        )
+        return [str(row["postcode"]) for row in results if row.get("postcode")]
+
+    def _get(self, path: str) -> Optional[dict[str, Any]]:
+        payload = self._call(path, None)
+        return payload if isinstance(payload, dict) else None
+
+    def _get_list(self, path: str, params: dict[str, Any]) -> list[dict[str, Any]]:
+        payload = self._call(path, params)
+        if not isinstance(payload, list):
+            return []
+        return [row for row in payload if isinstance(row, dict)]
+
+    def _call(self, path: str, params: Optional[dict[str, Any]]) -> Any:
+        """The parsed ``result`` payload for a postcodes.io GET, retried on
+        transient failures via the shared ``call_with_retry``, or None on a
+        non-transient failure (e.g. an unknown postcode's 404) or once retries are
+        exhausted — broadening then falls back to the seed alone. The soft-fail is
+        the difference from the EPC client, which lets the error propagate."""
+        try:
+            return call_with_retry(
+                lambda: self._fetch(path, params),
+                max_retries=self.MAX_RETRIES,
+                backoff_base=self.BACKOFF_BASE,
+                backoff_multiplier=self.BACKOFF_MULTIPLIER,
+                max_backoff=self.MAX_BACKOFF,
+            )
+        except (TransientHttpError, httpx.HTTPError):
+            return None
+
+    def _fetch(self, path: str, params: Optional[dict[str, Any]]) -> Any:
+        """One GET. Raises ``TransientHttpError`` on a 429/5xx (and lets
+        ``httpx.TransportError`` propagate) so ``call_with_retry`` retries it;
+        returns None for a non-transient non-success (e.g. 404) or unparseable
+        body."""
+        response = httpx.get(
+            f"{self.BASE_URL}{path}",
+            params=params,
+            timeout=self.REQUEST_TIMEOUT,
+        )
+        if self._is_transient(response.status_code):
+            raise TransientHttpError(
+                f"postcodes.io {response.status_code} on {path}",
+                retry_after=self._retry_after(response),
+            )
+        if not response.is_success:
+            return None
+        try:
+            body: Any = response.json()
+        except ValueError:
+            return None
+        return body.get("result") if isinstance(body, dict) else None
+
+    @staticmethod
+    def _is_transient(status_code: int) -> bool:
+        return status_code == 429 or status_code >= 500
+
+    @staticmethod
+    def _retry_after(response: httpx.Response) -> Optional[float]:
+        header = response.headers.get("Retry-After")
+        if header is None:
+            return None
+        try:
+            return float(header)
+        except (TypeError, ValueError):
+            return None
diff --git a/infrastructure/postgres/engine.py b/infrastructure/postgres/engine.py
index 2558532ed..cf455219a 100644
--- a/infrastructure/postgres/engine.py
+++ b/infrastructure/postgres/engine.py
@@ -1,20 +1,25 @@
 from collections.abc import Iterator
 from contextlib import contextmanager
+from typing import Any, Optional, Type
 
 from sqlalchemy.engine import Engine
+from sqlalchemy.pool import Pool
 from sqlmodel import Session, create_engine
 
 from infrastructure.postgres.config import PostgresConfig
 
 
-def make_engine(config: PostgresConfig) -> Engine:
-    return create_engine(
-        config.url(),
-        pool_size=config.pool_size,
-        max_overflow=config.max_overflow,
-        pool_pre_ping=config.pool_pre_ping,
-        pool_recycle=config.pool_recycle,
-    )
+def make_engine(
+    config: PostgresConfig, poolclass: Optional[Type[Pool]] = None
+) -> Engine:
+    kwargs: dict[str, Any] = {"pool_pre_ping": config.pool_pre_ping}
+    if poolclass is None:
+        kwargs["pool_size"] = config.pool_size
+        kwargs["max_overflow"] = config.max_overflow
+        kwargs["pool_recycle"] = config.pool_recycle
+    else:
+        kwargs["poolclass"] = poolclass
+    return create_engine(config.url(), **kwargs)
 
 
 def make_session(engine: Engine) -> Session:
diff --git a/infrastructure/postgres/epc_property_table.py b/infrastructure/postgres/epc_property_table.py
index c41d797de..74443e7aa 100644
--- a/infrastructure/postgres/epc_property_table.py
+++ b/infrastructure/postgres/epc_property_table.py
@@ -10,6 +10,7 @@ from datatypes.epc.domain.epc_property_data import (
     EpcPropertyData,
     EnergyElement,
     MainHeatingDetail,
+    PhotovoltaicArray,
     RenewableHeatIncentive,
     SapBuildingPart,
     SapFloorDimension,
@@ -72,6 +73,16 @@ class EpcPropertyModel(SQLModel, table=True):
     has_conservatory: Optional[bool] = Field(default=None)
     has_heated_separate_conservatory: Optional[bool] = Field(default=None)
     conservatory_type: Optional[int] = Field(default=None)
+    # RdSAP 10 §6.1 — geometry of a NON-SEPARATED conservatory folded into the
+    # dwelling (`EpcPropertyData.sap_conservatory`). 1:1 with the dwelling, so
+    # flat nullable columns rather than a child table; all None when there is no
+    # non-separated conservatory. Must round-trip — scoring reads the reloaded
+    # picture, and a dropped conservatory silently disregards it (ADR-0036).
+    conservatory_floor_area_m2: Optional[float] = Field(default=None)
+    conservatory_glazed_perimeter_m: Optional[float] = Field(default=None)
+    conservatory_double_glazed: Optional[bool] = Field(default=None)
+    conservatory_thermally_separated: Optional[bool] = Field(default=None)
+    conservatory_room_height_storeys: Optional[float] = Field(default=None)
 
     # Counts
     door_count: int
@@ -128,6 +139,9 @@ class EpcPropertyModel(SQLModel, table=True):
     )
     energy_pv_percent_roof_area: Optional[int] = Field(default=None)
     energy_pv_battery_capacity: Optional[float] = Field(default=None)
+    # An EV/PV diverter present on the dwelling (SAP §M; the calculator reads it
+    # via cert_to_inputs). Non-optional bool defaulting False, matching the domain.
+    energy_pv_diverter_present: bool = Field(default=False)
     energy_wind_turbine_hub_height: Optional[float] = Field(default=None)
     energy_wind_turbine_rotor_diameter: Optional[float] = Field(default=None)
 
@@ -151,6 +165,7 @@ class EpcPropertyModel(SQLModel, table=True):
         default=None, sa_column=Column(JSONB, nullable=True)
     )
     heating_cylinder_insulation_thickness_mm: Optional[int] = Field(default=None)
+    heating_cylinder_volume_measured_l: Optional[int] = Field(default=None)
     heating_wwhrs_index_number_1: Optional[int] = Field(default=None)
     heating_wwhrs_index_number_2: Optional[int] = Field(default=None)
     heating_shower_outlet_type: Optional[Union[int, str]] = Field(
@@ -182,6 +197,7 @@ class EpcPropertyModel(SQLModel, table=True):
     ventilation_suspended_timber_floor_sealed: Optional[bool] = Field(default=None)
     ventilation_has_draught_lobby: Optional[bool] = Field(default=None)
     ventilation_air_permeability_ap4_m3_h_m2: Optional[float] = Field(default=None)
+    ventilation_air_permeability_ap50_m3_h_m2: Optional[float] = Field(default=None)
     ventilation_mechanical_ventilation_kind: Optional[str] = Field(default=None)
     mechanical_ventilation: Optional[int] = Field(default=None)
     mechanical_vent_duct_type: Optional[int] = Field(default=None)
@@ -247,6 +263,29 @@ class EpcPropertyModel(SQLModel, table=True):
             has_conservatory=data.has_conservatory,
             has_heated_separate_conservatory=data.has_heated_separate_conservatory,
             conservatory_type=data.conservatory_type,
+            conservatory_floor_area_m2=(
+                data.sap_conservatory.floor_area_m2
+                if data.sap_conservatory
+                else None
+            ),
+            conservatory_glazed_perimeter_m=(
+                data.sap_conservatory.glazed_perimeter_m
+                if data.sap_conservatory
+                else None
+            ),
+            conservatory_double_glazed=(
+                data.sap_conservatory.double_glazed if data.sap_conservatory else None
+            ),
+            conservatory_thermally_separated=(
+                data.sap_conservatory.thermally_separated
+                if data.sap_conservatory
+                else None
+            ),
+            conservatory_room_height_storeys=(
+                data.sap_conservatory.room_height_storeys
+                if data.sap_conservatory
+                else None
+            ),
             door_count=data.door_count,
             wet_rooms_count=data.wet_rooms_count,
             extensions_count=data.extensions_count,
@@ -307,6 +346,7 @@ class EpcPropertyModel(SQLModel, table=True):
                 pv.none_or_no_details.percent_roof_area if pv else None
             ),
             energy_pv_battery_capacity=pvb.pv_battery.battery_capacity if pvb else None,
+            energy_pv_diverter_present=es.pv_diverter_present,
             energy_wind_turbine_hub_height=wt.hub_height if wt else None,
             energy_wind_turbine_rotor_diameter=wt.rotor_diameter if wt else None,
             heating_cylinder_size=h.cylinder_size,
@@ -318,6 +358,7 @@ class EpcPropertyModel(SQLModel, table=True):
             heating_secondary_fuel_type=h.secondary_fuel_type,
             heating_secondary_heating_type=h.secondary_heating_type,
             heating_cylinder_insulation_thickness_mm=h.cylinder_insulation_thickness_mm,
+            heating_cylinder_volume_measured_l=h.cylinder_volume_measured_l,
             heating_wwhrs_index_number_1=h.instantaneous_wwhrs.wwhrs_index_number1,
             heating_wwhrs_index_number_2=h.instantaneous_wwhrs.wwhrs_index_number2,
             heating_shower_outlet_type=shower.shower_outlet_type if shower else None,
@@ -351,6 +392,9 @@ class EpcPropertyModel(SQLModel, table=True):
             ventilation_air_permeability_ap4_m3_h_m2=(
                 v.air_permeability_ap4_m3_h_m2 if v else None
             ),
+            ventilation_air_permeability_ap50_m3_h_m2=(
+                v.air_permeability_ap50_m3_h_m2 if v else None
+            ),
             ventilation_mechanical_ventilation_kind=(
                 v.mechanical_ventilation_kind if v else None
             ),
@@ -510,6 +554,10 @@ class EpcMainHeatingDetailModel(SQLModel, table=True):
     main_heating_data_source: Optional[int] = Field(default=None)
     condensing: Optional[bool] = Field(default=None)
     weather_compensator: Optional[bool] = Field(default=None)
+    # Community-heating fields (SAP Table 4d; the calculator reads them via
+    # cert_to_inputs for a community-heated dwelling).
+    community_heating_boiler_fuel_type: Optional[int] = Field(default=None)
+    community_heating_chp_fraction: Optional[float] = Field(default=None)
 
     @classmethod
     def from_domain(
@@ -535,6 +583,8 @@ class EpcMainHeatingDetailModel(SQLModel, table=True):
             main_heating_data_source=detail.main_heating_data_source,
             condensing=detail.condensing,
             weather_compensator=detail.weather_compensator,
+            community_heating_boiler_fuel_type=detail.community_heating_boiler_fuel_type,
+            community_heating_chp_fraction=detail.community_heating_chp_fraction,
         )
 
 
@@ -567,6 +617,11 @@ class EpcBuildingPartModel(SQLModel, table=True):
     wall_insulation_thickness: Optional[Union[str, int]] = Field(
         default=None, sa_column=Column(JSONB, nullable=True)
     )
+    # Union[int, str] SAP code (int from the API, str from Site Notes) — JSONB to
+    # preserve the type on round-trip, like the insulation-thickness siblings.
+    wall_insulation_thermal_conductivity: Optional[Union[int, str]] = Field(
+        default=None, sa_column=Column(JSONB, nullable=True)
+    )
     floor_heat_loss: Optional[int] = Field(default=None)
     floor_insulation_thickness: Optional[str] = Field(default=None)
     flat_roof_insulation_thickness: Optional[Union[str, int]] = Field(
@@ -593,12 +648,14 @@ class EpcBuildingPartModel(SQLModel, table=True):
     alt_wall_1_insulation_type: Optional[int] = Field(default=None)
     alt_wall_1_thickness_measured: Optional[str] = Field(default=None)
     alt_wall_1_insulation_thickness: Optional[str] = Field(default=None)
+    alt_wall_1_is_sheltered: Optional[bool] = Field(default=None)
     alt_wall_2_area: Optional[float] = Field(default=None)
     alt_wall_2_dry_lined: Optional[str] = Field(default=None)
     alt_wall_2_construction: Optional[int] = Field(default=None)
     alt_wall_2_insulation_type: Optional[int] = Field(default=None)
     alt_wall_2_thickness_measured: Optional[str] = Field(default=None)
     alt_wall_2_insulation_thickness: Optional[str] = Field(default=None)
+    alt_wall_2_is_sheltered: Optional[bool] = Field(default=None)
 
     @classmethod
     def from_domain(
@@ -619,6 +676,7 @@ class EpcBuildingPartModel(SQLModel, table=True):
             wall_dry_lined=part.wall_dry_lined,
             wall_thickness_mm=part.wall_thickness_mm,
             wall_insulation_thickness=part.wall_insulation_thickness,
+            wall_insulation_thermal_conductivity=part.wall_insulation_thermal_conductivity,
             floor_heat_loss=part.floor_heat_loss,
             floor_insulation_thickness=part.floor_insulation_thickness,
             flat_roof_insulation_thickness=part.flat_roof_insulation_thickness,
@@ -643,6 +701,7 @@ class EpcBuildingPartModel(SQLModel, table=True):
             alt_wall_1_insulation_thickness=(
                 aw1.wall_insulation_thickness if aw1 else None
             ),
+            alt_wall_1_is_sheltered=aw1.is_sheltered if aw1 else None,
             alt_wall_2_area=aw2.wall_area if aw2 else None,
             alt_wall_2_dry_lined=aw2.wall_dry_lined if aw2 else None,
             alt_wall_2_construction=aw2.wall_construction if aw2 else None,
@@ -651,6 +710,7 @@ class EpcBuildingPartModel(SQLModel, table=True):
             alt_wall_2_insulation_thickness=(
                 aw2.wall_insulation_thickness if aw2 else None
             ),
+            alt_wall_2_is_sheltered=aw2.is_sheltered if aw2 else None,
         )
 
 
@@ -669,6 +729,11 @@ class EpcFloorDimensionModel(SQLModel, table=True):
     heat_loss_perimeter_m: float
     floor_insulation: Optional[int] = Field(default=None)
     floor_construction: Optional[int] = Field(default=None)
+    # Heat-loss flags (SAP 10.2 §3.3): a floor over outside air / over a
+    # partially-heated space takes a different U-value path. Default False
+    # matches the domain default for an ordinary ground floor.
+    is_exposed_floor: bool = Field(default=False)
+    is_above_partially_heated_space: bool = Field(default=False)
 
     @classmethod
     def from_domain(
@@ -683,6 +748,8 @@ class EpcFloorDimensionModel(SQLModel, table=True):
             heat_loss_perimeter_m=dim.heat_loss_perimeter_m,
             floor_insulation=dim.floor_insulation,
             floor_construction=dim.floor_construction,
+            is_exposed_floor=dim.is_exposed_floor,
+            is_above_partially_heated_space=dim.is_above_partially_heated_space,
         )
 
 
@@ -738,6 +805,37 @@ class EpcWindowModel(SQLModel, table=True):
         )
 
 
+class EpcPhotovoltaicArrayModel(SQLModel, table=True):
+    __tablename__: ClassVar[str] = "epc_photovoltaic_array"  # pyright: ignore[reportIncompatibleVariableOverride]
+
+    id: Optional[int] = Field(default=None, primary_key=True)
+    epc_property_id: int = Field(foreign_key="epc_property.id", nullable=False)
+
+    # List position on `sap_energy_source.photovoltaic_arrays`. Persisted so the
+    # array order is recoverable for round-trip equality (a dwelling can carry
+    # several arrays at different pitch/orientation).
+    array_index: int
+    # kWp as a float (e.g. 3.24). pitch / overshading / orientation are SAP
+    # enumeration CODES (small categorical ints), not physical degrees.
+    peak_power: float
+    pitch: int
+    overshading: int
+    orientation: Optional[int] = Field(default=None)
+
+    @classmethod
+    def from_domain(
+        cls, array: PhotovoltaicArray, array_index: int, epc_property_id: int
+    ) -> EpcPhotovoltaicArrayModel:
+        return cls(
+            epc_property_id=epc_property_id,
+            array_index=array_index,
+            peak_power=array.peak_power,
+            pitch=array.pitch,
+            overshading=array.overshading,
+            orientation=array.orientation,
+        )
+
+
 class EpcEnergyElementModel(SQLModel, table=True):
     __tablename__: ClassVar[str] = "epc_energy_element"  # pyright: ignore[reportIncompatibleVariableOverride]
 
diff --git a/infrastructure/postgres/landlord_built_form_type_override_table.py b/infrastructure/postgres/landlord_built_form_type_override_table.py
index ec93ba274..5f343613e 100644
--- a/infrastructure/postgres/landlord_built_form_type_override_table.py
+++ b/infrastructure/postgres/landlord_built_form_type_override_table.py
@@ -16,7 +16,7 @@ from sqlalchemy import BigInteger, Column, UniqueConstraint
 from sqlalchemy import Enum as SAEnum
 from sqlmodel import Field, SQLModel
 
-from domain.epc.built_form_type import BuiltFormType
+from domain.epc.property_overrides.built_form_type import BuiltFormType
 from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
 
 
diff --git a/infrastructure/postgres/landlord_construction_age_band_override_table.py b/infrastructure/postgres/landlord_construction_age_band_override_table.py
new file mode 100644
index 000000000..0c8f9119a
--- /dev/null
+++ b/infrastructure/postgres/landlord_construction_age_band_override_table.py
@@ -0,0 +1,73 @@
+"""SQLModel mirror of the ``landlord_construction_age_band_overrides`` Drizzle table.
+
+The schema source of truth lives in the ``assessment-model`` TS repo
+(`src/app/db/schema/landlord_overrides.ts`). The migrations are owned there;
+this row class only mirrors the columns so the Python lambda can read/write.
+See ADR-0003. Shape mirrors ``LandlordWallTypeOverrideRow`` -- the only
+differences are the table name, the ``construction_age_band`` pgEnum on
+``value``, and the unique-constraint name.
+"""
+
+from datetime import datetime, timezone
+from typing import ClassVar
+from uuid import UUID, uuid4
+
+from sqlalchemy import BigInteger, Column, UniqueConstraint
+from sqlalchemy import Enum as SAEnum
+from sqlmodel import Field, SQLModel
+
+from domain.epc.property_overrides.construction_age_band import ConstructionAgeBand
+from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
+
+
+class LandlordConstructionAgeBandOverrideRow(SQLModel, table=True):
+    __tablename__: ClassVar[str] = "landlord_construction_age_band_overrides"  # pyright: ignore[reportIncompatibleVariableOverride]
+    __table_args__: ClassVar[tuple[UniqueConstraint, ...]] = (  # pyright: ignore[reportIncompatibleVariableOverride]
+        # NB: shortened (drop the redundant ``_overrides``) to stay within
+        # PostgreSQL's 63-char identifier limit -- the full
+        # ``landlord_construction_age_band_overrides_portfolio_description_unique``
+        # is 68 chars and would be silently truncated, diverging from Drizzle.
+        UniqueConstraint(
+            "portfolio_id",
+            "description",
+            name="landlord_construction_age_band_portfolio_description_unique",
+        ),
+    )
+
+    id: UUID = Field(default_factory=uuid4, primary_key=True)
+
+    # bigint to match the Drizzle ``portfolio_id`` FK; SQLModel's default int
+    # mapping is 32-bit Integer and would overflow once portfolio IDs exceed
+    # 2^31. The FK to ``portfolio.id`` is enforced by the Drizzle migration,
+    # not declared here -- the ``portfolio`` table is not modelled in Python.
+    portfolio_id: int = Field(
+        sa_column=Column(BigInteger, nullable=False, index=True),
+    )
+
+    description: str = Field(nullable=False)
+
+    value: ConstructionAgeBand = Field(
+        sa_column=Column(
+            SAEnum(
+                ConstructionAgeBand,
+                name="construction_age_band",
+                values_callable=lambda cls: [m.value for m in cls],  # pyright: ignore[reportUnknownLambdaType, reportUnknownMemberType, reportUnknownVariableType]
+            ),
+            nullable=False,
+        ),
+    )
+
+    # Shared SAEnum -- see ``landlord_override_enums`` for why this single
+    # instance is reused by every ``landlord_*_overrides`` row class.
+    source: str = Field(
+        sa_column=Column(override_source_sa_enum, nullable=False),
+    )
+
+    created_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
+    updated_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
diff --git a/infrastructure/postgres/landlord_glazing_override_table.py b/infrastructure/postgres/landlord_glazing_override_table.py
new file mode 100644
index 000000000..b25dea54f
--- /dev/null
+++ b/infrastructure/postgres/landlord_glazing_override_table.py
@@ -0,0 +1,69 @@
+"""SQLModel mirror of the ``landlord_glazing_overrides`` Drizzle table.
+
+The schema source of truth lives in the ``assessment-model`` TS repo
+(`src/app/db/schema/landlord_overrides.ts`). The migrations are owned there;
+this row class only mirrors the columns so the Python lambda can read/write.
+See ADR-0003. Shape mirrors ``LandlordWallTypeOverrideRow`` -- the only
+differences are the table name, the ``glazing`` pgEnum on ``value``, and the
+unique-constraint name.
+"""
+
+from datetime import datetime, timezone
+from typing import ClassVar
+from uuid import UUID, uuid4
+
+from sqlalchemy import BigInteger, Column, UniqueConstraint
+from sqlalchemy import Enum as SAEnum
+from sqlmodel import Field, SQLModel
+
+from domain.epc.property_overrides.glazing_type import GlazingType
+from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
+
+
+class LandlordGlazingOverrideRow(SQLModel, table=True):
+    __tablename__: ClassVar[str] = "landlord_glazing_overrides"  # pyright: ignore[reportIncompatibleVariableOverride]
+    __table_args__: ClassVar[tuple[UniqueConstraint, ...]] = (  # pyright: ignore[reportIncompatibleVariableOverride]
+        UniqueConstraint(
+            "portfolio_id",
+            "description",
+            name="landlord_glazing_overrides_portfolio_description_unique",
+        ),
+    )
+
+    id: UUID = Field(default_factory=uuid4, primary_key=True)
+
+    # bigint to match the Drizzle ``portfolio_id`` FK; SQLModel's default int
+    # mapping is 32-bit Integer and would overflow once portfolio IDs exceed
+    # 2^31. The FK to ``portfolio.id`` is enforced by the Drizzle migration,
+    # not declared here -- the ``portfolio`` table is not modelled in Python.
+    portfolio_id: int = Field(
+        sa_column=Column(BigInteger, nullable=False, index=True),
+    )
+
+    description: str = Field(nullable=False)
+
+    value: GlazingType = Field(
+        sa_column=Column(
+            SAEnum(
+                GlazingType,
+                name="glazing",
+                values_callable=lambda cls: [m.value for m in cls],  # pyright: ignore[reportUnknownLambdaType, reportUnknownMemberType, reportUnknownVariableType]
+            ),
+            nullable=False,
+        ),
+    )
+
+    # Shared SAEnum -- see ``landlord_override_enums`` for why this single
+    # instance is reused by every ``landlord_*_overrides`` row class.
+    source: str = Field(
+        sa_column=Column(override_source_sa_enum, nullable=False),
+    )
+
+    created_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
+    updated_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
diff --git a/infrastructure/postgres/landlord_main_fuel_override_table.py b/infrastructure/postgres/landlord_main_fuel_override_table.py
new file mode 100644
index 000000000..3012a2e9a
--- /dev/null
+++ b/infrastructure/postgres/landlord_main_fuel_override_table.py
@@ -0,0 +1,69 @@
+"""SQLModel mirror of the ``landlord_main_fuel_overrides`` Drizzle table.
+
+The schema source of truth lives in the ``assessment-model`` TS repo
+(`src/app/db/schema/landlord_overrides.ts`). The migrations are owned there;
+this row class only mirrors the columns so the Python lambda can read/write.
+See ADR-0003. Shape mirrors ``LandlordWallTypeOverrideRow`` -- the only
+differences are the table name, the ``main_fuel`` pgEnum on ``value``, and
+the unique-constraint name.
+"""
+
+from datetime import datetime, timezone
+from typing import ClassVar
+from uuid import UUID, uuid4
+
+from sqlalchemy import BigInteger, Column, UniqueConstraint
+from sqlalchemy import Enum as SAEnum
+from sqlmodel import Field, SQLModel
+
+from domain.epc.property_overrides.main_fuel_type import MainFuelType
+from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
+
+
+class LandlordMainFuelOverrideRow(SQLModel, table=True):
+    __tablename__: ClassVar[str] = "landlord_main_fuel_overrides"  # pyright: ignore[reportIncompatibleVariableOverride]
+    __table_args__: ClassVar[tuple[UniqueConstraint, ...]] = (  # pyright: ignore[reportIncompatibleVariableOverride]
+        UniqueConstraint(
+            "portfolio_id",
+            "description",
+            name="landlord_main_fuel_overrides_portfolio_description_unique",
+        ),
+    )
+
+    id: UUID = Field(default_factory=uuid4, primary_key=True)
+
+    # bigint to match the Drizzle ``portfolio_id`` FK; SQLModel's default int
+    # mapping is 32-bit Integer and would overflow once portfolio IDs exceed
+    # 2^31. The FK to ``portfolio.id`` is enforced by the Drizzle migration,
+    # not declared here -- the ``portfolio`` table is not modelled in Python.
+    portfolio_id: int = Field(
+        sa_column=Column(BigInteger, nullable=False, index=True),
+    )
+
+    description: str = Field(nullable=False)
+
+    value: MainFuelType = Field(
+        sa_column=Column(
+            SAEnum(
+                MainFuelType,
+                name="main_fuel",
+                values_callable=lambda cls: [m.value for m in cls],  # pyright: ignore[reportUnknownLambdaType, reportUnknownMemberType, reportUnknownVariableType]
+            ),
+            nullable=False,
+        ),
+    )
+
+    # Shared SAEnum -- see ``landlord_override_enums`` for why this single
+    # instance is reused by every ``landlord_*_overrides`` row class.
+    source: str = Field(
+        sa_column=Column(override_source_sa_enum, nullable=False),
+    )
+
+    created_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
+    updated_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
diff --git a/infrastructure/postgres/landlord_main_heating_system_override_table.py b/infrastructure/postgres/landlord_main_heating_system_override_table.py
new file mode 100644
index 000000000..d9862089a
--- /dev/null
+++ b/infrastructure/postgres/landlord_main_heating_system_override_table.py
@@ -0,0 +1,71 @@
+"""SQLModel mirror of the ``landlord_main_heating_system_overrides`` Drizzle table.
+
+The schema source of truth lives in the ``assessment-model`` TS repo
+(`src/app/db/schema/landlord_overrides.ts`). The migrations are owned there;
+this row class only mirrors the columns so the Python lambda can read/write.
+See ADR-0003. Shape mirrors ``LandlordWallTypeOverrideRow`` -- the only
+differences are the table name, the ``main_heating_system`` pgEnum on ``value``,
+and the unique-constraint name.
+"""
+
+from datetime import datetime, timezone
+from typing import ClassVar
+from uuid import UUID, uuid4
+
+from sqlalchemy import BigInteger, Column, UniqueConstraint
+from sqlalchemy import Enum as SAEnum
+from sqlmodel import Field, SQLModel
+
+from domain.epc.property_overrides.main_heating_system_type import MainHeatingSystemType
+from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
+
+
+class LandlordMainHeatingSystemOverrideRow(SQLModel, table=True):
+    __tablename__: ClassVar[str] = "landlord_main_heating_system_overrides"  # pyright: ignore[reportIncompatibleVariableOverride]
+    __table_args__: ClassVar[tuple[UniqueConstraint, ...]] = (  # pyright: ignore[reportIncompatibleVariableOverride]
+        # Shortened (drop the redundant ``_overrides``) to stay within
+        # PostgreSQL's 63-char identifier limit; mirrors the Drizzle name.
+        UniqueConstraint(
+            "portfolio_id",
+            "description",
+            name="landlord_main_heating_system_portfolio_description_unique",
+        ),
+    )
+
+    id: UUID = Field(default_factory=uuid4, primary_key=True)
+
+    # bigint to match the Drizzle ``portfolio_id`` FK; SQLModel's default int
+    # mapping is 32-bit Integer and would overflow once portfolio IDs exceed
+    # 2^31. The FK to ``portfolio.id`` is enforced by the Drizzle migration,
+    # not declared here -- the ``portfolio`` table is not modelled in Python.
+    portfolio_id: int = Field(
+        sa_column=Column(BigInteger, nullable=False, index=True),
+    )
+
+    description: str = Field(nullable=False)
+
+    value: MainHeatingSystemType = Field(
+        sa_column=Column(
+            SAEnum(
+                MainHeatingSystemType,
+                name="main_heating_system",
+                values_callable=lambda cls: [m.value for m in cls],  # pyright: ignore[reportUnknownLambdaType, reportUnknownMemberType, reportUnknownVariableType]
+            ),
+            nullable=False,
+        ),
+    )
+
+    # Shared SAEnum -- see ``landlord_override_enums`` for why this single
+    # instance is reused by every ``landlord_*_overrides`` row class.
+    source: str = Field(
+        sa_column=Column(override_source_sa_enum, nullable=False),
+    )
+
+    created_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
+    updated_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
diff --git a/infrastructure/postgres/landlord_property_type_override_table.py b/infrastructure/postgres/landlord_property_type_override_table.py
index ae9377cd2..2718fb344 100644
--- a/infrastructure/postgres/landlord_property_type_override_table.py
+++ b/infrastructure/postgres/landlord_property_type_override_table.py
@@ -14,7 +14,7 @@ from sqlalchemy import BigInteger, Column, UniqueConstraint
 from sqlalchemy import Enum as SAEnum
 from sqlmodel import Field, SQLModel
 
-from domain.epc.property_type import PropertyType
+from domain.epc.property_overrides.property_type import PropertyType
 from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
 
 
diff --git a/infrastructure/postgres/landlord_roof_type_override_table.py b/infrastructure/postgres/landlord_roof_type_override_table.py
index 58bd61fff..659c5c64e 100644
--- a/infrastructure/postgres/landlord_roof_type_override_table.py
+++ b/infrastructure/postgres/landlord_roof_type_override_table.py
@@ -16,7 +16,7 @@ from sqlalchemy import BigInteger, Column, UniqueConstraint
 from sqlalchemy import Enum as SAEnum
 from sqlmodel import Field, SQLModel
 
-from domain.epc.roof_type import RoofType
+from domain.epc.property_overrides.roof_type import RoofType
 from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
 
 
diff --git a/infrastructure/postgres/landlord_wall_type_override_table.py b/infrastructure/postgres/landlord_wall_type_override_table.py
index b5097164a..7a3c70ae2 100644
--- a/infrastructure/postgres/landlord_wall_type_override_table.py
+++ b/infrastructure/postgres/landlord_wall_type_override_table.py
@@ -16,7 +16,7 @@ from sqlalchemy import BigInteger, Column, UniqueConstraint
 from sqlalchemy import Enum as SAEnum
 from sqlmodel import Field, SQLModel
 
-from domain.epc.wall_type import WallType
+from domain.epc.property_overrides.wall_type import WallType
 from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
 
 
diff --git a/infrastructure/postgres/landlord_water_heating_override_table.py b/infrastructure/postgres/landlord_water_heating_override_table.py
new file mode 100644
index 000000000..039b5a62a
--- /dev/null
+++ b/infrastructure/postgres/landlord_water_heating_override_table.py
@@ -0,0 +1,69 @@
+"""SQLModel mirror of the ``landlord_water_heating_overrides`` Drizzle table.
+
+The schema source of truth lives in the ``assessment-model`` TS repo
+(`src/app/db/schema/landlord_overrides.ts`). The migrations are owned there;
+this row class only mirrors the columns so the Python lambda can read/write.
+See ADR-0003. Shape mirrors ``LandlordWallTypeOverrideRow`` -- the only
+differences are the table name, the ``water_heating`` pgEnum on ``value``, and
+the unique-constraint name.
+"""
+
+from datetime import datetime, timezone
+from typing import ClassVar
+from uuid import UUID, uuid4
+
+from sqlalchemy import BigInteger, Column, UniqueConstraint
+from sqlalchemy import Enum as SAEnum
+from sqlmodel import Field, SQLModel
+
+from domain.epc.property_overrides.water_heating_type import WaterHeatingType
+from infrastructure.postgres.landlord_override_enums import override_source_sa_enum
+
+
+class LandlordWaterHeatingOverrideRow(SQLModel, table=True):
+    __tablename__: ClassVar[str] = "landlord_water_heating_overrides"  # pyright: ignore[reportIncompatibleVariableOverride]
+    __table_args__: ClassVar[tuple[UniqueConstraint, ...]] = (  # pyright: ignore[reportIncompatibleVariableOverride]
+        UniqueConstraint(
+            "portfolio_id",
+            "description",
+            name="landlord_water_heating_overrides_portfolio_description_unique",
+        ),
+    )
+
+    id: UUID = Field(default_factory=uuid4, primary_key=True)
+
+    # bigint to match the Drizzle ``portfolio_id`` FK; SQLModel's default int
+    # mapping is 32-bit Integer and would overflow once portfolio IDs exceed
+    # 2^31. The FK to ``portfolio.id`` is enforced by the Drizzle migration,
+    # not declared here -- the ``portfolio`` table is not modelled in Python.
+    portfolio_id: int = Field(
+        sa_column=Column(BigInteger, nullable=False, index=True),
+    )
+
+    description: str = Field(nullable=False)
+
+    value: WaterHeatingType = Field(
+        sa_column=Column(
+            SAEnum(
+                WaterHeatingType,
+                name="water_heating",
+                values_callable=lambda cls: [m.value for m in cls],  # pyright: ignore[reportUnknownLambdaType, reportUnknownMemberType, reportUnknownVariableType]
+            ),
+            nullable=False,
+        ),
+    )
+
+    # Shared SAEnum -- see ``landlord_override_enums`` for why this single
+    # instance is reused by every ``landlord_*_overrides`` row class.
+    source: str = Field(
+        sa_column=Column(override_source_sa_enum, nullable=False),
+    )
+
+    created_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
+    updated_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        nullable=False,
+    )
diff --git a/infrastructure/postgres/property_override_table.py b/infrastructure/postgres/property_override_table.py
index 3132ddf58..404901443 100644
--- a/infrastructure/postgres/property_override_table.py
+++ b/infrastructure/postgres/property_override_table.py
@@ -27,6 +27,11 @@ override_component_sa_enum = SAEnum(
     "roof_type",
     "property_type",
     "built_form_type",
+    "main_fuel",
+    "glazing",
+    "construction_age_band",
+    "water_heating",
+    "main_heating_system",
     name="override_component",
 )
 
diff --git a/infrastructure/solar/google_solar_api_client.py b/infrastructure/solar/google_solar_api_client.py
index 28e918661..fd3c39cfb 100644
--- a/infrastructure/solar/google_solar_api_client.py
+++ b/infrastructure/solar/google_solar_api_client.py
@@ -3,6 +3,8 @@ from typing import Any, Literal, Optional
 
 import requests
 
+from infrastructure.http_retry import TransientHttpError, call_with_retry
+
 
 class BuildingInsightsNotFoundError(Exception):
     pass
@@ -10,11 +12,60 @@ class BuildingInsightsNotFoundError(Exception):
 
 class GoogleSolarApiClient:
     base_url: str = "https://solar.googleapis.com/v1"
-    MAX_RETRIES: int = 5
+    # Bounded retries (NOT Google's infinite-loop example). With the 60s max
+    # backoff below, 6 retries span ~2 of the Solar API's per-minute (600 QPM)
+    # windows — enough to ride out a transient 429 burst, then give up so a
+    # stuck request can't blow the container timeout; the subtask fails and is
+    # re-triggered.
+    MAX_RETRIES: int = 6
+    MAX_BACKOFF_SECONDS: float = 60.0
     ENTITY_NOT_FOUND_ERROR: str = "Requested entity was not found."
 
-    def __init__(self, api_key: str) -> None:
+    def __init__(
+        self, api_key: str, min_request_interval_seconds: float = 0.0
+    ) -> None:
+        # Per-instance min-interval throttle. The Solar API caps the whole GCP
+        # project at a hard 600 QPM shared across Building Insights + Data Layers
+        # (https://developers.google.com/maps/documentation/solar/usage-and-billing).
+        # The modelling_e2e fleet runs up to `maximum_concurrency` (32) containers,
+        # each looping its ~50-property batch sequentially — so without pacing the
+        # fleet offers multiples of the quota and a steady fraction of calls 429
+        # for a sustained window that #1327's jittered backoff can't ride out.
+        # Each container holding >= quota/N seconds between its OWN consecutive
+        # calls keeps the fleet sum under the ceiling. Default 0.0 = no throttle,
+        # so the interactive backend path and tests are unchanged; the scaled
+        # caller (the Lambda) opts in via env.
         self._api_key = api_key
+        self._min_request_interval_seconds = min_request_interval_seconds
+        self._last_request_monotonic: Optional[float] = None
+
+    def _await_rate_limit(self) -> None:
+        """Block until at least ``min_request_interval_seconds`` has elapsed since
+        this instance's previous call, so the container never exceeds its share of
+        the fleet's 600 QPM Solar budget. A no-op when the interval is 0 (the
+        default / interactive path). The call's own latency counts toward the gap
+        (we sleep only the *remainder*), so we don't double-pay the request time."""
+        if self._min_request_interval_seconds <= 0:
+            return
+        now = time.monotonic()
+        if self._last_request_monotonic is not None:
+            wait = self._min_request_interval_seconds - (
+                now - self._last_request_monotonic
+            )
+            if wait > 0:
+                time.sleep(wait)
+                now = time.monotonic()
+        self._last_request_monotonic = now
+
+    @staticmethod
+    def _parse_retry_after(response: requests.Response) -> Optional[float]:
+        header = response.headers.get("Retry-After")
+        if header is None:
+            return None
+        try:
+            return float(header)
+        except (TypeError, ValueError):
+            return None
 
     def get_building_insights(
         self,
@@ -22,6 +73,7 @@ class GoogleSolarApiClient:
         latitude: float,
         required_quality: Literal["HIGH", "MEDIUM", "LOW"] = "MEDIUM",
     ) -> dict[str, Any]:
+        self._await_rate_limit()
         insights_url = f"{self.base_url}/buildingInsights:findClosest"
         params: dict[str, str] = {
             "location.latitude": f"{latitude:.5f}",
@@ -29,22 +81,40 @@ class GoogleSolarApiClient:
             "requiredQuality": required_quality,
             "key": self._api_key,
         }
-        last_exc: Optional[Exception] = None
-        for attempt in range(self.MAX_RETRIES):
+
+        def _fetch() -> dict[str, Any]:
             try:
                 response = requests.get(insights_url, params=params)
                 response.raise_for_status()
                 result: dict[str, Any] = response.json()
                 return result
             except requests.exceptions.RequestException as e:
+                response = e.response
+                if response is None:
+                    # No response = a transport-level failure (connection reset /
+                    # read or connect timeout) — transient, retry.
+                    raise TransientHttpError(f"Solar API transport error: {e}") from e
+                status = response.status_code
                 if (
-                    e.response is not None
-                    and e.response.status_code == 404
-                    and e.response.json()["error"]["message"] == self.ENTITY_NOT_FOUND_ERROR
+                    status == 404
+                    and response.json().get("error", {}).get("message")
+                    == self.ENTITY_NOT_FOUND_ERROR
                 ):
                     raise BuildingInsightsNotFoundError() from e
-                last_exc = e
-                time.sleep(2 ** attempt)
+                if status == 429 or status >= 500:
+                    # Rate-limit (429) and server errors (5xx) are transient.
+                    # Honour the server's Retry-After when present (jittered
+                    # exponential backoff otherwise — see `call_with_retry`).
+                    raise TransientHttpError(
+                        f"Solar API {status}",
+                        retry_after=self._parse_retry_after(response),
+                    ) from e
+                # Other 4xx are the caller's fault — non-transient, propagate.
+                raise
 
-        assert last_exc is not None
-        raise last_exc
+        return call_with_retry(
+            _fetch,
+            max_retries=self.MAX_RETRIES,
+            max_backoff=self.MAX_BACKOFF_SECONDS,
+            jitter=True,
+        )
diff --git a/modelling_audit.md b/modelling_audit.md
new file mode 100644
index 000000000..c537bd981
--- /dev/null
+++ b/modelling_audit.md
@@ -0,0 +1,463 @@
+# Modelling anomaly audit
+
+Scanned **31919** properties · flagged **10563** anomalies across **10** checks.
+
+## impossible-sap-over-100 (HIGH) — 1
+
+- property **726993** (uprn 100061757571): SAP > 100: effective 102.0
+
+## plan-below-baseline-band (HIGH) — 363
+
+- property **709810** (uprn 10096028301): post C (78.02813) worse than effective baseline B (85)
+- property **709846** (uprn 10096399556): post C (79.7374) worse than effective baseline A (93)
+- property **709847** (uprn 10096028354): post C (78.695816) worse than effective baseline B (91)
+- property **709850** (uprn 10096028348): post C (78.750984) worse than effective baseline B (89)
+- property **709959** (uprn 10096028306): post C (78.14567) worse than effective baseline B (84)
+- property **710011** (uprn 10096028349): post C (78.750984) worse than effective baseline B (89)
+- property **710071** (uprn 10002918889): post C (76.07915) worse than effective baseline B (82)
+- property **710075** (uprn 10002918890): post C (79.84036) worse than effective baseline B (82)
+- property **710117** (uprn 10096399566): post C (79.86282) worse than effective baseline A (93)
+- property **710121** (uprn 10096028307): post C (78.790596) worse than effective baseline B (90)
+- property **710131** (uprn 10096028350): post C (80.142784) worse than effective baseline A (94)
+- property **710201** (uprn 10090944222): post C (74.58814) worse than effective baseline B (82)
+- property **710222** (uprn 10096399567): post C (79.84616) worse than effective baseline A (93)
+- property **710225** (uprn 10096028308): post C (78.78894) worse than effective baseline B (90)
+- property **710241** (uprn 10096028351): post C (80.142784) worse than effective baseline A (94)
+- property **710326** (uprn 10096028309): post C (78.610855) worse than effective baseline B (89)
+- property **710335** (uprn 10096028352): post C (79.9757) worse than effective baseline A (94)
+- property **710395** (uprn 10096028310): post C (79.46583) worse than effective baseline B (91)
+- property **710474** (uprn 10096028355): post C (78.47655) worse than effective baseline B (91)
+- property **710479** (uprn 10096028353): post C (80.291725) worse than effective baseline A (95)
+- property **710537** (uprn 10096028311): post C (79.46583) worse than effective baseline B (91)
+- property **710540** (uprn 100060714157): post D (68.24699) worse than effective baseline C (71)
+- property **710760** (uprn 10096028302): post C (78.28315) worse than effective baseline B (85)
+- property **710800** (uprn 10096399558): post C (79.7374) worse than effective baseline A (93)
+- property **710802** (uprn 10096028356): post C (78.47655) worse than effective baseline B (91)
+- property **710946** (uprn 44012846): post C (79.819626) worse than effective baseline B (81)
+- property **711027** (uprn 10096028357): post C (77.96618) worse than effective baseline B (90)
+- property **711178** (uprn 10091636026): post C (76.05113) worse than effective baseline B (81)
+- property **711195** (uprn 10096028303): post C (80.00826) worse than effective baseline B (86)
+- property **711236** (uprn 10096399560): post C (79.7374) worse than effective baseline A (93)
+- property **711238** (uprn 10096028358): post C (78.695816) worse than effective baseline B (91)
+- property **711312** (uprn 10096028346): post C (80.1876) worse than effective baseline A (93)
+- property **711376** (uprn 10096028359): post C (78.47655) worse than effective baseline B (91)
+- property **711489** (uprn 10096028304): post C (80.3187) worse than effective baseline B (86)
+- property **711523** (uprn 10096399562): post C (79.7374) worse than effective baseline A (93)
+- property **711524** (uprn 10096028360): post C (78.47655) worse than effective baseline B (91)
+- property **711539** (uprn 68159801): post D (66.09142) worse than effective baseline C (71)
+- property **711575** (uprn 10096028347): post C (80.1876) worse than effective baseline A (94)
+- property **711639** (uprn 10096028361): post C (78.88584) worse than effective baseline B (91)
+- property **711706** (uprn 10096028305): post C (78.71836) worse than effective baseline B (85)
+- property **711715** (uprn 10013924857): post C (79.91303) worse than effective baseline B (81)
+- property **711732** (uprn 100062190435): post C (77.935425) worse than effective baseline B (82)
+- property **711795** (uprn 10090343115): post E (52.785263) worse than effective baseline C (73)
+- property **711821** (uprn 10096399575): post C (80.209465) worse than effective baseline A (93)
+- property **711824** (uprn 10094615095): post C (78.01443) worse than effective baseline A (92)
+- property **711858** (uprn 22245014): post C (79.352325) worse than effective baseline B (81)
+- property **711881** (uprn 10023444014): post C (79.504456) worse than effective baseline B (81)
+- property **711897** (uprn 10012025246): post C (76.70494) worse than effective baseline B (81)
+- property **711898** (uprn 10094615103): post C (79.97074) worse than effective baseline A (92)
+- property **711917** (uprn 10012027840): post C (72.92677) worse than effective baseline B (81)
+- … and 313 more (see CSV)
+
+## plan-score-below-baseline (HIGH) — 1631
+
+- property **709790** (uprn 10023443426): post SAP 74.2 below effective baseline 76.0 (Δ-1.8)
+- property **709810** (uprn 10096028301): post SAP 78.0 below effective baseline 85.0 (Δ-7.0)
+- property **709846** (uprn 10096399556): post SAP 79.7 below effective baseline 93.0 (Δ-13.3)
+- property **709847** (uprn 10096028354): post SAP 78.7 below effective baseline 91.0 (Δ-12.3)
+- property **709850** (uprn 10096028348): post SAP 78.8 below effective baseline 89.0 (Δ-10.2)
+- property **709959** (uprn 10096028306): post SAP 78.1 below effective baseline 84.0 (Δ-5.9)
+- property **709970** (uprn 10013924859): post SAP 79.2 below effective baseline 80.0 (Δ-0.8)
+- property **709975** (uprn 200001466609): post SAP 72.3 below effective baseline 79.0 (Δ-6.7)
+- property **710011** (uprn 10096028349): post SAP 78.8 below effective baseline 89.0 (Δ-10.2)
+- property **710071** (uprn 10002918889): post SAP 76.1 below effective baseline 82.0 (Δ-5.9)
+- property **710075** (uprn 10002918890): post SAP 79.8 below effective baseline 82.0 (Δ-2.2)
+- property **710117** (uprn 10096399566): post SAP 79.9 below effective baseline 93.0 (Δ-13.1)
+- property **710121** (uprn 10096028307): post SAP 78.8 below effective baseline 90.0 (Δ-11.2)
+- property **710122** (uprn 100090187902): post SAP 72.4 below effective baseline 74.0 (Δ-1.6)
+- property **710131** (uprn 10096028350): post SAP 80.1 below effective baseline 94.0 (Δ-13.9)
+- property **710140** (uprn 10023302889): post SAP 76.9 below effective baseline 79.0 (Δ-2.1)
+- property **710201** (uprn 10090944222): post SAP 74.6 below effective baseline 82.0 (Δ-7.4)
+- property **710222** (uprn 10096399567): post SAP 79.8 below effective baseline 93.0 (Δ-13.2)
+- property **710225** (uprn 10096028308): post SAP 78.8 below effective baseline 90.0 (Δ-11.2)
+- property **710241** (uprn 10096028351): post SAP 80.1 below effective baseline 94.0 (Δ-13.9)
+- property **710274** (uprn 10013924864): post SAP 74.8 below effective baseline 76.0 (Δ-1.2)
+- property **710326** (uprn 10096028309): post SAP 78.6 below effective baseline 89.0 (Δ-10.4)
+- property **710335** (uprn 10096028352): post SAP 80.0 below effective baseline 94.0 (Δ-14.0)
+- property **710362** (uprn 10090317710): post SAP 75.5 below effective baseline 79.0 (Δ-3.5)
+- property **710395** (uprn 10096028310): post SAP 79.5 below effective baseline 91.0 (Δ-11.5)
+- property **710472** (uprn 10013918445): post SAP 76.9 below effective baseline 79.0 (Δ-2.1)
+- property **710474** (uprn 10096028355): post SAP 78.5 below effective baseline 91.0 (Δ-12.5)
+- property **710479** (uprn 10096028353): post SAP 80.3 below effective baseline 95.0 (Δ-14.7)
+- property **710525** (uprn 10012028784): post SAP 69.6 below effective baseline 79.0 (Δ-9.4)
+- property **710537** (uprn 10096028311): post SAP 79.5 below effective baseline 91.0 (Δ-11.5)
+- property **710540** (uprn 100060714157): post SAP 68.2 below effective baseline 71.0 (Δ-2.8)
+- property **710544** (uprn 10008052006): post SAP 81.1 below effective baseline 83.0 (Δ-1.9)
+- property **710552** (uprn 100060706143): post SAP 83.0 below effective baseline 85.0 (Δ-2.0)
+- property **710569** (uprn 200000546526): post SAP 70.8 below effective baseline 73.0 (Δ-2.2)
+- property **710576** (uprn 100090187795): post SAP 72.4 below effective baseline 75.0 (Δ-2.6)
+- property **710645** (uprn 10009433145): post SAP 82.4 below effective baseline 83.0 (Δ-0.6)
+- property **710650** (uprn 200001530089): post SAP 72.9 below effective baseline 74.0 (Δ-1.1)
+- property **710686** (uprn 10009433147): post SAP 82.1 below effective baseline 83.0 (Δ-0.9)
+- property **710760** (uprn 10096028302): post SAP 78.3 below effective baseline 85.0 (Δ-6.7)
+- property **710785** (uprn 44006007): post SAP 75.3 below effective baseline 76.0 (Δ-0.7)
+- property **710792** (uprn 5300059024): post SAP 75.7 below effective baseline 79.0 (Δ-3.3)
+- property **710800** (uprn 10096399558): post SAP 79.7 below effective baseline 93.0 (Δ-13.3)
+- property **710802** (uprn 10096028356): post SAP 78.5 below effective baseline 91.0 (Δ-12.5)
+- property **710841** (uprn 200003688154): post SAP 70.3 below effective baseline 72.0 (Δ-1.7)
+- property **710895** (uprn 100020475290): post SAP 72.4 below effective baseline 73.0 (Δ-0.6)
+- property **710911** (uprn 10010221820): post SAP 82.2 below effective baseline 84.0 (Δ-1.8)
+- property **710946** (uprn 44012846): post SAP 79.8 below effective baseline 81.0 (Δ-1.2)
+- property **710955** (uprn 10090844951): post SAP 78.1 below effective baseline 79.0 (Δ-0.9)
+- property **710988** (uprn 10023371802): post SAP 73.3 below effective baseline 75.0 (Δ-1.7)
+- property **711014** (uprn 5300088717): post SAP 72.5 below effective baseline 74.0 (Δ-1.5)
+- … and 1581 more (see CSV)
+
+## already-meets-goal-with-works (MEDIUM) — 1162
+
+- property **709775** (uprn 100020933699): already C >= goal C but cost_of_works £32
+- property **709875** (uprn 100020973465): already C >= goal C but cost_of_works £38
+- property **709986** (uprn 200000539408): already C >= goal C but cost_of_works £32
+- property **709992** (uprn 100022908998): already C >= goal C but cost_of_works £555
+- property **710005** (uprn 100090178307): already C >= goal C but cost_of_works £21
+- property **710033** (uprn 100022920891): already C >= goal C but cost_of_works £855
+- property **710084** (uprn 200003444301): already C >= goal C but cost_of_works £505
+- property **710185** (uprn 100020650847): already C >= goal C but cost_of_works £455
+- property **710221** (uprn 6701328): already C >= goal C but cost_of_works £655
+- property **710247** (uprn 100020432467): already C >= goal C but cost_of_works £555
+- property **710298** (uprn 100020220397): already C >= goal C but cost_of_works £4515
+- property **710331** (uprn 100020492824): already C >= goal C but cost_of_works £855
+- property **710400** (uprn 100021011618): already C >= goal C but cost_of_works £3725
+- property **710484** (uprn 100060316083): already C >= goal C but cost_of_works £24
+- property **710517** (uprn 100020951618): already C >= goal C but cost_of_works £1029
+- property **710525** (uprn 10012028784): already C >= goal C but cost_of_works £11539
+- property **710539** (uprn 100021973960): already C >= goal C but cost_of_works £505
+- property **710540** (uprn 100060714157): already C >= goal C but cost_of_works £11600
+- property **710555** (uprn 100060718869): already C >= goal C but cost_of_works £28
+- property **710574** (uprn 100020947162): already C >= goal C but cost_of_works £28
+- property **710690** (uprn 200003688150): already C >= goal C but cost_of_works £505
+- property **710703** (uprn 100020438146): already C >= goal C but cost_of_works £32
+- property **710707** (uprn 100061820799): already C >= goal C but cost_of_works £32
+- property **710713** (uprn 200003497667): already C >= goal C but cost_of_works £11082
+- property **710828** (uprn 100060714174): already C >= goal C but cost_of_works £21
+- property **710889** (uprn 200003469113): already C >= goal C but cost_of_works £455
+- property **711058** (uprn 5300059062): already C >= goal C but cost_of_works £3962
+- property **711096** (uprn 100020455891): already C >= goal C but cost_of_works £555
+- property **711099** (uprn 100020229279): already C >= goal C but cost_of_works £1029
+- property **711334** (uprn 5300036435): already C >= goal C but cost_of_works £476
+- property **711390** (uprn 100023263012): already C >= goal C but cost_of_works £505
+- property **711539** (uprn 68159801): already C >= goal C but cost_of_works £2436
+- property **711679** (uprn 100021005287): already C >= goal C but cost_of_works £455
+- property **711694** (uprn 100062191221): already C >= goal C but cost_of_works £18
+- property **711795** (uprn 10090343115): already C >= goal C but cost_of_works £662
+- property **712249** (uprn 100021939292): already C >= goal C but cost_of_works £1029
+- property **712279** (uprn 10090343152): already C >= goal C but cost_of_works £1029
+- property **712426** (uprn 100062208849): already C >= goal C but cost_of_works £530
+- property **712446** (uprn 10090343167): already C >= goal C but cost_of_works £1029
+- property **712690** (uprn 10035061455): already C >= goal C but cost_of_works £2790
+- property **712697** (uprn 100060742520): already C >= goal C but cost_of_works £416
+- property **712764** (uprn 100060675900): already C >= goal C but cost_of_works £32
+- property **712766** (uprn 100021961011): already C >= goal C but cost_of_works £2566
+- property **712801** (uprn 100061734876): already C >= goal C but cost_of_works £555
+- property **712831** (uprn 100061736377): already C >= goal C but cost_of_works £1282
+- property **712864** (uprn 100061738178): already C >= goal C but cost_of_works £455
+- property **712865** (uprn 100061738325): already C >= goal C but cost_of_works £14266
+- property **712869** (uprn 100061738604): already C >= goal C but cost_of_works £18
+- property **712874** (uprn 100061757360): already C >= goal C but cost_of_works £755
+- property **712899** (uprn 100061739860): already C >= goal C but cost_of_works £28
+- … and 1112 more (see CSV)
+
+## excessive-solar-sap (MEDIUM) — 51
+
+- property **710374** (uprn 10090342188): solar PV alone earns 26.1 SAP points (likely oversized array)
+- property **713238** (uprn 200004784741): solar PV alone earns 32.6 SAP points (likely oversized array)
+- property **714227** (uprn 100061738603): solar PV alone earns 33.9 SAP points (likely oversized array)
+- property **714257** (uprn 100061740105): solar PV alone earns 29.8 SAP points (likely oversized array)
+- property **714511** (uprn 100061761168): solar PV alone earns 32.3 SAP points (likely oversized array)
+- property **714977** (uprn 100061761946): solar PV alone earns 31.4 SAP points (likely oversized array)
+- property **715563** (uprn 100061761947): solar PV alone earns 28.5 SAP points (likely oversized array)
+- property **715595** (uprn 10002468656): solar PV alone earns 29.3 SAP points (likely oversized array)
+- property **715740** (uprn 100061764300): solar PV alone earns 27.3 SAP points (likely oversized array)
+- property **716734** (uprn 10002469029): solar PV alone earns 31.0 SAP points (likely oversized array)
+- property **716740** (uprn 100061753334): solar PV alone earns 31.1 SAP points (likely oversized array)
+- property **717201** (uprn 100091206047): solar PV alone earns 31.3 SAP points (likely oversized array)
+- property **718323** (uprn 10002472608): solar PV alone earns 25.2 SAP points (likely oversized array)
+- property **718371** (uprn 100061764075): solar PV alone earns 35.5 SAP points (likely oversized array)
+- property **718890** (uprn 100062344151): solar PV alone earns 31.9 SAP points (likely oversized array)
+- property **719064** (uprn 100021004675): solar PV alone earns 25.6 SAP points (likely oversized array)
+- property **719080** (uprn 100091206033): solar PV alone earns 31.3 SAP points (likely oversized array)
+- property **719829** (uprn 100091206052): solar PV alone earns 31.6 SAP points (likely oversized array)
+- property **720039** (uprn 100061741993): solar PV alone earns 32.6 SAP points (likely oversized array)
+- property **720104** (uprn 100061764078): solar PV alone earns 29.9 SAP points (likely oversized array)
+- property **721044** (uprn 100061764081): solar PV alone earns 33.9 SAP points (likely oversized array)
+- property **721222** (uprn 100062480566): solar PV alone earns 27.0 SAP points (likely oversized array)
+- property **722986** (uprn 100061742571): solar PV alone earns 29.8 SAP points (likely oversized array)
+- property **723096** (uprn 100061763625): solar PV alone earns 34.5 SAP points (likely oversized array)
+- property **723516** (uprn 100061741124): solar PV alone earns 31.0 SAP points (likely oversized array)
+- property **723528** (uprn 100061742003): solar PV alone earns 30.9 SAP points (likely oversized array)
+- property **724609** (uprn 100061742008): solar PV alone earns 27.0 SAP points (likely oversized array)
+- property **725224** (uprn 100062480573): solar PV alone earns 27.6 SAP points (likely oversized array)
+- property **725266** (uprn 10034506076): solar PV alone earns 38.5 SAP points (likely oversized array)
+- property **725603** (uprn 100061761161): solar PV alone earns 35.6 SAP points (likely oversized array)
+- property **727422** (uprn 200001645537): solar PV alone earns 29.4 SAP points (likely oversized array)
+- property **727688** (uprn 100061761162): solar PV alone earns 28.8 SAP points (likely oversized array)
+- property **727699** (uprn 200004784746): solar PV alone earns 27.3 SAP points (likely oversized array)
+- property **727968** (uprn 100061740165): solar PV alone earns 34.5 SAP points (likely oversized array)
+- property **728344** (uprn 100061764582): solar PV alone earns 26.9 SAP points (likely oversized array)
+- property **729028** (uprn 100061735428): solar PV alone earns 32.0 SAP points (likely oversized array)
+- property **729329** (uprn 100061749297): solar PV alone earns 30.2 SAP points (likely oversized array)
+- property **729415** (uprn 100091206037): solar PV alone earns 31.5 SAP points (likely oversized array)
+- property **731052** (uprn 100021958934): solar PV alone earns 29.3 SAP points (likely oversized array)
+- property **731481** (uprn 100021935669): solar PV alone earns 25.1 SAP points (likely oversized array)
+- property **731812** (uprn 200001645541): solar PV alone earns 32.1 SAP points (likely oversized array)
+- property **731994** (uprn 10023371767): solar PV alone earns 25.3 SAP points (likely oversized array)
+- property **732041** (uprn 100061761165): solar PV alone earns 30.1 SAP points (likely oversized array)
+- property **732050** (uprn 100061764295): solar PV alone earns 30.5 SAP points (likely oversized array)
+- property **732860** (uprn 100061733678): solar PV alone earns 32.7 SAP points (likely oversized array)
+- property **733394** (uprn 100061748753): solar PV alone earns 25.1 SAP points (likely oversized array)
+- property **739556** (uprn 100061754547): solar PV alone earns 31.3 SAP points (likely oversized array)
+- property **739814** (uprn 200003724253): solar PV alone earns 31.6 SAP points (likely oversized array)
+- property **739998** (uprn 100090224018): solar PV alone earns 25.9 SAP points (likely oversized array)
+- property **740214** (uprn 100061762820): solar PV alone earns 30.4 SAP points (likely oversized array)
+- … and 1 more (see CSV)
+
+## low-solar-bill-savings (MEDIUM) — 83
+
+- property **710178** (uprn 100020465019): solar PV bill saving only £49/yr — check self-consumption / SEG export
+- property **711663** (uprn 100020481859): solar PV bill saving only £47/yr — check self-consumption / SEG export
+- property **712943** (uprn 100061741910): solar PV bill saving only £47/yr — check self-consumption / SEG export
+- property **713299** (uprn 100060331540): solar PV bill saving only £46/yr — check self-consumption / SEG export
+- property **713607** (uprn 100090108855): solar PV bill saving only £46/yr — check self-consumption / SEG export
+- property **713631** (uprn 10002470912): solar PV bill saving only £49/yr — check self-consumption / SEG export
+- property **713743** (uprn 100060359906): solar PV bill saving only £36/yr — check self-consumption / SEG export
+- property **715182** (uprn 100060726237): solar PV bill saving only £46/yr — check self-consumption / SEG export
+- property **715701** (uprn 100021001715): solar PV bill saving only £50/yr — check self-consumption / SEG export
+- property **716152** (uprn 100090108859): solar PV bill saving only £43/yr — check self-consumption / SEG export
+- property **716268** (uprn 100061763778): solar PV bill saving only £36/yr — check self-consumption / SEG export
+- property **716289** (uprn 200003688201): solar PV bill saving only £43/yr — check self-consumption / SEG export
+- property **716659** (uprn 100061747951): solar PV bill saving only £41/yr — check self-consumption / SEG export
+- property **716693** (uprn 100061733911): solar PV bill saving only £39/yr — check self-consumption / SEG export
+- property **717392** (uprn 100020450723): solar PV bill saving only £45/yr — check self-consumption / SEG export
+- property **717661** (uprn 6176751): solar PV bill saving only £42/yr — check self-consumption / SEG export
+- property **718073** (uprn 100021017285): solar PV bill saving only £47/yr — check self-consumption / SEG export
+- property **718298** (uprn 100061741870): solar PV bill saving only £43/yr — check self-consumption / SEG export
+- property **718567** (uprn 100091206050): solar PV bill saving only £50/yr — check self-consumption / SEG export
+- property **719647** (uprn 100020590930): solar PV bill saving only £49/yr — check self-consumption / SEG export
+- property **720335** (uprn 100020594071): solar PV bill saving only £36/yr — check self-consumption / SEG export
+- property **720677** (uprn 100020969500): solar PV bill saving only £30/yr — check self-consumption / SEG export
+- property **721018** (uprn 202140958): solar PV bill saving only £44/yr — check self-consumption / SEG export
+- property **721529** (uprn 100060696301): solar PV bill saving only £43/yr — check self-consumption / SEG export
+- property **721664** (uprn 100061765249): solar PV bill saving only £46/yr — check self-consumption / SEG export
+- property **721895** (uprn 100060726253): solar PV bill saving only £48/yr — check self-consumption / SEG export
+- property **722155** (uprn 100061758903): solar PV bill saving only £47/yr — check self-consumption / SEG export
+- property **722390** (uprn 100020944918): solar PV bill saving only £47/yr — check self-consumption / SEG export
+- property **722910** (uprn 10009428749): solar PV bill saving only £41/yr — check self-consumption / SEG export
+- property **723298** (uprn 202140961): solar PV bill saving only £45/yr — check self-consumption / SEG export
+- property **723578** (uprn 100020986231): solar PV bill saving only £47/yr — check self-consumption / SEG export
+- property **723748** (uprn 100061757556): solar PV bill saving only £48/yr — check self-consumption / SEG export
+- property **723965** (uprn 100061761860): solar PV bill saving only £50/yr — check self-consumption / SEG export
+- property **724311** (uprn 100061765331): solar PV bill saving only £30/yr — check self-consumption / SEG export
+- property **724331** (uprn 100022008224): solar PV bill saving only £22/yr — check self-consumption / SEG export
+- property **724850** (uprn 100060719545): solar PV bill saving only £50/yr — check self-consumption / SEG export
+- property **725287** (uprn 100062187008): solar PV bill saving only £46/yr — check self-consumption / SEG export
+- property **725585** (uprn 100061752475): solar PV bill saving only £44/yr — check self-consumption / SEG export
+- property **725807** (uprn 100020996065): solar PV bill saving only £40/yr — check self-consumption / SEG export
+- property **725969** (uprn 202141567): solar PV bill saving only £31/yr — check self-consumption / SEG export
+- property **726419** (uprn 100061809723): solar PV bill saving only £46/yr — check self-consumption / SEG export
+- property **726507** (uprn 100061752706): solar PV bill saving only £48/yr — check self-consumption / SEG export
+- property **726627** (uprn 100061152652): solar PV bill saving only £42/yr — check self-consumption / SEG export
+- property **726735** (uprn 100061809725): solar PV bill saving only £46/yr — check self-consumption / SEG export
+- property **726998** (uprn 100061809727): solar PV bill saving only £46/yr — check self-consumption / SEG export
+- property **727114** (uprn 100061809728): solar PV bill saving only £47/yr — check self-consumption / SEG export
+- property **727143** (uprn 202141571): solar PV bill saving only £45/yr — check self-consumption / SEG export
+- property **727820** (uprn 100061809729): solar PV bill saving only £47/yr — check self-consumption / SEG export
+- property **727994** (uprn 202141572): solar PV bill saving only £45/yr — check self-consumption / SEG export
+- property **728027** (uprn 10090265602): solar PV bill saving only £45/yr — check self-consumption / SEG export
+- … and 33 more (see CSV)
+
+## zero-works-post-differs (MEDIUM) — 5624
+
+- property **709772** (uprn 10093116528): £0 works but post SAP 80.3 != effective 79.0
+- property **709773** (uprn 10093116543): £0 works but post SAP 78.5 != effective 77.0
+- property **709774** (uprn 10093116529): £0 works but post SAP 76.8 != effective 75.0
+- property **709777** (uprn 10094601392): £0 works but post SAP 77.2 != effective 74.0
+- property **709778** (uprn 10023444324): £0 works but post SAP 76.9 != effective 75.0
+- property **709779** (uprn 10092970673): £0 works but post SAP 70.9 != effective 61.0
+- property **709780** (uprn 10094601287): £0 works but post SAP 77.7 != effective 75.0
+- property **709783** (uprn 10094601162): £0 works but post SAP 78.1 != effective 74.0
+- property **709784** (uprn 10090844948): £0 works but post SAP 76.4 != effective 73.0
+- property **709786** (uprn 10093114053): £0 works but post SAP 81.3 != effective 76.0
+- property **709787** (uprn 10091568921): £0 works but post SAP 79.4 != effective 77.0
+- property **709788** (uprn 10093718424): £0 works but post SAP 80.0 != effective 78.0
+- property **709790** (uprn 10023443426): £0 works but post SAP 74.2 != effective 76.0
+- property **709791** (uprn 10093412452): £0 works but post SAP 80.2 != effective 79.0
+- property **709792** (uprn 6199384): £0 works but post SAP 80.5 != effective 78.0
+- property **709793** (uprn 10014314798): £0 works but post SAP 73.8 != effective 72.0
+- property **709794** (uprn 10094601294): £0 works but post SAP 78.1 != effective 76.0
+- property **709795** (uprn 10090343335): £0 works but post SAP 84.0 != effective 82.0
+- property **709796** (uprn 10093115480): £0 works but post SAP 78.8 != effective 77.0
+- property **709798** (uprn 10094601226): £0 works but post SAP 77.3 != effective 75.0
+- property **709800** (uprn 6701369): £0 works but post SAP 82.5 != effective 78.0
+- property **709801** (uprn 202211152): £0 works but post SAP 81.8 != effective 79.0
+- property **709803** (uprn 10093394010): £0 works but post SAP 79.9 != effective 78.0
+- property **709806** (uprn 10090341811): £0 works but post SAP 80.2 != effective 78.0
+- property **709808** (uprn 10093117227): £0 works but post SAP 77.6 != effective 76.0
+- property **709809** (uprn 10023444170): £0 works but post SAP 80.3 != effective 78.0
+- property **709810** (uprn 10096028301): £0 works but post SAP 78.0 != effective 85.0
+- property **709813** (uprn 10094601280): £0 works but post SAP 77.9 != effective 75.0
+- property **709814** (uprn 10093386418): £0 works but post SAP 78.8 != effective 76.0
+- property **709817** (uprn 10094895444): £0 works but post SAP 79.6 != effective 77.0
+- property **709818** (uprn 10092973960): £0 works but post SAP 77.6 != effective 74.0
+- property **709819** (uprn 10012028763): £0 works but post SAP 83.3 != effective 82.0
+- property **709820** (uprn 10093049867): £0 works but post SAP 78.7 != effective 75.0
+- property **709821** (uprn 10093116336): £0 works but post SAP 79.9 != effective 78.0
+- property **709823** (uprn 10093116334): £0 works but post SAP 79.0 != effective 78.0
+- property **709824** (uprn 44042992): £0 works but post SAP 79.9 != effective 79.0
+- property **709825** (uprn 10014314853): £0 works but post SAP 72.0 != effective 70.0
+- property **709828** (uprn 10091636116): £0 works but post SAP 75.8 != effective 71.0
+- property **709829** (uprn 10094601381): £0 works but post SAP 78.4 != effective 74.0
+- property **709830** (uprn 10093049853): £0 works but post SAP 81.5 != effective 78.0
+- property **709831** (uprn 10093390790): £0 works but post SAP 74.9 != effective 72.0
+- property **709832** (uprn 10093116330): £0 works but post SAP 80.1 != effective 79.0
+- property **709833** (uprn 10093116326): £0 works but post SAP 80.1 != effective 79.0
+- property **709834** (uprn 10094601351): £0 works but post SAP 79.0 != effective 76.0
+- property **709835** (uprn 10090317693): £0 works but post SAP 77.5 != effective 76.0
+- property **709836** (uprn 10090034872): £0 works but post SAP 81.4 != effective 79.0
+- property **709837** (uprn 10093115985): £0 works but post SAP 79.5 != effective 77.0
+- property **709842** (uprn 202211170): £0 works but post SAP 82.1 != effective 79.0
+- property **709845** (uprn 6701311): £0 works but post SAP 81.4 != effective 78.0
+- property **709846** (uprn 10096399556): £0 works but post SAP 79.7 != effective 93.0
+- … and 5574 more (see CSV)
+
+## effective-lodged-divergence (LOW) — 1527
+
+- property **709779** (uprn 10092970673): effective 61 vs lodged 86 (Δ-25, reason=pre_sap10)
+- property **709802** (uprn 100020665611): effective 52 vs lodged 37 (Δ+15, reason=pre_sap10)
+- property **709804** (uprn 10093388044): effective 33 vs lodged 93 (Δ-60, reason=pre_sap10)
+- property **709815** (uprn 100090108846): effective 57 vs lodged 79 (Δ-22, reason=pre_sap10)
+- property **709828** (uprn 10091636116): effective 71 vs lodged 88 (Δ-17, reason=pre_sap10)
+- property **709860** (uprn 100061086424): effective 60 vs lodged 83 (Δ-23, reason=pre_sap10)
+- property **709863** (uprn 10090342180): effective 39 vs lodged 78 (Δ-39, reason=pre_sap10)
+- property **709874** (uprn 10093388053): effective 35 vs lodged 94 (Δ-59, reason=pre_sap10)
+- property **709892** (uprn 10090343767): effective 75 vs lodged 91 (Δ-16, reason=pre_sap10)
+- property **709945** (uprn 10090342181): effective 42 vs lodged 81 (Δ-39, reason=pre_sap10)
+- property **709993** (uprn 15043874): effective 68 vs lodged 49 (Δ+19, reason=pre_sap10)
+- property **710003** (uprn 10091636410): effective 71 vs lodged 86 (Δ-15, reason=pre_sap10)
+- property **710009** (uprn 100022895379): effective 62 vs lodged 80 (Δ-18, reason=pre_sap10)
+- property **710019** (uprn 10090342182): effective 44 vs lodged 80 (Δ-36, reason=pre_sap10)
+- property **710025** (uprn 10093388055): effective 55 vs lodged 93 (Δ-38, reason=pre_sap10)
+- property **710037** (uprn 100090108857): effective 56 vs lodged 86 (Δ-30, reason=pre_sap10)
+- property **710091** (uprn 100061086427): effective 60 vs lodged 83 (Δ-23, reason=pre_sap10)
+- property **710114** (uprn 10096026315): effective 74 vs lodged 89 (Δ-15, reason=pre_sap10)
+- property **710134** (uprn 10096026271): effective 73 vs lodged 88 (Δ-15, reason=pre_sap10)
+- property **710139** (uprn 10090342183): effective 41 vs lodged 77 (Δ-36, reason=pre_sap10)
+- property **710144** (uprn 10014314832): effective 63 vs lodged 83 (Δ-20, reason=pre_sap10)
+- property **710148** (uprn 10093388056): effective 57 vs lodged 94 (Δ-37, reason=pre_sap10)
+- property **710191** (uprn 10090342184): effective 49 vs lodged 79 (Δ-30, reason=pre_sap10)
+- property **710198** (uprn 10012138502): effective 65 vs lodged 85 (Δ-20, reason=pre_sap10)
+- property **710199** (uprn 10093388057): effective 38 vs lodged 95 (Δ-57, reason=pre_sap10)
+- property **710202** (uprn 10090342864): effective 68 vs lodged 84 (Δ-16, reason=pre_sap10)
+- property **710244** (uprn 10010249676): effective 74 vs lodged 90 (Δ-16, reason=pre_sap10)
+- property **710246** (uprn 100061086430): effective 59 vs lodged 83 (Δ-24, reason=pre_sap10)
+- property **710250** (uprn 10090342185): effective 62 vs lodged 81 (Δ-19, reason=pre_sap10)
+- property **710260** (uprn 10093388058): effective 47 vs lodged 95 (Δ-48, reason=pre_sap10)
+- property **710261** (uprn 10090341825): effective 75 vs lodged 91 (Δ-16, reason=pre_sap10)
+- property **710300** (uprn 10090341826): effective 75 vs lodged 91 (Δ-16, reason=pre_sap10)
+- property **710342** (uprn 10090342187): effective 37 vs lodged 77 (Δ-40, reason=pre_sap10)
+- property **710348** (uprn 10090341827): effective 76 vs lodged 91 (Δ-15, reason=pre_sap10)
+- property **710429** (uprn 10093388045): effective 49 vs lodged 93 (Δ-44, reason=pre_sap10)
+- property **710449** (uprn 100020993501): effective 56 vs lodged 5 (Δ+51, reason=pre_sap10)
+- property **710491** (uprn 10014314835): effective 69 vs lodged 84 (Δ-15, reason=pre_sap10)
+- property **710536** (uprn 100062482536): effective 38 vs lodged 53 (Δ-15, reason=pre_sap10)
+- property **710640** (uprn 10014316004): effective 71 vs lodged 88 (Δ-17, reason=pre_sap10)
+- property **710658** (uprn 10014316005): effective 70 vs lodged 88 (Δ-18, reason=pre_sap10)
+- property **710659** (uprn 22061763): effective 50 vs lodged 70 (Δ-20, reason=pre_sap10)
+- property **710664** (uprn 10096026322): effective 74 vs lodged 89 (Δ-15, reason=pre_sap10)
+- property **710672** (uprn 200003378407): effective 48 vs lodged 28 (Δ+20, reason=pre_sap10)
+- property **710683** (uprn 10014316006): effective 70 vs lodged 88 (Δ-18, reason=pre_sap10)
+- property **710704** (uprn 10014316007): effective 71 vs lodged 88 (Δ-17, reason=pre_sap10)
+- property **710745** (uprn 10093386244): effective 50 vs lodged 83 (Δ-33, reason=pre_sap10)
+- property **710752** (uprn 10093388046): effective 47 vs lodged 94 (Δ-47, reason=pre_sap10)
+- property **710779** (uprn 10091636118): effective 71 vs lodged 88 (Δ-17, reason=pre_sap10)
+- property **710814** (uprn 10014316008): effective 71 vs lodged 88 (Δ-17, reason=pre_sap10)
+- property **710837** (uprn 10014316009): effective 71 vs lodged 88 (Δ-17, reason=pre_sap10)
+- … and 1477 more (see CSV)
+
+## negative-bill-savings (LOW) — 100
+
+- property **712847** (uprn 100061737192): energy_bill_savings £-30/yr on £16110 of works
+- property **713453** (uprn 100061739869): energy_bill_savings £-68/yr on £14533 of works
+- property **713721** (uprn 100061753373): energy_bill_savings £-18/yr on £14554 of works
+- property **713743** (uprn 100060359906): energy_bill_savings £-98/yr on £18823 of works
+- property **713791** (uprn 10013528635): energy_bill_savings £-130/yr on £1029 of works
+- property **713970** (uprn 10013528640): energy_bill_savings £-130/yr on £1029 of works
+- property **714001** (uprn 10013528641): energy_bill_savings £-130/yr on £1029 of works
+- property **714038** (uprn 10013528642): energy_bill_savings £-130/yr on £1029 of works
+- property **714373** (uprn 100062185281): energy_bill_savings £-113/yr on £14800 of works
+- property **714420** (uprn 10010242243): energy_bill_savings £-162/yr on £1029 of works
+- property **715227** (uprn 100061753375): energy_bill_savings £-18/yr on £14554 of works
+- property **715561** (uprn 100061739874): energy_bill_savings £-69/yr on £14533 of works
+- property **715999** (uprn 100061737204): energy_bill_savings £-13/yr on £14533 of works
+- property **716169** (uprn 100061747915): energy_bill_savings £-53/yr on £14533 of works
+- property **716251** (uprn 100061753377): energy_bill_savings £-18/yr on £14554 of works
+- property **716548** (uprn 100061765632): energy_bill_savings £-70/yr on £14533 of works
+- property **716811** (uprn 22106963): energy_bill_savings £-3/yr on £4785 of works
+- property **717209** (uprn 100061753379): energy_bill_savings £-20/yr on £14554 of works
+- property **717675** (uprn 6176752): energy_bill_savings £-75/yr on £15067 of works
+- property **717998** (uprn 100061749651): energy_bill_savings £-7/yr on £14533 of works
+- property **719002** (uprn 10002476550): energy_bill_savings £-101/yr on £14533 of works
+- property **719091** (uprn 100061753365): energy_bill_savings £-46/yr on £14533 of works
+- property **719449** (uprn 100061753383): energy_bill_savings £-18/yr on £14554 of works
+- property **719680** (uprn 100061741246): energy_bill_savings £-34/yr on £17072 of works
+- property **719811** (uprn 100060327562): energy_bill_savings £-92/yr on £14533 of works
+- property **720349** (uprn 100021812910): energy_bill_savings £-122/yr on £1029 of works
+- property **720364** (uprn 100061741682): energy_bill_savings £-51/yr on £15070 of works
+- property **720800** (uprn 100061753387): energy_bill_savings £-20/yr on £14554 of works
+- property **720889** (uprn 10023224588): energy_bill_savings £-172/yr on £1029 of works
+- property **720989** (uprn 100061764553): energy_bill_savings £-143/yr on £14533 of works
+- property **721034** (uprn 100061758484): energy_bill_savings £-145/yr on £15105 of works
+- property **721070** (uprn 100061749663): energy_bill_savings £-69/yr on £14800 of works
+- property **722402** (uprn 100061737194): energy_bill_savings £-73/yr on £14266 of works
+- property **722448** (uprn 100061739862): energy_bill_savings £-68/yr on £14533 of works
+- property **722732** (uprn 100061750203): energy_bill_savings £-155/yr on £16445 of works
+- property **722808** (uprn 100062186150): energy_bill_savings £-61/yr on £14533 of works
+- property **723367** (uprn 100061753394): energy_bill_savings £-56/yr on £14533 of works
+- property **723503** (uprn 10010242632): energy_bill_savings £-112/yr on £1029 of works
+- property **723540** (uprn 100061743541): energy_bill_savings £-35/yr on £14533 of works
+- property **723771** (uprn 200001645519): energy_bill_savings £-58/yr on £14533 of works
+- property **723782** (uprn 100061743542): energy_bill_savings £-30/yr on £17032 of works
+- property **725039** (uprn 100061748331): energy_bill_savings £-4/yr on £14800 of works
+- property **725350** (uprn 100061743145): energy_bill_savings £-189/yr on £15067 of works
+- property **725715** (uprn 100061736694): energy_bill_savings £-42/yr on £14533 of works
+- property **725731** (uprn 100061763962): energy_bill_savings £-71/yr on £14533 of works
+- property **725988** (uprn 100061749671): energy_bill_savings £-13/yr on £14533 of works
+- property **726184** (uprn 100061752891): energy_bill_savings £-66/yr on £14533 of works
+- property **726268** (uprn 100061741268): energy_bill_savings £-76/yr on £14266 of works
+- property **726271** (uprn 100061741692): energy_bill_savings £-63/yr on £14533 of works
+- property **726302** (uprn 202141568): energy_bill_savings £-73/yr on £15721 of works
+- … and 50 more (see CSV)
+
+## unusually-high-post-sap (LOW) — 21
+
+- property **714511** (uprn 100061761168): post SAP 100.0 (near band A) — confirm not over-credited
+- property **716734** (uprn 10002469029): post SAP 100.0 (near band A) — confirm not over-credited
+- property **716740** (uprn 100061753334): post SAP 100.0 (near band A) — confirm not over-credited
+- property **717201** (uprn 100091206047): post SAP 100.0 (near band A) — confirm not over-credited
+- property **718890** (uprn 100062344151): post SAP 100.0 (near band A) — confirm not over-credited
+- property **719080** (uprn 100091206033): post SAP 100.0 (near band A) — confirm not over-credited
+- property **719829** (uprn 100091206052): post SAP 100.0 (near band A) — confirm not over-credited
+- property **721222** (uprn 100062480566): post SAP 98.6 (near band A) — confirm not over-credited
+- property **723516** (uprn 100061741124): post SAP 100.0 (near band A) — confirm not over-credited
+- property **725224** (uprn 100062480573): post SAP 95.3 (near band A) — confirm not over-credited
+- property **725440** (uprn 100061746447): post SAP 100.0 (near band A) — confirm not over-credited
+- property **725627** (uprn 10008885879): post SAP 99.6 (near band A) — confirm not over-credited
+- property **726993** (uprn 100061757571): post SAP 100.0 (near band A) — confirm not over-credited
+- property **727688** (uprn 100061761162): post SAP 97.6 (near band A) — confirm not over-credited
+- property **727699** (uprn 200004784746): post SAP 100.0 (near band A) — confirm not over-credited
+- property **729329** (uprn 100061749297): post SAP 99.2 (near band A) — confirm not over-credited
+- property **729415** (uprn 100091206037): post SAP 100.0 (near band A) — confirm not over-credited
+- property **732041** (uprn 100061761165): post SAP 97.9 (near band A) — confirm not over-credited
+- property **732050** (uprn 100061764295): post SAP 98.1 (near band A) — confirm not over-credited
+- property **740214** (uprn 100061762820): post SAP 99.4 (near band A) — confirm not over-credited
+- property **740234** (uprn 100061761814): post SAP 100.0 (near band A) — confirm not over-credited
diff --git a/orchestration/bulk_upload_finaliser_orchestrator.py b/orchestration/bulk_upload_finaliser_orchestrator.py
index 4aa49ab85..1d707a8d7 100644
--- a/orchestration/bulk_upload_finaliser_orchestrator.py
+++ b/orchestration/bulk_upload_finaliser_orchestrator.py
@@ -14,10 +14,10 @@ from typing import Any, Optional
 
 from uuid import UUID
 
-from domain.epc.built_form_type import BuiltFormType
-from domain.epc.property_type import PropertyType
-from domain.epc.roof_type import RoofType
-from domain.epc.wall_type import WallType
+from domain.epc.property_overrides.built_form_type import BuiltFormType
+from domain.epc.property_overrides.property_type import PropertyType
+from domain.epc.property_overrides.roof_type import RoofType
+from domain.epc.property_overrides.wall_type import WallType
 from repositories.bulk_upload.bulk_upload_status_writer import BulkUploadStatusWriter
 from repositories.landlord_overrides.landlord_override_reader import (
     LandlordOverrideReader,
diff --git a/orchestration/modelling_orchestrator.py b/orchestration/modelling_orchestrator.py
index 55ae531d7..e3180a4d2 100644
--- a/orchestration/modelling_orchestrator.py
+++ b/orchestration/modelling_orchestrator.py
@@ -331,7 +331,7 @@ def _candidate_recommendations(
                 MeasureType.SYSTEM_TUNE_UP,
                 MeasureType.SYSTEM_TUNE_UP_ZONED,
             ),
-            lambda: recommend_heating(effective_epc, products, planning_restrictions),
+            lambda: recommend_heating(effective_epc, products, planning_restrictions, considered_measures),
         ),
         (
             admitted(MeasureType.SECONDARY_HEATING_REMOVAL),
diff --git a/orchestration/property_baseline_orchestrator.py b/orchestration/property_baseline_orchestrator.py
index 6c749e36d..bc77605ff 100644
--- a/orchestration/property_baseline_orchestrator.py
+++ b/orchestration/property_baseline_orchestrator.py
@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from typing import Optional
 
-from datatypes.epc.domain.epc_property_data import (
-    EpcPropertyData,
-    RenewableHeatIncentive,
-)
+from datatypes.epc.domain.epc_property_data import EpcPropertyData
 from domain.billing.bill import EnergyBreakdown
+from domain.sap10_calculator.calculator import SapResult
 from domain.billing.bill_derivation import BillDerivation
 from domain.property_baseline.property_baseline_performance import PropertyBaselinePerformance
 from domain.property_baseline.performance import lodged_performance
@@ -53,7 +52,10 @@ class PropertyBaselineOrchestrator:
                 effective_epc = prop.effective_epc
                 lodged = lodged_performance(effective_epc)
                 rebaselined = self._rebaseliner.rebaseline(
-                    property_id, effective_epc, lodged
+                    property_id,
+                    effective_epc,
+                    lodged,
+                    physical_state_changed=prop.physical_state_changed,
                 )
                 # No SapResult (the stub path) means no scored picture to price,
                 # so the bill stays None.
@@ -64,24 +66,40 @@ class PropertyBaselineOrchestrator:
                     if rebaselined.sap_result is not None
                     else None
                 )
-                rhi = _require_rhi(effective_epc)
+                space_heating_kwh, water_heating_kwh = _baseline_kwh(
+                    effective_epc, rebaselined.sap_result
+                )
                 baseline = PropertyBaselinePerformance(
                     lodged=lodged,
                     effective=rebaselined.effective,
                     rebaseline_reason=rebaselined.reason,
-                    space_heating_kwh=rhi.space_heating_kwh,
-                    water_heating_kwh=rhi.water_heating_kwh,
+                    space_heating_kwh=space_heating_kwh,
+                    water_heating_kwh=water_heating_kwh,
                     bill=bill,
                 )
                 uow.property_baseline.save(baseline, property_id)
             uow.commit()
 
 
-def _require_rhi(epc: EpcPropertyData) -> RenewableHeatIncentive:
+def _baseline_kwh(
+    epc: EpcPropertyData, sap_result: Optional[SapResult]
+) -> tuple[float, float]:
+    """Baseline space- and water-heating kWh for the Property.
+
+    Lodged certs carry these in the EPC's RHI block (the ADR-0007 ML target).
+    Predicted EPCs (ADR-0031) deep-copy a neighbour template that may lack an RHI
+    block, so fall back to the property's OWN computed figures from the scored
+    SapResult — a better baseline than a neighbour's lodged numbers anyway. When
+    neither source exists (no RHI and the rebaseliner scored nothing), there is
+    genuinely no demand to record, so fail noisily.
+    """
     rhi = epc.renewable_heat_incentive
-    if rhi is None:
-        raise ValueError(
-            "Effective EPC is missing renewable_heat_incentive; cannot read "
-            "baseline space-heating / hot-water kWh"
-        )
-    return rhi
+    if rhi is not None:
+        return rhi.space_heating_kwh, rhi.water_heating_kwh
+    if sap_result is not None:
+        return sap_result.space_heating_kwh_per_yr, sap_result.hot_water_kwh_per_yr
+    raise ValueError(
+        "Effective EPC has no renewable_heat_incentive and the rebaseliner "
+        "produced no SapResult; cannot establish baseline space-heating / "
+        "hot-water kWh"
+    )
diff --git a/orchestration/task_orchestrator.py b/orchestration/task_orchestrator.py
index ebb71a328..15915d9f1 100644
--- a/orchestration/task_orchestrator.py
+++ b/orchestration/task_orchestrator.py
@@ -2,7 +2,7 @@ from typing import Any, Callable, Optional
 from uuid import UUID
 
 from domain.tasks.subtasks import SubTask
-from domain.tasks.tasks import Source, Task
+from domain.tasks.tasks import Source, Task, TaskStatus
 from repositories.tasks.subtask_repository import SubTaskRepository
 from repositories.tasks.task_repository import TaskRepository
 from utilities.private import private
@@ -98,9 +98,59 @@ class TaskOrchestrator:
         self.complete_subtask(subtask_id, result)
         return result
 
+    def run_subtasks(
+        self,
+        parent_task_id: UUID,
+        inputs_per_subtask: list[dict[str, Any]],
+        work: Callable[[SubTask], Any],
+        cloud_logs_url: Optional[str] = None,
+    ) -> list[Any]:
+        """Fan a parent Task out into one child SubTask per item, run ``work`` for
+        each (failures isolated per child — a raising item is marked failed and
+        its siblings still run), and persist the whole batch in **two** writes
+        plus **one** cascade.
+
+        This is the batched form of ``run_subtask``: instead of ~5 writes and a
+        full parent re-roll-up *per child* (``create`` + ``start`` + ``complete``
+        each cascading — an O(N²) cost on the parent's children), it does one bulk
+        ``create_many``, runs every item recording its terminal state in memory,
+        then one bulk ``save_many`` and a single ``_cascade``. Children move
+        straight from WAITING to their terminal state — the transient IN_PROGRESS
+        row is never written, since for a fast batch it only adds DB churn.
+
+        Returns one entry per item in order: the work's result, or ``None`` for an
+        item whose work raised.
+        """
+        subtasks = [
+            SubTask.create(task_id=parent_task_id, inputs=inputs)
+            for inputs in inputs_per_subtask
+        ]
+        self._subtasks.create_many(subtasks)
+
+        results: list[Any] = []
+        for subtask in subtasks:
+            subtask.start(cloud_logs_url)
+            try:
+                result = work(subtask)
+            except Exception as e:  # noqa: BLE001 — isolate per child; siblings continue
+                subtask.fail(e)
+                results.append(None)
+            else:
+                subtask.complete(result)
+                results.append(result)
+
+        self._subtasks.save_many(subtasks)
+        self._cascade(parent_task_id)
+        return results
+
     @private
     def _cascade(self, task_id: UUID) -> None:
-        statuses = [s.status for s in self._subtasks.list_by_task(task_id)]
         task = self._tasks.get(task_id)
+        # FAILED is terminal: once any SubTask has failed the Task is failed and
+        # stays failed, so skip the (potentially large) sibling roll-up entirely —
+        # no need to list and re-check the SubTasks.
+        if task.status is TaskStatus.FAILED:
+            return
+        statuses = [s.status for s in self._subtasks.list_by_task(task_id)]
         task.recalculate_from_subtasks(statuses)
         self._tasks.save(task)
diff --git a/repositories/comparable_properties/epc_comparable_properties_repository.py b/repositories/comparable_properties/epc_comparable_properties_repository.py
index 3bfd92b9b..20c51dfda 100644
--- a/repositories/comparable_properties/epc_comparable_properties_repository.py
+++ b/repositories/comparable_properties/epc_comparable_properties_repository.py
@@ -9,8 +9,10 @@ UPRNs share a partition). Register metadata the cert itself doesn't carry
 
 from __future__ import annotations
 
+import logging
+from dataclasses import dataclass
 from datetime import date
-from typing import Optional, Protocol
+from typing import Callable, Optional, Protocol
 
 from datatypes.epc.domain.epc_property_data import EpcPropertyData
 from datatypes.epc.search.epc_search_result import EpcSearchResult
@@ -20,6 +22,11 @@ from repositories.comparable_properties.comparable_properties_repository import
     ComparablePropertiesRepository,
 )
 
+# The same default floor `select_comparables` uses: keep walking nearby postcodes
+# until this many candidates match, so the broadened cohort is big enough for the
+# downstream relax ladder rather than stopping at the first stray match.
+_DEFAULT_MINIMUM_COHORT = 5
+
 
 class CohortEpcClient(Protocol):
     """The slice of the EPC-API client the cohort fetch needs (e.g.
@@ -38,12 +45,44 @@ class CohortGeospatial(Protocol):
     ) -> dict[int, Coordinates]: ...
 
 
+class NearbyPostcodes(Protocol):
+    """Resolves the real unit postcodes physically near a seed postcode (e.g.
+    `PostcodesIoClient`). The gov EPC API cannot search by radius, so this is how
+    the cohort reaches beyond the target's own postcode (ADR-0034)."""
+
+    def nearby(
+        self, postcode: str, coordinates: Optional[Coordinates] = None
+    ) -> list[str]: ...
+
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True)
+class SkippedCohortCert:
+    """A postcode-cohort cert the mapper could not consume, so it was excluded
+    from the cohort rather than sinking the whole prediction. The certificate
+    number + error are captured so the gap surfaces (subtask outputs + logs) and
+    can be closed by extending the mapper later (ADR-0031)."""
+
+    certificate_number: str
+    error: str
+
+
 class EpcComparablePropertiesRepository(ComparablePropertiesRepository):
     def __init__(
-        self, epc_client: CohortEpcClient, geospatial: CohortGeospatial
+        self,
+        epc_client: CohortEpcClient,
+        geospatial: CohortGeospatial,
+        nearby_postcodes: Optional[NearbyPostcodes] = None,
     ) -> None:
         self._epc_client = epc_client
         self._geospatial = geospatial
+        self._nearby_postcodes = nearby_postcodes
+        # Cohort certs skipped because they are not yet mappable. Accumulates
+        # across every postcode the instance serves; the caller reads it after
+        # the run to report the mapper gaps (see modelling_e2e handler).
+        self.skipped: list[SkippedCohortCert] = []
 
     def candidates_for(self, postcode: str) -> list[ComparableProperty]:
         results: list[EpcSearchResult] = self._epc_client.search_by_postcode(
@@ -53,14 +92,84 @@ class EpcComparablePropertiesRepository(ComparablePropertiesRepository):
         coordinates: dict[int, Coordinates] = self._geospatial.coordinates_for_uprns(
             uprns
         )
-        return [self._comparable(result, coordinates) for result in results]
+        cohort: list[ComparableProperty] = []
+        for result in results:
+            comparable = self._comparable_or_skip(result, coordinates)
+            if comparable is not None:
+                cohort.append(comparable)
+        return cohort
 
-    def _comparable(
-        self, result: EpcSearchResult, coordinates: dict[int, Coordinates]
-    ) -> ComparableProperty:
-        epc: EpcPropertyData = self._epc_client.get_by_certificate_number(
-            result.certificate_number
+    def candidates_near(
+        self,
+        postcode: str,
+        coordinates: Optional[Coordinates] = None,
+        *,
+        enough: Optional[Callable[[ComparableProperty], bool]] = None,
+        minimum: int = _DEFAULT_MINIMUM_COHORT,
+    ) -> list[ComparableProperty]:
+        """The broadened cohort: candidates drawn from the real unit postcodes
+        nearest ``postcode`` (ADR-0034), for when the target's own postcode holds
+        no same-type comparables. Postcodes are visited nearest first and each
+        candidate is deduped by certificate number across them.
+
+        ``enough`` lets the caller stop the walk early — once ``minimum``
+        candidates satisfy it (e.g. they match the target's property type) the
+        remaining, further-away postcodes are not fetched, so a dense area
+        resolves in one or two searches instead of the whole radius. Without a
+        configured ``NearbyPostcodes`` source this degrades to the seed postcode
+        alone."""
+        postcodes = (
+            self._nearby_postcodes.nearby(postcode, coordinates)
+            if self._nearby_postcodes is not None
+            else [postcode]
         )
+        candidates: list[ComparableProperty] = []
+        seen_certs: set[str] = set()
+        matches = 0
+        for nearby_postcode in postcodes:
+            for candidate in self.candidates_for(nearby_postcode):
+                if candidate.certificate_number in seen_certs:
+                    continue
+                seen_certs.add(candidate.certificate_number)
+                candidates.append(candidate)
+                if enough is not None and enough(candidate):
+                    matches += 1
+            if enough is not None and matches >= minimum:
+                break
+        return candidates
+
+    # Mapper-shape errors: the cert's lodged data does not fit the schema/mapper.
+    # `ValueError` — missing required field / unmapped code (`UnmappedApiCode`);
+    # `AttributeError` — a field lodged in the wrong shape (e.g. `photovoltaic_supply`
+    # as a list where a `PhotovoltaicSupply` object is expected → "'list' object has
+    # no attribute 'none_or_no_details'"); `KeyError`/`TypeError` — analogous
+    # structural mismatches. Transient API failures (`EpcApiError` &c.) subclass
+    # `Exception` directly, NOT these, so they still propagate and fail the run loud.
+    _UNMAPPABLE_CERT_ERRORS = (ValueError, AttributeError, KeyError, TypeError)
+
+    def _comparable_or_skip(
+        self, result: EpcSearchResult, coordinates: dict[int, Coordinates]
+    ) -> Optional[ComparableProperty]:
+        """Map one cohort cert, or record + skip it when the mapper raises a
+        mapper-shape error (see ``_UNMAPPABLE_CERT_ERRORS``). One unmappable cert
+        must NOT abort the whole cohort; transient API errors still propagate."""
+        try:
+            epc: EpcPropertyData = self._epc_client.get_by_certificate_number(
+                result.certificate_number
+            )
+        except self._UNMAPPABLE_CERT_ERRORS as exc:
+            self.skipped.append(
+                SkippedCohortCert(
+                    certificate_number=result.certificate_number,
+                    error=f"{type(exc).__name__}: {exc}",
+                )
+            )
+            logger.warning(
+                "skipping unmappable cohort cert %s: %s",
+                result.certificate_number,
+                exc,
+            )
+            return None
         resolved: Optional[Coordinates] = (
             coordinates.get(result.uprn) if result.uprn is not None else None
         )
diff --git a/repositories/epc/epc_postgres_repository.py b/repositories/epc/epc_postgres_repository.py
index faa863238..1c92e1bff 100644
--- a/repositories/epc/epc_postgres_repository.py
+++ b/repositories/epc/epc_postgres_repository.py
@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 from collections.abc import Sequence
+from dataclasses import dataclass, field
 from datetime import date, datetime
-from typing import Optional, Protocol, TypeVar
+from typing import Any, Optional, Protocol, TypeVar
 
-from sqlmodel import Session, col, delete, select
+from sqlalchemy import insert as _sa_insert
+from sqlmodel import Session, SQLModel, col, delete, select
 
 from datatypes.epc.domain.epc import Epc
 from datatypes.epc.domain.epc_property_data import (
@@ -14,6 +16,7 @@ from datatypes.epc.domain.epc_property_data import (
     EpcPropertyData,
     InstantaneousWwhrs,
     MainHeatingDetail,
+    PhotovoltaicArray,
     PhotovoltaicSupply,
     PhotovoltaicSupplyNoneOrNoDetails,
     PvBatteries,
@@ -21,6 +24,7 @@ from datatypes.epc.domain.epc_property_data import (
     RenewableHeatIncentive,
     SapAlternativeWall,
     SapBuildingPart,
+    SapConservatory,
     SapEnergySource,
     SapFlatDetails,
     SapFloorDimension,
@@ -40,6 +44,7 @@ from infrastructure.postgres.epc_property_table import (
     EpcFlatDetailsModel,
     EpcFloorDimensionModel,
     EpcMainHeatingDetailModel,
+    EpcPhotovoltaicArrayModel,
     EpcPropertyEnergyPerformanceModel,
     EpcPropertyModel,
     EpcRenewableHeatIncentiveModel,
@@ -51,6 +56,23 @@ from utilities.private import private
 _T = TypeVar("_T")
 
 
+@dataclass(frozen=True)
+class EpcSaveRequest:
+    data: EpcPropertyData
+    property_id: Optional[int] = None
+    portfolio_id: Optional[int] = None
+    source: EpcSource = field(default="lodged")
+
+
+def _col_values(model: SQLModel, exclude: frozenset[str] = frozenset()) -> dict[str, Any]:
+    """Extract column-keyed values from a SQLModel instance for Core INSERT."""
+    return {
+        c.name: getattr(model, c.name)  # type: ignore[union-attr]
+        for c in model.__table__.c  # type: ignore[attr-defined]
+        if c.name not in exclude  # type: ignore[union-attr]
+    }
+
+
 def _require(value: Optional[_T], field: str) -> _T:
     if value is None:
         raise ValueError(f"epc_property row is missing required field {field!r}")
@@ -108,71 +130,195 @@ class EpcPostgresRepository(EpcRepository):
         portfolio_id: Optional[int] = None,
         source: EpcSource = "lodged",
     ) -> int:
-        # Idempotent on (property_id, source): a re-run replaces the property's
-        # EPC graph for THAT source rather than duplicating it (ADR-0012), and a
-        # predicted save leaves the lodged one intact, and vice versa (ADR-0031).
-        # Anonymous saves (no property_id) always insert.
-        if property_id is not None:
-            self._delete_for_property(property_id, source)
-        parent = EpcPropertyModel.from_epc_property_data(
-            data, property_id=property_id, portfolio_id=portfolio_id, source=source
-        )
-        self._session.add(parent)
-        self._session.flush()
-        epc_property_id = _require(parent.id, "id")
+        return self.save_batch([EpcSaveRequest(data, property_id, portfolio_id, source)])[0]
 
-        self._session.add(
-            EpcPropertyEnergyPerformanceModel.from_epc_property_data(
-                data, epc_property_id=epc_property_id
-            )
-        )
-        for detail in data.sap_heating.main_heating_details:
-            self._session.add(
-                EpcMainHeatingDetailModel.from_domain(detail, epc_property_id)
-            )
-        for part in data.sap_building_parts:
-            bp = EpcBuildingPartModel.from_domain(part, epc_property_id)
-            self._session.add(bp)
-            self._session.flush()
-            bp_id = _require(bp.id, "epc_building_part.id")
-            for dim in part.sap_floor_dimensions:
-                self._session.add(EpcFloorDimensionModel.from_domain(dim, bp_id))
-        for window in data.sap_windows:
-            self._session.add(EpcWindowModel.from_domain(window, epc_property_id))
+    def save_batch(self, requests: list[EpcSaveRequest]) -> list[int]:
+        """Insert all EPCs in `requests` in one pass per table, returning one
+        epc_property_id per request in the same order as the input.
 
-        for element_type, elements in (
-            ("roof", data.roofs),
-            ("wall", data.walls),
-            ("floor", data.floors),
-            ("main_heating", data.main_heating),
+        Deletes are batched first (one IN-query per child table per source),
+        then all parent rows are inserted with a single RETURNING statement so
+        positional ordering maps each returned id to its request.  Building-part
+        ids are captured the same way so floor-dimension FKs are resolved without
+        any per-property flush round-trips (ADR-0012).
+        """
+        if not requests:
+            return []
+
+        # Batch-delete existing rows grouped by source so the lodged and predicted
+        # slots remain independent (ADR-0031).
+        pids_by_source: dict[EpcSource, list[int]] = {}
+        for r in requests:
+            if r.property_id is not None:
+                pids_by_source.setdefault(r.source, []).append(r.property_id)
+        for src, pids in pids_by_source.items():
+            self._delete_for_properties(pids, src)
+
+        # Insert all parent (epc_property) rows; capture returned ids positionally.
+        parent_rows = [
+            _col_values(
+                EpcPropertyModel.from_epc_property_data(
+                    r.data, property_id=r.property_id, portfolio_id=r.portfolio_id, source=r.source
+                ),
+                exclude=frozenset({"id"}),
+            )
+            for r in requests
+        ]
+        returned_parents = self._session.execute(  # type: ignore[deprecated]
+            _sa_insert(EpcPropertyModel).returning(EpcPropertyModel.__table__.c["id"]),  # type: ignore[attr-defined]
+            parent_rows,
+        ).all()
+        epc_property_ids = [row[0] for row in returned_parents]
+
+        # Collect child rows, accumulating building parts in an ordered list so
+        # the positional RETURNING trick can map part objects to their new ids.
+        perf_rows: list[dict[str, Any]] = []
+        heating_rows: list[dict[str, Any]] = []
+        parts_ordered: list[tuple[Any, int]] = []  # (SapBuildingPart, epc_property_id)
+        window_rows: list[dict[str, Any]] = []
+        pv_rows: list[dict[str, Any]] = []
+        element_rows: list[dict[str, Any]] = []
+        flat_rows: list[dict[str, Any]] = []
+        rhi_rows: list[dict[str, Any]] = []
+
+        for r, epc_pid in zip(requests, epc_property_ids):
+            d = r.data
+            perf_rows.append(
+                _col_values(
+                    EpcPropertyEnergyPerformanceModel.from_epc_property_data(d, epc_pid),
+                    exclude=frozenset({"id"}),
+                )
+            )
+            for detail in d.sap_heating.main_heating_details:
+                heating_rows.append(
+                    _col_values(EpcMainHeatingDetailModel.from_domain(detail, epc_pid), frozenset({"id"}))
+                )
+            for part in d.sap_building_parts:
+                parts_ordered.append((part, epc_pid))
+            for window in d.sap_windows:
+                window_rows.append(
+                    _col_values(EpcWindowModel.from_domain(window, epc_pid), frozenset({"id"}))
+                )
+            for idx, array in enumerate(d.sap_energy_source.photovoltaic_arrays or []):
+                pv_rows.append(
+                    _col_values(EpcPhotovoltaicArrayModel.from_domain(array, idx, epc_pid), frozenset({"id"}))
+                )
+            for etype, els in (
+                ("roof", d.roofs),
+                ("wall", d.walls),
+                ("floor", d.floors),
+                ("main_heating", d.main_heating),
+            ):
+                for el in els:
+                    element_rows.append(
+                        _col_values(EpcEnergyElementModel.from_domain(el, etype, epc_pid), frozenset({"id"}))
+                    )
+            for el, etype in (
+                (d.window, "window"),
+                (d.lighting, "lighting"),
+                (d.hot_water, "hot_water"),
+                (d.secondary_heating, "secondary_heating"),
+                (d.main_heating_controls, "main_heating_controls"),
+            ):
+                if el is not None:
+                    element_rows.append(
+                        _col_values(EpcEnergyElementModel.from_domain(el, etype, epc_pid), frozenset({"id"}))
+                    )
+            if d.sap_flat_details is not None:
+                flat_rows.append(
+                    _col_values(EpcFlatDetailsModel.from_domain(d.sap_flat_details, epc_pid), frozenset({"id"}))
+                )
+            if d.renewable_heat_incentive is not None:
+                rhi_rows.append(
+                    _col_values(EpcRenewableHeatIncentiveModel.from_domain(d.renewable_heat_incentive, epc_pid), frozenset({"id"}))
+                )
+
+        # Bulk-insert all simple child tables (no downstream FK dependency).
+        if perf_rows:
+            self._session.execute(_sa_insert(EpcPropertyEnergyPerformanceModel), perf_rows)  # type: ignore[deprecated]
+        if heating_rows:
+            self._session.execute(_sa_insert(EpcMainHeatingDetailModel), heating_rows)  # type: ignore[deprecated]
+        if window_rows:
+            self._session.execute(_sa_insert(EpcWindowModel), window_rows)  # type: ignore[deprecated]
+        if pv_rows:
+            self._session.execute(_sa_insert(EpcPhotovoltaicArrayModel), pv_rows)  # type: ignore[deprecated]
+        if element_rows:
+            self._session.execute(_sa_insert(EpcEnergyElementModel), element_rows)  # type: ignore[deprecated]
+        if flat_rows:
+            self._session.execute(_sa_insert(EpcFlatDetailsModel), flat_rows)  # type: ignore[deprecated]
+        if rhi_rows:
+            self._session.execute(_sa_insert(EpcRenewableHeatIncentiveModel), rhi_rows)  # type: ignore[deprecated]
+
+        # Building parts: insert with RETURNING and zip positionally to resolve
+        # floor-dimension FKs.  Do NOT key by id(part) — the same EpcPropertyData
+        # object can appear in multiple requests (same epc, different property_ids),
+        # giving identical object ids that collapse the dict and mis-wire FKs.
+        # Positional zip is safe because PostgreSQL preserves VALUES order in RETURNING.
+        if parts_ordered:
+            bp_rows = [
+                _col_values(EpcBuildingPartModel.from_domain(part, epc_pid), frozenset({"id"}))
+                for part, epc_pid in parts_ordered
+            ]
+            returned_bps = self._session.execute(  # type: ignore[deprecated]
+                _sa_insert(EpcBuildingPartModel).returning(EpcBuildingPartModel.__table__.c["id"]),  # type: ignore[attr-defined]
+                bp_rows,
+            ).all()
+            floor_rows: list[dict[str, Any]] = [
+                _col_values(EpcFloorDimensionModel.from_domain(dim, bp_row[0]), frozenset({"id"}))
+                for (part, _), bp_row in zip(parts_ordered, returned_bps)
+                for dim in part.sap_floor_dimensions
+            ]
+            if floor_rows:
+                self._session.execute(_sa_insert(EpcFloorDimensionModel), floor_rows)  # type: ignore[deprecated]
+
+        return epc_property_ids
+
+    def _delete_for_properties(self, property_ids: list[int], source: EpcSource) -> None:
+        """Batch-delete every EPC graph for the given property_ids and source in
+        one pass per child table (IN queries), replacing the per-property flush
+        loop that drove RDS CPU to saturation during bulk modelling runs."""
+        epc_ids = [
+            i
+            for i in self._session.exec(
+                select(EpcPropertyModel.id)
+                .where(col(EpcPropertyModel.property_id).in_(property_ids))
+                .where(EpcPropertyModel.source == source)
+            ).all()
+            if i is not None
+        ]
+        if not epc_ids:
+            return
+        part_ids = [
+            i
+            for i in self._session.exec(
+                select(EpcBuildingPartModel.id).where(
+                    col(EpcBuildingPartModel.epc_property_id).in_(epc_ids)
+                )
+            ).all()
+            if i is not None
+        ]
+        if part_ids:
+            self._session.exec(  # type: ignore[call-overload]
+                delete(EpcFloorDimensionModel).where(
+                    col(EpcFloorDimensionModel.epc_building_part_id).in_(part_ids)
+                )
+            )
+        for child in (
+            EpcPropertyEnergyPerformanceModel,
+            EpcEnergyElementModel,
+            EpcMainHeatingDetailModel,
+            EpcBuildingPartModel,
+            EpcWindowModel,
+            EpcPhotovoltaicArrayModel,
+            EpcFlatDetailsModel,
+            EpcRenewableHeatIncentiveModel,
         ):
-            for el in elements:
-                self._session.add(
-                    EpcEnergyElementModel.from_domain(el, element_type, epc_property_id)
-                )
-        for el, element_type in (
-            (data.window, "window"),
-            (data.lighting, "lighting"),
-            (data.hot_water, "hot_water"),
-            (data.secondary_heating, "secondary_heating"),
-            (data.main_heating_controls, "main_heating_controls"),
-        ):
-            if el is not None:
-                self._session.add(
-                    EpcEnergyElementModel.from_domain(el, element_type, epc_property_id)
-                )
-
-        if data.sap_flat_details is not None:
-            self._session.add(
-                EpcFlatDetailsModel.from_domain(data.sap_flat_details, epc_property_id)
+            self._session.exec(  # type: ignore[call-overload]
+                delete(child).where(col(child.epc_property_id).in_(epc_ids))
             )
-        if data.renewable_heat_incentive is not None:
-            self._session.add(
-                EpcRenewableHeatIncentiveModel.from_domain(
-                    data.renewable_heat_incentive, epc_property_id
-                )
-            )
-        return epc_property_id
+        self._session.exec(  # type: ignore[call-overload]
+            delete(EpcPropertyModel).where(col(EpcPropertyModel.id).in_(epc_ids))
+        )
 
     def _delete_for_property(self, property_id: int, source: EpcSource) -> None:
         """Remove the property's existing EPC graph for `source` (parent + child
@@ -210,6 +356,7 @@ class EpcPostgresRepository(EpcRepository):
             EpcMainHeatingDetailModel,
             EpcBuildingPartModel,
             EpcWindowModel,
+            EpcPhotovoltaicArrayModel,
             EpcFlatDetailsModel,
             EpcRenewableHeatIncentiveModel,
         ):
@@ -326,6 +473,13 @@ class EpcPostgresRepository(EpcRepository):
                 .order_by(EpcWindowModel.id)  # type: ignore[arg-type]
             ).all()
         )
+        pv_arrays_by = _group_by_epc(
+            self._session.exec(
+                select(EpcPhotovoltaicArrayModel)
+                .where(col(EpcPhotovoltaicArrayModel.epc_property_id).in_(epc_ids))
+                .order_by(EpcPhotovoltaicArrayModel.array_index)  # type: ignore[arg-type]
+            ).all()
+        )
         part_ids = [
             bp.id
             for parts in parts_by.values()
@@ -345,6 +499,7 @@ class EpcPostgresRepository(EpcRepository):
                 part_rows=parts_by.get(epc_id, []),
                 floor_dims_by_part=floor_dims_by_part,
                 window_rows=windows_by.get(epc_id, []),
+                pv_array_rows=pv_arrays_by.get(epc_id, []),
                 flat_row=flat_by.get(epc_id),
                 rhi_row=rhi_by.get(epc_id),
             )
@@ -406,6 +561,7 @@ class EpcPostgresRepository(EpcRepository):
             )
         ).first()
         window_rows = self._windows(epc_property_id)
+        pv_array_rows = self._pv_arrays(epc_property_id)
         floor_dims_by_part = self._floor_dims_by_part(
             [bp.id for bp in part_rows if bp.id is not None]
         )
@@ -417,6 +573,7 @@ class EpcPostgresRepository(EpcRepository):
             part_rows=part_rows,
             floor_dims_by_part=floor_dims_by_part,
             window_rows=window_rows,
+            pv_array_rows=pv_array_rows,
             flat_row=flat_row,
             rhi_row=rhi_row,
         )
@@ -431,6 +588,7 @@ class EpcPostgresRepository(EpcRepository):
         part_rows: list[EpcBuildingPartModel],
         floor_dims_by_part: dict[int, list[EpcFloorDimensionModel]],
         window_rows: list[EpcWindowModel],
+        pv_array_rows: list[EpcPhotovoltaicArrayModel],
         flat_row: Optional[EpcFlatDetailsModel],
         rhi_row: Optional[EpcRenewableHeatIncentiveModel],
     ) -> EpcPropertyData:
@@ -456,7 +614,7 @@ class EpcPostgresRepository(EpcRepository):
             door_count=p.door_count,
             sap_heating=self._to_sap_heating(p, heating_rows),
             sap_windows=[self._to_window(w) for w in window_rows],
-            sap_energy_source=self._to_energy_source(p),
+            sap_energy_source=self._to_energy_source(p, pv_array_rows),
             sap_building_parts=[
                 self._to_building_part(
                     bp, floor_dims_by_part.get(bp.id, []) if bp.id is not None else []
@@ -507,6 +665,7 @@ class EpcPostgresRepository(EpcRepository):
             conservatory_type=p.conservatory_type,
             has_conservatory=p.has_conservatory,
             has_heated_separate_conservatory=p.has_heated_separate_conservatory,
+            sap_conservatory=self._to_conservatory(p),
             blocked_chimneys_count=p.blocked_chimneys_count,
             energy_rating_average=p.energy_rating_average,
             current_energy_efficiency_band=(
@@ -562,6 +721,12 @@ class EpcPostgresRepository(EpcRepository):
                 else None
             ),
             multiple_glazed_proportion=p.multiple_glazed_proportion,
+            # Top-level mirror of sap_ventilation.extract_fans_count (the mapper
+            # sets both from the same source). The deterministic calculator reads
+            # the sap_ventilation copy, not this one; reconstruct it from the same
+            # column anyway so EpcPropertyData round-trips complete, with no
+            # allow-list exception for a field that trivially mirrors a persisted one.
+            extract_fans_count=p.ventilation_extract_fans_count,
             calculation_software_version=p.calculation_software_version,
             mechanical_vent_duct_placement=p.mechanical_vent_duct_placement,
             mechanical_vent_duct_insulation=p.mechanical_vent_duct_insulation,
@@ -620,6 +785,18 @@ class EpcPostgresRepository(EpcRepository):
             ).all()
         )
 
+    @private
+    def _pv_arrays(
+        self, epc_property_id: int
+    ) -> list[EpcPhotovoltaicArrayModel]:
+        return list(
+            self._session.exec(
+                select(EpcPhotovoltaicArrayModel)
+                .where(EpcPhotovoltaicArrayModel.epc_property_id == epc_property_id)
+                .order_by(EpcPhotovoltaicArrayModel.array_index)  # type: ignore[arg-type]
+            ).all()
+        )
+
     @private
     def _to_energy_element(self, e: EpcEnergyElementModel) -> EnergyElement:
         return EnergyElement(
@@ -659,6 +836,7 @@ class EpcPostgresRepository(EpcRepository):
             secondary_fuel_type=p.heating_secondary_fuel_type,
             secondary_heating_type=p.heating_secondary_heating_type,
             cylinder_insulation_thickness_mm=p.heating_cylinder_insulation_thickness_mm,
+            cylinder_volume_measured_l=p.heating_cylinder_volume_measured_l,
             number_baths=p.heating_number_baths,
             number_baths_wwhrs=p.heating_number_baths_wwhrs,
             electric_shower_count=p.heating_electric_shower_count,
@@ -686,6 +864,8 @@ class EpcPostgresRepository(EpcRepository):
             main_heating_data_source=m.main_heating_data_source,
             condensing=m.condensing,
             weather_compensator=m.weather_compensator,
+            community_heating_boiler_fuel_type=m.community_heating_boiler_fuel_type,
+            community_heating_chp_fraction=m.community_heating_chp_fraction,
         )
 
     @private
@@ -736,6 +916,7 @@ class EpcPostgresRepository(EpcRepository):
             wall_dry_lined=bp.wall_dry_lined,
             wall_thickness_mm=bp.wall_thickness_mm,
             wall_insulation_thickness=bp.wall_insulation_thickness,
+            wall_insulation_thermal_conductivity=bp.wall_insulation_thermal_conductivity,
             sap_alternative_wall_1=self._to_alt_wall(bp, 1),
             sap_alternative_wall_2=self._to_alt_wall(bp, 2),
             floor_heat_loss=bp.floor_heat_loss,
@@ -787,6 +968,7 @@ class EpcPostgresRepository(EpcRepository):
             if n == 1
             else bp.alt_wall_2_insulation_thickness
         )
+        sheltered = bp.alt_wall_1_is_sheltered if n == 1 else bp.alt_wall_2_is_sheltered
         return SapAlternativeWall(
             wall_area=area,
             wall_dry_lined=_require(dry_lined, f"alt_wall_{n}_dry_lined"),
@@ -798,6 +980,9 @@ class EpcPostgresRepository(EpcRepository):
                 thickness_measured, f"alt_wall_{n}_thickness_measured"
             ),
             wall_insulation_thickness=insulation_thickness,
+            # Nullable column (added later than the alt wall itself); a row from
+            # before the column existed reads None → the domain default False.
+            is_sheltered=sheltered if sheltered is not None else False,
         )
 
     @private
@@ -810,11 +995,29 @@ class EpcPostgresRepository(EpcRepository):
             floor=f.floor,
             floor_insulation=f.floor_insulation,
             floor_construction=f.floor_construction,
+            is_exposed_floor=f.is_exposed_floor,
+            is_above_partially_heated_space=f.is_above_partially_heated_space,
         )
 
     @private
-    def _to_energy_source(self, p: EpcPropertyModel) -> SapEnergySource:
+    def _to_energy_source(
+        self, p: EpcPropertyModel, pv_array_rows: list[EpcPhotovoltaicArrayModel]
+    ) -> SapEnergySource:
         return SapEnergySource(
+            photovoltaic_arrays=(
+                [
+                    PhotovoltaicArray(
+                        peak_power=a.peak_power,
+                        pitch=a.pitch,
+                        overshading=a.overshading,
+                        orientation=a.orientation,
+                    )
+                    for a in sorted(pv_array_rows, key=lambda a: a.array_index)
+                ]
+                if pv_array_rows
+                else None
+            ),
+            pv_diverter_present=p.energy_pv_diverter_present,
             mains_gas=p.energy_mains_gas,
             meter_type=p.energy_meter_type,
             pv_battery_count=p.energy_pv_battery_count,
@@ -853,6 +1056,32 @@ class EpcPostgresRepository(EpcRepository):
             ),
         )
 
+    @private
+    def _to_conservatory(self, p: EpcPropertyModel) -> Optional[SapConservatory]:
+        # RdSAP 10 §6.1 — rebuild the non-separated conservatory the mapper
+        # split out of the fabric parts. Presence is signalled by the floor
+        # area (the §6.1 fold always sets all five geometry columns together);
+        # all None when there is no non-separated conservatory (ADR-0036).
+        if p.conservatory_floor_area_m2 is None:
+            return None
+        return SapConservatory(
+            floor_area_m2=p.conservatory_floor_area_m2,
+            glazed_perimeter_m=_require(
+                p.conservatory_glazed_perimeter_m, "conservatory_glazed_perimeter_m"
+            ),
+            double_glazed=_require(
+                p.conservatory_double_glazed, "conservatory_double_glazed"
+            ),
+            thermally_separated=_require(
+                p.conservatory_thermally_separated,
+                "conservatory_thermally_separated",
+            ),
+            room_height_storeys=_require(
+                p.conservatory_room_height_storeys,
+                "conservatory_room_height_storeys",
+            ),
+        )
+
     @private
     def _to_ventilation(self, p: EpcPropertyModel) -> Optional[SapVentilation]:
         if not p.ventilation_present:
@@ -874,6 +1103,7 @@ class EpcPostgresRepository(EpcRepository):
             suspended_timber_floor_sealed=p.ventilation_suspended_timber_floor_sealed,
             has_draught_lobby=p.ventilation_has_draught_lobby,
             air_permeability_ap4_m3_h_m2=p.ventilation_air_permeability_ap4_m3_h_m2,
+            air_permeability_ap50_m3_h_m2=p.ventilation_air_permeability_ap50_m3_h_m2,
             mechanical_ventilation_kind=p.ventilation_mechanical_ventilation_kind,
         )
 
diff --git a/repositories/epc/epc_repository.py b/repositories/epc/epc_repository.py
index e0af06c07..a9fb6316f 100644
--- a/repositories/epc/epc_repository.py
+++ b/repositories/epc/epc_repository.py
@@ -1,10 +1,13 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional
 
 from datatypes.epc.domain.epc_property_data import EpcPropertyData
 
+if TYPE_CHECKING:
+    from repositories.epc.epc_postgres_repository import EpcSaveRequest
+
 # Provenance of a persisted EPC picture (ADR-0031): a real "lodged" EPC, or a
 # "predicted" one synthesised by EPC Prediction. A property can hold one of each.
 EpcSource = Literal["lodged", "predicted"]
@@ -29,6 +32,9 @@ class EpcRepository(ABC):
         source: EpcSource = "lodged",
     ) -> int: ...
 
+    @abstractmethod
+    def save_batch(self, requests: "list[EpcSaveRequest]") -> list[int]: ...
+
     @abstractmethod
     def get(self, epc_property_id: int) -> EpcPropertyData: ...
 
diff --git a/repositories/fuel_rates/data/fuel_rates_2026_q2.json b/repositories/fuel_rates/data/fuel_rates_2026_q2.json
index c92af0dcd..397efa3c6 100644
--- a/repositories/fuel_rates/data/fuel_rates_2026_q2.json
+++ b/repositories/fuel_rates/data/fuel_rates_2026_q2.json
@@ -16,11 +16,13 @@
     "SMOKELESS": { "unit_rate_p_per_kwh": 8.69, "standing_charge_p_per_day": 0.0 },
     "WOOD_LOGS": { "unit_rate_p_per_kwh": 8.25, "standing_charge_p_per_day": 0.0 },
     "WOOD_PELLETS": { "unit_rate_p_per_kwh": 7.38, "standing_charge_p_per_day": 0.0, "_note": "bagged pellets (NEP Apr 2026 / DUKES GCV); blown bulk is lower" },
+    "DUAL_FUEL_MINERAL_AND_WOOD": { "unit_rate_p_per_kwh": 7.69, "standing_charge_p_per_day": 0.0, "derived": true, "_note": "DERIVED, not a market rate. SAP 10.2 dual-fuel appliance (mineral + wood) has no single retail price. Midpoint of the COAL proxy (7.13) and WOOD_LOGS (8.25) = 7.69, mirroring SAP Table-32 dual fuel (3.99) ~= midpoint of house coal (3.67) and wood logs (4.23)." },
     "COAL": { "unit_rate_p_per_kwh": 7.13, "standing_charge_p_per_day": 0.0, "proxy": true, "_note": "PROXY, not a market rate. No current GB retail house-coal price (NEP Apr 2026 blank; domestic house-coal sale restricted since 2021). NEP Nov 2025 coal 48.50p/kg uprated by smokeless movement -> 52.39p/kg / DUKES house-coal GCV 7.3502 kWh/kg = 7.13 p/kWh." },
     "HEAT_NETWORK": { "unit_rate_p_per_kwh": 16.0, "standing_charge_p_per_day": 69.4, "indicative": true, "_note": "INDICATIVE, not a regulated rate. Delivered-heat charge; no national tariff/cap. Insite Energy Nov 2024 operator sample avg 16.03 p/kWh + 69.42 p/day; schemes vary widely (~8-30 p/kWh per CMA/Heat Trust)." }
   },
   "_gaps": {
     "COAL": "PROXY rate (see _note): no current national retail price; sense-check estimate so coal-heated certs model rather than erroring.",
+    "DUAL_FUEL_MINERAL_AND_WOOD": "DERIVED rate (see _note): mineral+wood blend has no retail price; midpoint of the COAL proxy and WOOD_LOGS so dual-fuel certs model rather than erroring.",
     "HEAT_NETWORK": "INDICATIVE rate (see _note): scheme-specific, no national tariff/cap; treat the bill as indicative.",
     "ELECTRICITY_OFF_PEAK": "day/night split; priced once the off-peak slice adds the day/night accessor"
   },
@@ -32,6 +34,7 @@
     "WOOD_LOGS": "NEP Apr 2026 kiln-dried 37.26 p/kg / DUKES wood 4.5156 kWh/kg = 8.25 p/kWh",
     "WOOD_PELLETS": "NEP Apr 2026 bagged 38.33 p/kg / DUKES pellet 5.1928 kWh/kg = 7.38 p/kWh",
     "COAL": "NEP Nov 2025 48.50 p/kg uprated x(71.42/66.12) = 52.39 p/kg / DUKES house-coal 7.3502 kWh/kg = 7.13 p/kWh",
+    "DUAL_FUEL_MINERAL_AND_WOOD": "(COAL 7.13 + WOOD_LOGS 8.25) / 2 = 7.69 p/kWh; mirrors SAP Table-32 dual fuel = midpoint of house coal + wood logs",
     "HEAT_NETWORK": "Insite Energy Nov 2024 operator sample avg 16.03 p/kWh + 69.42 p/day (delivered heat)"
   }
 }
diff --git a/repositories/fuel_rates/fuel_rates_static_file_repository.py b/repositories/fuel_rates/fuel_rates_static_file_repository.py
index 1f53617d4..e8057b39b 100644
--- a/repositories/fuel_rates/fuel_rates_static_file_repository.py
+++ b/repositories/fuel_rates/fuel_rates_static_file_repository.py
@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import Any, Optional
 
 from domain.fuel_rates.fuel import Fuel
-from domain.fuel_rates.fuel_rates import FuelRate, FuelRates
+from domain.fuel_rates.fuel_rates import FuelRate, FuelRates, OffPeakRate
 from repositories.fuel_rates.fuel_rates_repository import FuelRatesRepository
 
 _DEFAULT_SNAPSHOT = Path(__file__).parent / "data" / "fuel_rates_2026_q2.json"
@@ -14,10 +14,12 @@ _DEFAULT_SNAPSHOT = Path(__file__).parent / "data" / "fuel_rates_2026_q2.json"
 class FuelRatesStaticFileRepository(FuelRatesRepository):
     """Reads Fuel Rates from a committed JSON snapshot (ADR-0014).
 
-    Only **single-rate** fuels (those lodging a ``unit_rate_p_per_kwh``) are
-    exposed. Off-peak (day/night) and the unpriced gaps (null entries — house
-    coal, heat network) are skipped, so pricing them raises ``UnpricedFuel``.
-    The day/night accessor for off-peak lands in a later slice.
+    **Single-rate** fuels (those lodging a ``unit_rate_p_per_kwh``) populate the
+    ``rates`` map. The **off-peak** entry — a dual-rate meter lodging
+    ``day_p_per_kwh`` / ``night_p_per_kwh`` — loads as an ``OffPeakRate`` (each
+    end use blends day/night by its own High-Rate Fraction). The unpriced gaps
+    (null entries — house coal, heat network) are skipped, so pricing them
+    raises ``UnpricedFuel``.
     """
 
     def __init__(self, snapshot_path: Optional[Path] = None) -> None:
@@ -27,11 +29,19 @@ class FuelRatesStaticFileRepository(FuelRatesRepository):
         payload: dict[str, Any] = json.loads(self._snapshot_path.read_text())
         fuels: dict[str, Any] = payload["fuels"]
         rates: dict[Fuel, FuelRate] = {}
+        off_peak: Optional[OffPeakRate] = None
         for name, entry in fuels.items():
             if entry is None:
                 continue  # an unpriced gap (house coal / heat network)
+            if name == Fuel.ELECTRICITY_OFF_PEAK.name:
+                off_peak = OffPeakRate(
+                    day_p_per_kwh=float(entry["day_p_per_kwh"]),
+                    night_p_per_kwh=float(entry["night_p_per_kwh"]),
+                    standing_charge_p_per_day=float(entry["standing_charge_p_per_day"]),
+                )
+                continue
             if "unit_rate_p_per_kwh" not in entry:
-                continue  # off-peak day/night — priced in a later slice
+                continue  # an unpriced gap with no single rate
             rates[Fuel[name]] = FuelRate(
                 unit_rate_p_per_kwh=float(entry["unit_rate_p_per_kwh"]),
                 standing_charge_p_per_day=float(entry["standing_charge_p_per_day"]),
@@ -40,4 +50,5 @@ class FuelRatesStaticFileRepository(FuelRatesRepository):
             period=str(payload["period"]),
             seg_export_p_per_kwh=float(payload["seg_export_p_per_kwh"]),
             rates=rates,
+            off_peak=off_peak,
         )
diff --git a/repositories/plan/plan_postgres_repository.py b/repositories/plan/plan_postgres_repository.py
index 376cf8b82..e81e90844 100644
--- a/repositories/plan/plan_postgres_repository.py
+++ b/repositories/plan/plan_postgres_repository.py
@@ -1,16 +1,33 @@
 from __future__ import annotations
 
-from sqlmodel import Session, col, delete
+from typing import Any
+
+from sqlalchemy import insert as _sa_insert
+from sqlmodel import Session, col, update
 
 from domain.modelling.plan import Plan
 from infrastructure.postgres.modelling import PlanModel, RecommendationModel
-from repositories.plan.plan_repository import PlanRepository
+from repositories.plan.plan_repository import PlanRepository, PlanSaveRequest
+
+
+def _col_values(model: Any, exclude: frozenset[str] = frozenset()) -> dict[str, Any]:
+    """Extract column-keyed values from a SQLModel instance for Core INSERT."""
+    return {
+        c.name: getattr(model, c.name)
+        for c in model.__table__.c
+        if c.name not in exclude
+    }
 
 
 class PlanPostgresRepository(PlanRepository):
     """Maps a Plan and its Plan Measures onto the live ``plan`` /
     ``recommendation`` tables (ADR-0017). Does not commit — the Unit of Work
-    owns the transaction (ADR-0012)."""
+    owns the transaction (ADR-0012).
+
+    A re-run INSERTs a fresh Plan rather than deleting the prior one (the cascade
+    delete was slow); when the new Plan is the default it demotes any prior
+    default Plan for the same (property_id, scenario_id) to ``is_default=False``,
+    so readers can select the current Plan via ``is_default=True``."""
 
     def __init__(self, session: Session) -> None:
         self._session = session
@@ -24,32 +41,70 @@ class PlanPostgresRepository(PlanRepository):
         portfolio_id: int,
         is_default: bool,
     ) -> int:
-        # Idempotent replace for (property_id, scenario_id): deleting the Plan
-        # cascades to its recommendation rows via the plan_id FK (ON DELETE
-        # CASCADE), so a re-run overwrites rather than duplicating (ADR-0012).
-        self._session.exec(  # type: ignore[call-overload]
-            delete(PlanModel).where(
-                col(PlanModel.property_id) == property_id,
-                col(PlanModel.scenario_id) == scenario_id,
-            )
-        )
+        return self.save_batch(
+            [PlanSaveRequest(plan, property_id=property_id, scenario_id=scenario_id, portfolio_id=portfolio_id, is_default=is_default)]
+        )[0]
 
-        plan_row = PlanModel.from_domain(
-            plan,
-            property_id=property_id,
-            scenario_id=scenario_id,
-            portfolio_id=portfolio_id,
-            is_default=is_default,
-        )
-        self._session.add(plan_row)
-        self._session.flush()
-        if plan_row.id is None:
-            raise ValueError("plan row did not receive an id")
+    def save_batch(self, requests: list[PlanSaveRequest]) -> list[int]:
+        """Persist all Plans in three statements regardless of batch size.
 
-        for measure in plan.measures:
-            self._session.add(
-                RecommendationModel.from_domain(
-                    measure, property_id=property_id, plan_id=plan_row.id
+        1. One demote UPDATE (only when any request has ``is_default=True``).
+        2. One bulk plan INSERT with RETURNING to capture ids positionally.
+        3. One bulk recommendation INSERT (skipped when no measures exist).
+        """
+        if not requests:
+            return []
+
+        # Demote prior default Plans for every property in the batch that is
+        # receiving a new default Plan — one UPDATE for the whole batch.
+        default_pids = [r.property_id for r in requests if r.is_default]
+        if default_pids:
+            # scenario_id is uniform per batch (one scenario per SQS message).
+            scenario_id = requests[0].scenario_id
+            self._session.exec(  # type: ignore[call-overload]
+                update(PlanModel)
+                .where(
+                    col(PlanModel.property_id).in_(default_pids),
+                    col(PlanModel.scenario_id) == scenario_id,
                 )
+                .values(is_default=False)
             )
-        return plan_row.id
+
+        # Bulk INSERT all plan rows; capture returned ids positionally.
+        plan_rows = [
+            _col_values(
+                PlanModel.from_domain(
+                    r.plan,
+                    property_id=r.property_id,
+                    scenario_id=r.scenario_id,
+                    portfolio_id=r.portfolio_id,
+                    is_default=r.is_default,
+                ),
+                exclude=frozenset({"id"}),
+            )
+            for r in requests
+        ]
+        returned = self._session.execute(  # type: ignore[deprecated]
+            _sa_insert(PlanModel).returning(PlanModel.__table__.c["id"]),  # type: ignore[attr-defined]
+            plan_rows,
+        ).all()
+        plan_ids = [row[0] for row in returned]
+
+        # Accumulate recommendation rows across all requests; properties with
+        # zero measures contribute nothing (no special-casing needed).
+        rec_rows = [
+            _col_values(
+                RecommendationModel.from_domain(
+                    measure, property_id=r.property_id, plan_id=plan_id
+                ),
+                exclude=frozenset({"id"}),
+            )
+            for r, plan_id in zip(requests, plan_ids)
+            for measure in r.plan.measures
+        ]
+        if rec_rows:
+            self._session.execute(  # type: ignore[deprecated]
+                _sa_insert(RecommendationModel), rec_rows
+            )
+
+        return plan_ids
diff --git a/repositories/plan/plan_repository.py b/repositories/plan/plan_repository.py
index 02bafe255..6fdc16d63 100644
--- a/repositories/plan/plan_repository.py
+++ b/repositories/plan/plan_repository.py
@@ -1,17 +1,34 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+from dataclasses import dataclass
 
 from domain.modelling.plan import Plan
 
 
+@dataclass(frozen=True)
+class PlanSaveRequest:
+    """Bundles the five fields the plan repository needs to persist one Plan.
+
+    Mirrors ``EpcSaveRequest`` in shape — used by ``PlanRepository.save_batch()``
+    to accumulate write intent before the batch is flushed in one Unit of Work."""
+
+    plan: Plan
+    property_id: int
+    scenario_id: int
+    portfolio_id: int
+    is_default: bool
+
+
 class PlanRepository(ABC):
     """Persists a Plan (and its Plan Measures) for a Property + Scenario.
 
-    One Plan per (Property, Scenario). The write is idempotent on re-run: it
-    replaces the existing Plan for that pair rather than duplicating (ADR-0012
-    / ADR-0017). `portfolio_id` and `is_default` are supplied by the
-    orchestrator (the former from the trigger, the latter from the Scenario).
+    A re-run INSERTs a fresh Plan and keeps the prior one as history rather than
+    deleting it. When the new Plan is the default, prior default Plans for the
+    same (Property, Scenario) are demoted to `is_default=False`, so the current
+    Plan is the one with `is_default=True` (ADR-0012 / ADR-0017). `portfolio_id`
+    and `is_default` are supplied by the orchestrator (the former from the
+    trigger, the latter from the Scenario).
     """
 
     @abstractmethod
@@ -24,6 +41,16 @@ class PlanRepository(ABC):
         portfolio_id: int,
         is_default: bool,
     ) -> int:
-        """Persist ``plan`` and return its Plan id, replacing any existing Plan
-        for ``(property_id, scenario_id)``."""
+        """Persist ``plan`` and return its Plan id. Keeps prior Plans for
+        ``(property_id, scenario_id)`` as history; when ``is_default`` is True,
+        demotes those prior Plans to ``is_default=False``."""
+        ...
+
+    @abstractmethod
+    def save_batch(self, requests: list[PlanSaveRequest]) -> list[int]:
+        """Persist a batch of Plans in three statements regardless of batch size.
+
+        Returns one plan id per request in input order. Fires a single demote
+        UPDATE only when at least one request has ``is_default=True``. Keeps
+        prior Plans as history (ADR-0017)."""
         ...
diff --git a/repositories/postgres_unit_of_work.py b/repositories/postgres_unit_of_work.py
index fd4489bfb..257643971 100644
--- a/repositories/postgres_unit_of_work.py
+++ b/repositories/postgres_unit_of_work.py
@@ -11,8 +11,11 @@ from repositories.property_baseline.property_baseline_postgres_repository import
 )
 from repositories.epc.epc_postgres_repository import EpcPostgresRepository
 from repositories.plan.plan_postgres_repository import PlanPostgresRepository
-from repositories.product.product_postgres_repository import (
-    ProductPostgresRepository,
+from repositories.product.composite_product_repository import (
+    catalogue_with_off_catalogue_overrides,
+)
+from repositories.property.property_overrides_postgres_reader import (
+    OpenSessionPropertyOverridesReader,
 )
 from repositories.property.property_postgres_repository import (
     PropertyPostgresRepository,
@@ -41,15 +44,24 @@ class PostgresUnitOfWork(UnitOfWork):
         self._session = self._session_factory()
         epc_repo = EpcPostgresRepository(self._session)
         spatial_repo = SpatialPostgresRepository(self._session)
+        # Fold Landlord Overrides onto the Effective EPC on every re-hydration
+        # (ADR-0032), so what the Baseline orchestrator scores off ``uow.property``
+        # matches what the Plan was modelled from. ``property_overrides`` is
+        # committed reference data, but the reader must read on THIS uow's session
+        # — a second session opened concurrently checks out a second connection
+        # and deadlocks the single-connection pool while this uow's transaction is
+        # open. Reading committed data inside the uow's transaction is correct and
+        # keeps the invocation on one connection.
+        overrides_reader = OpenSessionPropertyOverridesReader(self._session)
         self.property = PropertyPostgresRepository(
-            self._session, epc_repo, spatial_repo
+            self._session, epc_repo, spatial_repo, overrides_reader
         )
         self.epc = epc_repo
         self.solar = SolarPostgresRepository(self._session)
         self.spatial = spatial_repo
         self.property_baseline = PropertyBaselinePostgresRepository(self._session)
         self.scenario = ScenarioPostgresRepository(self._session)
-        self.product = ProductPostgresRepository(self._session)
+        self.product = catalogue_with_off_catalogue_overrides(self._session)
         self.plan = PlanPostgresRepository(self._session)
         return self
 
diff --git a/repositories/product/composite_product_repository.py b/repositories/product/composite_product_repository.py
new file mode 100644
index 000000000..9d8ab81a3
--- /dev/null
+++ b/repositories/product/composite_product_repository.py
@@ -0,0 +1,66 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from sqlmodel import Session
+
+from domain.modelling.product import Product
+from repositories.product.product_json_repository import ProductJsonRepository
+from repositories.product.product_postgres_repository import (
+    MaterialSnapshotRepository,
+    ProductPostgresRepository,
+)
+from repositories.product.product_repository import ProductRepository
+
+# The committed off-catalogue cost overlay — Measure Types the live ``material``
+# catalogue cannot supply, priced from a static JSON until the ETL stocks them.
+OFF_CATALOGUE_COSTS_PATH: Path = Path(__file__).resolve().parent / "off_catalogue_costs.json"
+
+
+class CompositeProductRepository(ProductRepository):
+    """Resolves a Product from an ``override`` source first, then a ``fallback``.
+
+    The override holds off-catalogue costs the live ``material`` catalogue cannot
+    supply — today ``secondary_heating_removal``, whose Measure Type the FE-owned
+    ``material.type`` pgEnum does not carry. Querying that value against the DB
+    raises a ``DataError`` that poisons the session's transaction (it is not a
+    benign ``ProductNotFound``), so checking the override **first** keeps that
+    Measure Type away from the catalogue entirely. Every other Measure Type
+    misses the override and falls through to the catalogue unchanged.
+    """
+
+    def __init__(
+        self, override: ProductRepository, fallback: ProductRepository
+    ) -> None:
+        self._override = override
+        self._fallback = fallback
+
+    def get(self, measure_type: str) -> Product:
+        product = self._override.get_optional(measure_type)
+        if product is not None:
+            return product
+        return self._fallback.get(measure_type)
+
+
+def catalogue_with_off_catalogue_overrides(session: Session) -> ProductRepository:
+    """The live ``material`` catalogue with the committed off-catalogue JSON costs
+    layered on top — the single composition point both the pipeline's Unit of
+    Work and the local e2e runner price through."""
+    return CompositeProductRepository(
+        override=ProductJsonRepository(OFF_CATALOGUE_COSTS_PATH),
+        fallback=ProductPostgresRepository(session),
+    )
+
+
+def catalogue_snapshot_with_off_catalogue_overrides(
+    session: Session,
+) -> ProductRepository:
+    """Like ``catalogue_with_off_catalogue_overrides`` but the catalogue side is
+    an in-memory snapshot read once from ``session`` — so the Modelling stage can
+    price after the read Session is closed. Used by the modelling_e2e Lambda to
+    hold a single DB connection per invocation; the live-querying variant above
+    stays for the per-Property Unit of Work and the local e2e runner."""
+    return CompositeProductRepository(
+        override=ProductJsonRepository(OFF_CATALOGUE_COSTS_PATH),
+        fallback=MaterialSnapshotRepository.load(session),
+    )
diff --git a/repositories/product/off_catalogue_costs.json b/repositories/product/off_catalogue_costs.json
new file mode 100644
index 000000000..5419ccc91
--- /dev/null
+++ b/repositories/product/off_catalogue_costs.json
@@ -0,0 +1,8 @@
+{
+  "secondary_heating_removal": { "unit_cost_per_m2": 270.0 },
+  "double_glazing": { "unit_cost_per_m2": 550.0 },
+  "secondary_glazing": { "unit_cost_per_m2": 400.0 },
+  "gas_boiler_upgrade": { "unit_cost_per_m2": 3000.0 },
+  "system_tune_up": { "unit_cost_per_m2": 500.0 },
+  "system_tune_up_zoned": { "unit_cost_per_m2": 900.0 }
+}
diff --git a/repositories/product/product_postgres_repository.py b/repositories/product/product_postgres_repository.py
index 5f27a68e7..fb7b948dd 100644
--- a/repositories/product/product_postgres_repository.py
+++ b/repositories/product/product_postgres_repository.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from sqlmodel import Session, col, select
 
 from domain.modelling.contingencies import contingency_rate
@@ -58,3 +60,59 @@ class ProductPostgresRepository(ProductRepository):
             contingency_rate=contingency_rate(measure_type),
             id=row.id,
         )
+
+
+class MaterialSnapshotRepository(ProductRepository):
+    """An in-memory snapshot of the active ``material`` catalogue, read once from
+    a Session via ``load``.
+
+    It lets the Modelling stage price Measure Options *after* the read Session is
+    closed, so a Lambda invocation can hold a single DB connection at a time — the
+    read Session, then each per-Property write Unit of Work, never overlapping —
+    instead of keeping the read Session's connection checked out across the whole
+    write loop while the catalogue is queried lazily.
+
+    ``get`` mirrors ``ProductPostgresRepository.get`` exactly: the same
+    domain→``material.type`` drift mapping, the lowest-id active row per type, and
+    the same ``ProductNotFound`` / missing-``total_cost`` errors. Because the
+    snapshot is a plain dict lookup (no live query), the off-catalogue measures
+    that would poison a live session's transaction simply miss and raise the
+    benign ``ProductNotFound`` — the ``CompositeProductRepository`` override still
+    keeps them off the catalogue first.
+    """
+
+    def __init__(
+        self, rows_by_catalogue_type: dict[str, tuple[Optional[float], int]]
+    ) -> None:
+        self._rows_by_catalogue_type = rows_by_catalogue_type
+
+    @classmethod
+    def load(cls, session: Session) -> "MaterialSnapshotRepository":
+        rows = session.exec(
+            select(MaterialRow)
+            .where(col(MaterialRow.is_active).is_(True))
+            .order_by(col(MaterialRow.id))
+        ).all()
+        rows_by_catalogue_type: dict[str, tuple[Optional[float], int]] = {}
+        for row in rows:
+            # Lowest id wins per type — mirrors ``.first()`` after ``order_by(id)``.
+            if row.type not in rows_by_catalogue_type:
+                rows_by_catalogue_type[row.type] = (row.total_cost, row.id)
+        return cls(rows_by_catalogue_type)
+
+    def get(self, measure_type: str) -> Product:
+        catalogue_type = _MATERIAL_TYPE_BY_MEASURE.get(measure_type, measure_type)
+        entry = self._rows_by_catalogue_type.get(catalogue_type)
+        if entry is None:
+            raise ProductNotFound(
+                f"no active product for measure type {measure_type!r}"
+            )
+        total_cost, row_id = entry
+        if total_cost is None:
+            raise ValueError(f"product {measure_type!r} has no total_cost")
+        return Product(
+            measure_type=measure_type,
+            unit_cost_per_m2=total_cost,
+            contingency_rate=contingency_rate(measure_type),
+            id=row_id,
+        )
diff --git a/repositories/property/in_memory_property_overrides_reader.py b/repositories/property/in_memory_property_overrides_reader.py
new file mode 100644
index 000000000..d2aa2b605
--- /dev/null
+++ b/repositories/property/in_memory_property_overrides_reader.py
@@ -0,0 +1,31 @@
+"""In-memory ``PropertyOverridesReader`` over a pre-fetched snapshot.
+
+The modelling_e2e handler reads each Property's overrides inside its write loop.
+Reading them live keeps a second DB Session open alongside the per-Property write
+Unit of Work; pre-fetching every Property's overrides up front (one read pass,
+then the read Session is closed) lets the loop run on a single DB connection. This
+serves those pre-fetched snapshots behind the same ``PropertyOverridesReader``
+port — a Property with no pre-fetched entry resolves to no overrides, exactly as
+the Postgres reader returns an empty snapshot for a Property with no rows.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+
+from repositories.property.property_overrides_reader import (
+    PropertyOverridesReader,
+    ResolvedPropertyOverrides,
+)
+
+_NO_OVERRIDES = ResolvedPropertyOverrides(rows=())
+
+
+class InMemoryPropertyOverridesReader(PropertyOverridesReader):
+    def __init__(
+        self, by_property_id: Mapping[int, ResolvedPropertyOverrides]
+    ) -> None:
+        self._by_property_id = dict(by_property_id)
+
+    def overrides_for(self, property_id: int) -> ResolvedPropertyOverrides:
+        return self._by_property_id.get(property_id, _NO_OVERRIDES)
diff --git a/repositories/property/landlord_override_overlays.py b/repositories/property/landlord_override_overlays.py
index ab8d7ca34..b65cf5d29 100644
--- a/repositories/property/landlord_override_overlays.py
+++ b/repositories/property/landlord_override_overlays.py
@@ -7,18 +7,23 @@ type — `domain/` never imports `repositories/`.
 
 Per-component and partial — an override produces an overlay only where a
 component mapping exists and the value resolves; anything else is left to the
-lodged EPC. All four `override_component`s are mapped:
+lodged EPC. Every `override_component` is mapped:
 
 * `wall_type`  → fabric overlay (`wall_construction` + `wall_insulation_type`)
-* `roof_type`  → fabric overlay (`roof_insulation_thickness`, loft-depth family)
+* `roof_type`  → fabric overlay (`roof_insulation_thickness` / `roof_construction_type`)
+* `construction_age_band` → per-part `construction_age_band` — the U-value lever
+  for the "as built / assumed / Unknown" fabric states (ADR-0033)
 * `property_type` / `built_form_type` → whole-dwelling categorical correction
+* `main_fuel` / `glazing` / `water_heating` / `main_heating_system` → whole-dwelling
 
-Two value families deliberately resolve to *no* overlay rather than a guess: the
-`"(assumed) insulated"` / `"partial insulation (assumed)"` wall states (RdSAP
-infers their U-value from the build-era age band, so there is no single
-`wall_insulation_type` code for them — they need Elmhurst validation, ADR-0032),
-and `"Unknown"` categorical values. Roofs with no clean loft depth (flat,
-room-in-roof, "another premises above") likewise produce no overlay.
+Since ADR-0033 the "as built (assumed)" wall states resolve to the as-built code
+(4) and flat / pitched-Unknown / pitched-no-insulation roofs produce an overlay —
+their U-value comes from the per-part `construction_age_band`, not a per-state
+code. Values that still resolve to *no* overlay (left to the lodged EPC): bare
+`"Unknown"` categoricals, party-ceiling roofs ("another/same dwelling above" — a
+party ceiling has ≈0 heat loss), room-in-roof, and the residue logged in ADR-0033.
+The `audit_override_coverage.py` / `audit_hyde_rows.py` pair reports exactly which
+values are live vs no-op before any write.
 """
 
 from __future__ import annotations
@@ -29,6 +34,17 @@ from domain.epc.property_overlays.attribute_overlay import (
     built_form_overlay_for,
     property_type_overlay_for,
 )
+from domain.epc.property_overlays.construction_age_band_overlay import (
+    age_band_overlay_for,
+)
+from domain.epc.property_overlays.glazing_overlay import glazing_overlay_for
+from domain.epc.property_overlays.main_fuel_overlay import fuel_overlay_for
+from domain.epc.property_overlays.main_heating_system_overlay import (
+    main_heating_overlay_for,
+)
+from domain.epc.property_overlays.water_heating_overlay import (
+    water_heating_overlay_for,
+)
 from domain.epc.property_overlays.roof_type_overlay import roof_overlay_for
 from domain.epc.property_overlays.wall_type_overlay import wall_overlay_for
 from domain.modelling.simulation import EpcSimulation
@@ -43,6 +59,11 @@ _COMPONENT_OVERLAYS: dict[str, Callable[[str, int], Optional[EpcSimulation]]] =
     "roof_type": roof_overlay_for,
     "property_type": property_type_overlay_for,
     "built_form_type": built_form_overlay_for,
+    "main_fuel": fuel_overlay_for,
+    "glazing": glazing_overlay_for,
+    "construction_age_band": age_band_overlay_for,
+    "water_heating": water_heating_overlay_for,
+    "main_heating_system": main_heating_overlay_for,
 }
 
 
diff --git a/repositories/property/override_backed_prediction_attributes_reader.py b/repositories/property/override_backed_prediction_attributes_reader.py
index 5befd3b34..1c5a4b71f 100644
--- a/repositories/property/override_backed_prediction_attributes_reader.py
+++ b/repositories/property/override_backed_prediction_attributes_reader.py
@@ -13,7 +13,7 @@ from __future__ import annotations
 
 from typing import Optional
 
-from domain.epc.override_code_mapping import (
+from domain.epc.property_overrides.override_code_mapping import (
     built_form_to_code,
     property_type_to_code,
 )
diff --git a/repositories/property/property_overrides_postgres_reader.py b/repositories/property/property_overrides_postgres_reader.py
index 1ccb13d54..c3aa2b1c3 100644
--- a/repositories/property/property_overrides_postgres_reader.py
+++ b/repositories/property/property_overrides_postgres_reader.py
@@ -2,9 +2,16 @@
 
 Read-only and uow-independent: ``property_overrides`` is committed reference
 data the ``bulk_upload_finaliser`` Lambda writes at Finalise, long before First
-Run executes — there is no transactional coupling to the ingestion run, so this
-opens its own short read session per call via the injected session factory
-(mirroring the composition root's ``lambda: Session(engine)``).
+Run executes — there is no transactional coupling to the ingestion run, so the
+standalone reader opens its own short read session per call via the injected
+session factory (mirroring the composition root's ``lambda: Session(engine)``).
+
+Inside a Unit of Work the overrides must instead be read on the UoW's *own*
+session (``OpenSessionPropertyOverridesReader``): a second session opened
+concurrently checks out a second connection, which deadlocks the modelling_e2e
+Lambda's single-connection pool while the UoW's read transaction is still open.
+Reading committed reference data inside the UoW's transaction is correct — it
+sees the same committed rows — and keeps the invocation on one connection.
 """
 
 from __future__ import annotations
@@ -21,25 +28,80 @@ from repositories.property.property_overrides_reader import (
 )
 
 
+def _resolve_overrides(session: Session, property_id: int) -> ResolvedPropertyOverrides:
+    rows = session.exec(
+        select(PropertyOverrideRow).where(
+            col(PropertyOverrideRow.property_id) == property_id
+        )
+    ).all()
+    return ResolvedPropertyOverrides(
+        rows=tuple(
+            ResolvedPropertyOverride(
+                override_component=row.override_component,
+                building_part=row.building_part,
+                override_value=row.override_value,
+            )
+            for row in rows
+        )
+    )
+
+
+def _resolve_overrides_many(
+    session: Session, property_ids: list[int]
+) -> dict[int, ResolvedPropertyOverrides]:
+    """Resolve overrides for many Properties in one query. Returns an entry for
+    every requested id; a Property with no rows resolves to an empty snapshot."""
+    rows = session.exec(
+        select(PropertyOverrideRow).where(
+            col(PropertyOverrideRow.property_id).in_(property_ids)
+        )
+    ).all()
+    grouped: dict[int, list[ResolvedPropertyOverride]] = {
+        property_id: [] for property_id in property_ids
+    }
+    for row in rows:
+        grouped.setdefault(row.property_id, []).append(
+            ResolvedPropertyOverride(
+                override_component=row.override_component,
+                building_part=row.building_part,
+                override_value=row.override_value,
+            )
+        )
+    return {
+        property_id: ResolvedPropertyOverrides(rows=tuple(overrides))
+        for property_id, overrides in grouped.items()
+    }
+
+
 class PropertyOverridesPostgresReader(PropertyOverridesReader):
+    """Opens its own short read session per call — for standalone use outside a
+    Unit of Work, where there is no shared session/connection to reuse."""
+
     def __init__(self, session_factory: Callable[[], Session]) -> None:
         self._session_factory = session_factory
 
     def overrides_for(self, property_id: int) -> ResolvedPropertyOverrides:
         with self._session_factory() as session:
-            rows = session.exec(
-                select(PropertyOverrideRow).where(
-                    col(PropertyOverrideRow.property_id) == property_id
-                )
-            ).all()
+            return _resolve_overrides(session, property_id)
 
-        return ResolvedPropertyOverrides(
-            rows=tuple(
-                ResolvedPropertyOverride(
-                    override_component=row.override_component,
-                    building_part=row.building_part,
-                    override_value=row.override_value,
-                )
-                for row in rows
-            )
-        )
+    def overrides_for_many(
+        self, property_ids: list[int]
+    ) -> dict[int, ResolvedPropertyOverrides]:
+        """Every requested Property's resolved overrides in one query — the batch
+        form of ``overrides_for``. The returned dict has an entry for every
+        requested id; a Property with no rows resolves to an empty snapshot
+        (exactly as ``overrides_for`` returns for a Property with no rows)."""
+        with self._session_factory() as session:
+            return _resolve_overrides_many(session, property_ids)
+
+
+class OpenSessionPropertyOverridesReader(PropertyOverridesReader):
+    """Reads on a caller-owned, already-open session without closing it — for use
+    inside a Unit of Work so resolving overrides reuses the UoW's single
+    connection instead of checking out a second one."""
+
+    def __init__(self, session: Session) -> None:
+        self._session = session
+
+    def overrides_for(self, property_id: int) -> ResolvedPropertyOverrides:
+        return _resolve_overrides(self._session, property_id)
diff --git a/repositories/solar/solar_postgres_repository.py b/repositories/solar/solar_postgres_repository.py
index c6911f6b7..e797df806 100644
--- a/repositories/solar/solar_postgres_repository.py
+++ b/repositories/solar/solar_postgres_repository.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any, Optional
 
-from sqlmodel import Session, select
+from sqlmodel import Session, col, select
 
 from infrastructure.postgres.solar_table import SolarRow
 from repositories.solar.solar_repository import SolarRepository
@@ -38,3 +38,15 @@ class SolarPostgresRepository(SolarRepository):
             select(SolarRow).where(SolarRow.uprn == uprn)
         ).first()
         return row.google_api_response if row is not None else None
+
+    def get_many(self, uprns: list[int]) -> dict[int, Optional[dict[str, Any]]]:
+        """Stored insights for many UPRNs in one query — the batch form of
+        ``get``. The returned dict has an entry for every requested UPRN; a UPRN
+        with no stored row maps to None (exactly as ``get`` returns)."""
+        rows = self._session.exec(
+            select(SolarRow).where(col(SolarRow.uprn).in_(uprns))
+        ).all()
+        stored: dict[int, Optional[dict[str, Any]]] = {
+            row.uprn: row.google_api_response for row in rows
+        }
+        return {uprn: stored.get(uprn) for uprn in uprns}
diff --git a/repositories/tasks/subtask_postgres_repository.py b/repositories/tasks/subtask_postgres_repository.py
index affc280ef..06929c7d5 100644
--- a/repositories/tasks/subtask_postgres_repository.py
+++ b/repositories/tasks/subtask_postgres_repository.py
@@ -3,7 +3,7 @@ from datetime import datetime, timezone
 from typing import Any, Optional
 from uuid import UUID
 
-from sqlmodel import Session, select
+from sqlmodel import Session, col, select
 
 from domain.tasks.subtasks import SubTask, SubTaskStatus
 from infrastructure.postgres.subtask_table import SubTaskRow
@@ -22,6 +22,12 @@ class SubTaskPostgresRepository(SubTaskRepository):
         self._session.refresh(row)
         return self._to_domain(row)
 
+    def create_many(self, subtasks: list[SubTask]) -> None:
+        if not subtasks:
+            return
+        self._session.add_all([self._to_row(s) for s in subtasks])
+        self._session.commit()
+
     def get(self, subtask_id: UUID) -> SubTask:
         row = self._session.get(SubTaskRow, subtask_id)
         if row is None:
@@ -46,6 +52,36 @@ class SubTaskPostgresRepository(SubTaskRepository):
         self._session.add(row)
         self._session.commit()
 
+    def save_many(self, subtasks: list[SubTask]) -> None:
+        if not subtasks:
+            return
+        by_id = {s.id: s for s in subtasks}
+        rows = self._session.exec(
+            select(SubTaskRow).where(col(SubTaskRow.id).in_(list(by_id)))
+        ).all()
+        found = {row.id for row in rows}
+        missing = set(by_id) - found
+        if missing:
+            raise ValueError(f"SubTask(s) not found: {sorted(str(m) for m in missing)}")
+        now = datetime.now(timezone.utc)
+        for row in rows:
+            subtask = by_id[row.id]
+            row.status = subtask.status.value
+            row.job_started = subtask.job_started
+            row.job_completed = subtask.job_completed
+            row.inputs = (
+                json.dumps(subtask.inputs) if subtask.inputs is not None else None
+            )
+            row.outputs = (
+                json.dumps(subtask.outputs)
+                if subtask.outputs is not None
+                else None
+            )
+            row.cloud_logs_url = subtask.cloud_logs_url
+            row.updated_at = now
+            self._session.add(row)
+        self._session.commit()
+
     def list_by_task(self, task_id: UUID) -> list[SubTask]:
         rows = self._session.exec(
             select(SubTaskRow).where(SubTaskRow.task_id == task_id)
diff --git a/repositories/tasks/subtask_repository.py b/repositories/tasks/subtask_repository.py
index adb36f995..e1e3b5c65 100644
--- a/repositories/tasks/subtask_repository.py
+++ b/repositories/tasks/subtask_repository.py
@@ -8,11 +8,24 @@ class SubTaskRepository(ABC):
     @abstractmethod
     def create(self, subtask: SubTask) -> SubTask: ...
 
+    @abstractmethod
+    def create_many(self, subtasks: list[SubTask]) -> None:
+        """Persist many SubTasks in one round-trip (one INSERT + one commit) —
+        the batch form of ``create`` for callers that fan a Task out into many
+        children at once."""
+        ...
+
     @abstractmethod
     def get(self, subtask_id: UUID) -> SubTask: ...
 
     @abstractmethod
     def save(self, subtask: SubTask) -> None: ...
 
+    @abstractmethod
+    def save_many(self, subtasks: list[SubTask]) -> None:
+        """Persist updates to many SubTasks in one round-trip (one bulk fetch +
+        one commit) — the batch form of ``save``."""
+        ...
+
     @abstractmethod
     def list_by_task(self, task_id: UUID) -> list[SubTask]: ...
diff --git a/scripts/audit/__init__.py b/scripts/audit/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/scripts/audit/anomalies.py b/scripts/audit/anomalies.py
new file mode 100644
index 000000000..7b1ac62e2
--- /dev/null
+++ b/scripts/audit/anomalies.py
@@ -0,0 +1,404 @@
+"""Audit modelled Properties for *odd results* — a growing, pluggable set of
+checks that read the DB and flag plans / baselines / recommendations that look
+wrong, so the team can triage them instead of hunting by hand in the FE.
+
+Run:
+    python -m scripts.audit_modelling_anomalies --portfolio 796
+    python -m scripts.audit_modelling_anomalies --portfolio 796 --severity high
+    python -m scripts.audit_modelling_anomalies --property 725634
+
+Writes ``modelling_audit.md`` + ``modelling_audit.csv`` and prints a summary.
+
+ADDING A CHECK: write a function ``(a: PropertyAudit) -> Optional[str]`` that
+returns a one-line reason when the Property looks wrong (else None), and decorate
+it with ``@check("kebab-name", Severity.HIGH)``. That is the whole contract — the
+runner discovers it, runs it over every Property, and reports the reasons. Keep
+each check small and single-purpose; lean on the shared `PropertyAudit` bundle
+rather than re-querying.
+
+This registry is meant to **compound**: each audit that confirms a new
+systematic problem should leave behind a check (see the `audit-ara-portfolio`
+skill's self-improve phase). So every check's docstring records its
+**provenance** — the motivating cause and example properties — so a future reader
+can re-verify it and judge whether it still earns its place. A threshold should
+be justified against the real distribution, not guessed.
+
+Read-only: this script never writes to the DB.
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+from dataclasses import dataclass
+from enum import IntEnum
+from typing import Callable, Optional
+
+from sqlalchemy import text
+
+from datatypes.epc.domain.epc import Epc
+from scripts.e2e_common import build_engine, load_env
+
+# A..G, A best — index is the rank (lower = better) for band comparisons.
+_BANDS = "ABCDEFG"
+
+
+def _band_rank(band: Optional[str]) -> Optional[int]:
+    if band is None or band not in _BANDS:
+        return None
+    return _BANDS.index(band)
+
+
+def _band_of(score: Optional[float]) -> Optional[str]:
+    if score is None:
+        return None
+    return Epc.from_sap_score(round(score)).value
+
+
+class Severity(IntEnum):
+    LOW = 1
+    MEDIUM = 2
+    HIGH = 3
+
+
+@dataclass(frozen=True)
+class PropertyAudit:
+    """Everything a check needs about one modelled Property, joined once.
+
+    The *default* plan is the one shown in the FE; ``None`` when the Property has
+    no plan for the scenario. All performance figures are the persisted ones.
+    """
+
+    property_id: int
+    uprn: Optional[int]
+    portfolio_id: int
+    scenario_id: Optional[int]
+    scenario_goal_band: Optional[str]
+    lodged_sap: Optional[float]
+    lodged_band: Optional[str]
+    effective_sap: Optional[float]
+    effective_band: Optional[str]
+    rebaseline_reason: Optional[str]
+    post_sap: Optional[float]
+    post_band: Optional[str]
+    cost_of_works: Optional[float]
+    energy_bill_savings: Optional[float]
+    energy_consumption_savings: Optional[float]
+    # Recommendation-level rollups for the default plan.
+    solar_sap_points: Optional[float]  # max SAP a single solar_pv measure earns
+    solar_bill_savings: Optional[float]  # the solar_pv measure's £/yr bill saving
+    n_measures: int
+
+
+@dataclass(frozen=True)
+class Anomaly:
+    property_id: int
+    uprn: Optional[int]
+    check: str
+    severity: Severity
+    detail: str
+
+
+Check = Callable[[PropertyAudit], Optional[str]]
+_REGISTRY: list[tuple[str, Severity, Check]] = []
+
+
+def check(name: str, severity: Severity) -> Callable[[Check], Check]:
+    def register(fn: Check) -> Check:
+        _REGISTRY.append((name, severity, fn))
+        return fn
+
+    return register
+
+
+# ───────────────────────── checks ─────────────────────────
+# Each returns a reason string when the Property looks wrong, else None.
+
+
+@check("plan-below-baseline-band", Severity.HIGH)
+def _plan_below_baseline_band(a: PropertyAudit) -> Optional[str]:
+    """The default plan's post-works band is WORSE than the baseline band — a
+    retrofit plan should never end below where the property started."""
+    base, post = _band_rank(a.effective_band), _band_rank(a.post_band)
+    if base is None or post is None or post <= base:
+        return None
+    return f"post {a.post_band} ({a.post_sap}) worse than effective baseline {a.effective_band} ({a.effective_sap})"
+
+
+@check("plan-score-below-baseline", Severity.HIGH)
+def _plan_score_below_baseline(a: PropertyAudit) -> Optional[str]:
+    """Post-works SAP is materially BELOW the baseline SAP — works that lower the
+    score, or a plan/baseline computed from different pictures."""
+    if a.effective_sap is None or a.post_sap is None:
+        return None
+    if a.post_sap >= a.effective_sap - 0.5:
+        return None
+    return f"post SAP {a.post_sap:.1f} below effective baseline {a.effective_sap:.1f} (Δ{a.post_sap - a.effective_sap:.1f})"
+
+
+@check("already-meets-goal-with-works", Severity.MEDIUM)
+def _already_meets_goal_with_works(a: PropertyAudit) -> Optional[str]:
+    """The property already meets/exceeds the scenario's goal band, yet the plan
+    spends money on measures — nothing should be recommended."""
+    goal, base = _band_rank(a.scenario_goal_band), _band_rank(a.effective_band)
+    if goal is None or base is None or base > goal:
+        return None
+    if (a.cost_of_works or 0.0) <= 0.0:
+        return None
+    return f"already {a.effective_band} >= goal {a.scenario_goal_band} but cost_of_works £{a.cost_of_works:.0f}"
+
+
+@check("post-band-score-mismatch", Severity.MEDIUM)
+def _post_band_score_mismatch(a: PropertyAudit) -> Optional[str]:
+    """The persisted post band disagrees with the band the post SAP implies — a
+    rounding/derivation bug between score and rating."""
+    implied = _band_of(a.post_sap)
+    if implied is None or a.post_band is None or implied == a.post_band:
+        return None
+    return f"post_epc_rating {a.post_band} but post_sap_points {a.post_sap:.1f} implies {implied}"
+
+
+@check("zero-works-post-differs", Severity.MEDIUM)
+def _zero_works_post_differs(a: PropertyAudit) -> Optional[str]:
+    """A no-op plan (£0 of works) whose post SAP differs from the baseline — the
+    baseline and the plan's starting point disagree (stale or inconsistent)."""
+    if a.effective_sap is None or a.post_sap is None:
+        return None
+    if (a.cost_of_works or 0.0) > 0.0:
+        return None
+    if abs(a.post_sap - a.effective_sap) <= 0.5:
+        return None
+    return f"£0 works but post SAP {a.post_sap:.1f} != effective {a.effective_sap:.1f}"
+
+
+@check("effective-lodged-divergence", Severity.LOW)
+def _effective_lodged_divergence(a: PropertyAudit) -> Optional[str]:
+    """The Effective baseline is far from the lodged accredited figure (≥15 SAP).
+    Often legitimate (overrides / pre-SAP10 rebaseline), but worth a look — a big
+    gap can also mean a bad override or a calculator divergence."""
+    if a.effective_sap is None or a.lodged_sap is None:
+        return None
+    gap = a.effective_sap - a.lodged_sap
+    if abs(gap) < 15:
+        return None
+    return f"effective {a.effective_sap:.0f} vs lodged {a.lodged_sap:.0f} (Δ{gap:+.0f}, reason={a.rebaseline_reason})"
+
+
+@check("impossible-sap-over-100", Severity.HIGH)
+def _impossible_sap_over_100(a: PropertyAudit) -> Optional[str]:
+    """A SAP score above 100 is impossible (SAP caps at 100) — a calculator /
+    aggregation bug, or an oversized solar array pushing the score past the cap."""
+    offenders = [
+        f"{label} {value:.1f}"
+        for label, value in (("post", a.post_sap), ("effective", a.effective_sap))
+        if value is not None and value > 100.0
+    ]
+    if not offenders:
+        return None
+    return "SAP > 100: " + ", ".join(offenders)
+
+
+@check("excessive-solar-sap", Severity.MEDIUM)
+def _excessive_solar_sap(a: PropertyAudit) -> Optional[str]:
+    """A single solar PV measure earns an implausibly large slice of SAP (> 25
+    points; cohort avg ≈ 12.5). Usually an oversized array — Google footprint
+    conflation borrowing a neighbour's / the whole building's roof (ADR-0038)."""
+    if a.solar_sap_points is None or a.solar_sap_points <= 25.0:
+        return None
+    return f"solar PV alone earns {a.solar_sap_points:.1f} SAP points (likely oversized array)"
+
+
+@check("unusually-high-post-sap", Severity.LOW)
+def _unusually_high_post_sap(a: PropertyAudit) -> Optional[str]:
+    """Post-works SAP at the very top of the scale (>= 95, near band A) — rare for
+    a retrofit of existing stock; worth confirming it isn't an over-credit."""
+    if a.post_sap is None or a.post_sap < 95.0 or a.post_sap > 100.0:
+        return None
+    return f"post SAP {a.post_sap:.1f} (near band A) — confirm not over-credited"
+
+
+@check("low-solar-bill-savings", Severity.MEDIUM)
+def _low_solar_bill_savings(a: PropertyAudit) -> Optional[str]:
+    """A solar PV measure that barely cuts the bill (< £50/yr, or negative). Solar
+    reliably saves on electricity, so a near-zero / negative figure points at a
+    pricing bug — e.g. self-consumption or SEG export not credited (the Saltmead
+    case: solar, D→C, but only ≈ −£62/yr)."""
+    if a.solar_bill_savings is None or a.solar_bill_savings >= 50.0:
+        return None
+    return f"solar PV bill saving only £{a.solar_bill_savings:.0f}/yr — check self-consumption / SEG export"
+
+
+@check("negative-bill-savings", Severity.LOW)
+def _negative_bill_savings(a: PropertyAudit) -> Optional[str]:
+    """The plan INCREASES the annual bill — can be legitimate on a fuel-switch
+    (gas→ASHP), but a recommended plan that costs more to run is worth review."""
+    if a.energy_bill_savings is None or a.energy_bill_savings >= 0:
+        return None
+    if (a.cost_of_works or 0.0) <= 0.0:
+        return None
+    return f"energy_bill_savings £{a.energy_bill_savings:.0f}/yr on £{a.cost_of_works:.0f} of works"
+
+
+# ─────────────────────── runner ───────────────────────
+
+_QUERY = text(
+    """
+    SELECT p.id, p.uprn, p.portfolio_id,
+           pl.scenario_id, s.goal_value AS goal_band,
+           pbp.lodged_sap_score, pbp.lodged_epc_band,
+           pbp.effective_sap_score, pbp.effective_epc_band, pbp.rebaseline_reason,
+           pl.post_sap_points, pl.post_epc_rating, pl.cost_of_works,
+           pl.energy_bill_savings, pl.energy_consumption_savings
+    FROM property p
+    LEFT JOIN property_baseline_performance pbp ON pbp.property_id = p.id
+    LEFT JOIN plan pl ON pl.property_id = p.id AND pl.is_default = TRUE
+      AND (:scenario_id IS NULL OR pl.scenario_id = :scenario_id)
+    LEFT JOIN scenario s ON s.id = pl.scenario_id
+    WHERE (:portfolio_id IS NULL OR p.portfolio_id = :portfolio_id)
+      AND (:property_id IS NULL OR p.id = :property_id)
+    ORDER BY p.id
+    """
+)
+
+
+_ROLLUP_QUERY = text(
+    """
+    SELECT r.property_id,
+           MAX(r.sap_points) FILTER (WHERE r.type = 'solar_pv') AS solar_sap,
+           MAX(r.energy_cost_savings) FILTER (WHERE r.type = 'solar_pv') AS solar_bill,
+           COUNT(*) AS n_measures
+    FROM recommendation r
+    JOIN plan pl ON pl.id = r.plan_id AND pl.is_default = TRUE
+      AND (:scenario_id IS NULL OR pl.scenario_id = :scenario_id)
+    JOIN property p ON p.id = r.property_id
+    WHERE (:portfolio_id IS NULL OR p.portfolio_id = :portfolio_id)
+      AND (:property_id IS NULL OR p.id = :property_id)
+    GROUP BY r.property_id
+    """
+)
+
+
+def _load(
+    portfolio_id: Optional[int],
+    property_id: Optional[int],
+    scenario_id: Optional[int],
+) -> list[PropertyAudit]:
+    engine = build_engine()
+    out: list[PropertyAudit] = []
+    params = {
+        "portfolio_id": portfolio_id,
+        "property_id": property_id,
+        "scenario_id": scenario_id,
+    }
+    with engine.connect() as conn:
+        rollups: dict[int, tuple[Optional[float], Optional[float], int]] = {
+            m["property_id"]: (m["solar_sap"], m["solar_bill"], m["n_measures"])
+            for m in (
+                row._mapping for row in conn.execute(_ROLLUP_QUERY, params)
+            )
+        }
+        for r in conn.execute(_QUERY, params):
+            m = r._mapping
+            solar_sap, solar_bill, n_measures = rollups.get(m["id"], (None, None, 0))
+            out.append(
+                PropertyAudit(
+                    property_id=m["id"],
+                    uprn=m["uprn"],
+                    portfolio_id=m["portfolio_id"],
+                    scenario_id=m["scenario_id"],
+                    scenario_goal_band=m["goal_band"],
+                    lodged_sap=m["lodged_sap_score"],
+                    lodged_band=m["lodged_epc_band"],
+                    effective_sap=m["effective_sap_score"],
+                    effective_band=m["effective_epc_band"],
+                    rebaseline_reason=m["rebaseline_reason"],
+                    post_sap=m["post_sap_points"],
+                    post_band=m["post_epc_rating"],
+                    cost_of_works=m["cost_of_works"],
+                    energy_bill_savings=m["energy_bill_savings"],
+                    energy_consumption_savings=m["energy_consumption_savings"],
+                    solar_sap_points=solar_sap,
+                    solar_bill_savings=solar_bill,
+                    n_measures=n_measures,
+                )
+            )
+    return out
+
+
+def run(audits: list[PropertyAudit], min_severity: Severity) -> list[Anomaly]:
+    found: list[Anomaly] = []
+    for a in audits:
+        for name, severity, fn in _REGISTRY:
+            if severity < min_severity:
+                continue
+            detail = fn(a)
+            if detail is not None:
+                found.append(Anomaly(a.property_id, a.uprn, name, severity, detail))
+    found.sort(key=lambda x: (-x.severity, x.check, x.property_id))
+    return found
+
+
+def _write_reports(anomalies: list[Anomaly], scanned: int) -> None:
+    with open("modelling_audit.csv", "w", newline="") as f:
+        w = csv.writer(f)
+        w.writerow(["property_id", "uprn", "severity", "check", "detail"])
+        for a in anomalies:
+            w.writerow([a.property_id, a.uprn, a.severity.name, a.check, a.detail])
+
+    by_check: dict[str, list[Anomaly]] = {}
+    for a in anomalies:
+        by_check.setdefault(a.check, []).append(a)
+    lines = [
+        "# Modelling anomaly audit",
+        "",
+        f"Scanned **{scanned}** properties · flagged **{len(anomalies)}** anomalies "
+        f"across **{len(by_check)}** checks.",
+        "",
+    ]
+    for name in sorted(by_check, key=lambda n: (-by_check[n][0].severity, n)):
+        rows = by_check[name]
+        lines.append(f"## {name} ({rows[0].severity.name}) — {len(rows)}")
+        lines.append("")
+        for a in rows[:50]:
+            lines.append(f"- property **{a.property_id}** (uprn {a.uprn}): {a.detail}")
+        if len(rows) > 50:
+            lines.append(f"- … and {len(rows) - 50} more (see CSV)")
+        lines.append("")
+    with open("modelling_audit.md", "w") as f:
+        f.write("\n".join(lines))
+
+
+def main() -> None:
+    load_env()
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--portfolio", type=int, default=None, help="portfolio_id to scan")
+    parser.add_argument("--property", type=int, default=None, help="a single property_id")
+    parser.add_argument(
+        "--scenario", type=int, default=None, help="restrict to one scenario_id"
+    )
+    parser.add_argument(
+        "--severity",
+        choices=[s.name.lower() for s in Severity],
+        default="low",
+        help="minimum severity to report (default: low — all)",
+    )
+    args = parser.parse_args()
+    min_severity = Severity[args.severity.upper()]
+
+    audits = _load(args.portfolio, args.property, args.scenario)
+    anomalies = run(audits, min_severity)
+    _write_reports(anomalies, len(audits))
+
+    print(f"scanned {len(audits)} properties · {len(anomalies)} anomalies "
+          f"(>= {min_severity.name})")
+    counts: dict[str, int] = {}
+    for a in anomalies:
+        counts[a.check] = counts.get(a.check, 0) + 1
+    for name, severity, _ in _REGISTRY:
+        if severity >= min_severity:
+            print(f"  [{severity.name:>6}] {name}: {counts.get(name, 0)}")
+    print("wrote modelling_audit.md / modelling_audit.csv")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/dive_cert.py b/scripts/dive_cert.py
new file mode 100644
index 000000000..8d6da1b46
--- /dev/null
+++ b/scripts/dive_cert.py
@@ -0,0 +1,108 @@
+"""Deep-dive a single corpus cert: lodged vs computed SAP/CO2/PE + the full
+intermediate line-ref dump + the mapped fabric/heat-loss inputs, so the
+diverging line is visible WITHOUT an Elmhurst worksheet.
+
+USAGE
+    PYTHONPATH=/workspaces/model python scripts/dive_cert.py <cert_number_or_substr>
+    PYTHONPATH=/workspaces/model python scripts/dive_cert.py --filter wall_insulation_type=3  [--n 8]
+"""
+from __future__ import annotations
+
+import json
+import sys
+from pathlib import Path
+from typing import Any
+
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+from domain.sap10_calculator.calculator import calculate_sap_from_inputs
+from domain.sap10_calculator.rdsap.cert_to_inputs import (
+    SAP_10_2_SPEC_PRICES,
+    cert_to_demand_inputs,
+    cert_to_inputs,
+)
+from scripts.profile_api_error import features
+
+_CORPUS = Path("backend/epc_api/json_samples/RdSAP-Schema-21.0.1/corpus.jsonl")
+
+
+def _cert_id(doc: dict[str, Any]) -> str:
+    return str(
+        doc.get("certificate_number")
+        or doc.get("lmk_key")
+        or doc.get("uprn")
+        or "?"
+    )
+
+
+def _dump(doc: dict[str, Any]) -> None:
+    cert = _cert_id(doc)
+    lodged_sap = doc.get("energy_rating_current")
+    lodged_co2 = doc.get("co2_emissions_current")
+    lodged_pe = doc.get("energy_consumption_current")
+    epc = EpcPropertyDataMapper.from_api_response(doc)
+    r = calculate_sap_from_inputs(cert_to_inputs(epc, prices=SAP_10_2_SPEC_PRICES))
+    # SAP/EI rating is the UK-average rating cascade (`r`); EPC CO2/PE use the
+    # postcode demand cascade (SAP 10.2 Appendix U p.124). Display CO2/PE from
+    # the demand cascade so they compare like-for-like with the lodged EPC.
+    d = calculate_sap_from_inputs(cert_to_demand_inputs(epc, prices=SAP_10_2_SPEC_PRICES))
+    print("=" * 90)
+    print(f"CERT {cert}")
+    print(
+        f"  SAP  lodged={lodged_sap}  ours={r.sap_score_continuous:.2f}  "
+        f"d={r.sap_score_continuous - (lodged_sap or 0):+.2f}"
+    )
+    if lodged_co2 is not None:
+        print(
+            f"  CO2  lodged={lodged_co2:.3f}  ours={d.co2_kg_per_yr / 1000:.3f} t  "
+            f"d={d.co2_kg_per_yr / 1000 - lodged_co2:+.3f}  (demand cascade)"
+        )
+    if lodged_pe is not None:
+        print(
+            f"  PE   lodged={lodged_pe:.1f}  ours={d.primary_energy_kwh_per_m2:.1f}  "
+            f"d={d.primary_energy_kwh_per_m2 - lodged_pe:+.1f} kWh/m2  (demand cascade)"
+        )
+    print(
+        f"  energy kWh/yr: spaceheat={r.space_heating_kwh_per_yr:.0f} "
+        f"main={r.main_heating_fuel_kwh_per_yr:.0f} "
+        f"sec={r.secondary_heating_fuel_kwh_per_yr:.0f} "
+        f"hw={r.hot_water_kwh_per_yr:.0f} light={r.lighting_kwh_per_yr:.0f} "
+        f"pumpfan={r.pumps_fans_kwh_per_yr:.0f}"
+    )
+    d = epc.__dict__
+    print("  --- key mapped inputs ---")
+    f = features(doc)
+    for k in (
+        "property_type", "built_form", "age_band", "main_sap_code",
+        "main_heat_cat", "main_fuel", "has_pcdb_main", "main_data_source",
+        "wall_construction", "wall_insulation_type", "roof_codes",
+        "roof_insulation_thickness", "whc", "water_fuel", "immersion_type",
+        "has_cylinder", "has_secondary", "has_pv", "mains_gas", "n_building_parts",
+    ):
+        print(f"    {k:26s}= {f.get(k)}")
+    print("  --- intermediate line refs ---")
+    inter = r.intermediate or {}
+    for k in sorted(inter):
+        print(f"    {k:34s}= {inter[k]:.4f}")
+
+
+def main() -> None:
+    docs = [json.loads(l) for l in _CORPUS.read_text().splitlines() if l.strip()]
+    if "--filter" in sys.argv:
+        spec = sys.argv[sys.argv.index("--filter") + 1]
+        key, _, val = spec.partition("=")
+        n = int(sys.argv[sys.argv.index("--n") + 1]) if "--n" in sys.argv else 6
+        hits = [d for d in docs if str(features(d).get(key)) == val]
+        print(f"{len(hits)} certs match {spec}; dumping first {n}")
+        for d in hits[:n]:
+            _dump(d)
+        return
+    target = sys.argv[1]
+    for d in docs:
+        if target in _cert_id(d):
+            _dump(d)
+            return
+    print(f"no cert matching {target}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/failed_modelling_e2e.md b/scripts/failed_modelling_e2e.md
new file mode 100644
index 000000000..2d63da428
--- /dev/null
+++ b/scripts/failed_modelling_e2e.md
@@ -0,0 +1,17 @@
+# Failed modelling_e2e Subtasks
+
+| Subtask ID | Task ID | Updated At | Property ID | UPRN | Inputs |
+|-----------|---------|------------|-------------|------|--------|
+| ce6a5844-cf31-495e-9e45-91a83aedb8e7 | a520b8a0-2b7a-4a99-a87d-bfe4bf785de6 | 2026-06-23 11:35:58.448106+00:00 | 719897 | 100021919718 | {"property_ids": [719897], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 31e687bb-9b9d-4fcc-b640-f68f878cf49a | b7dde417-2e5d-42ee-b695-c9d7a9ca81c1 | 2026-06-23 11:35:51.384121+00:00 | 733315 | 100020401711 | {"property_ids": [733315], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| b337172c-9dc5-48a0-9eb8-8021893a0ef1 | 01266210-d44a-4715-bf21-eda88a67a5e7 | 2026-06-23 11:35:41.863424+00:00 | 723589 | 100020407755 | {"property_ids": [723589], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| d2af286a-8964-4040-8429-e289d215c635 | 5f408513-be4d-4ce0-96b0-ceb654563ca2 | 2026-06-23 11:35:39.939416+00:00 | 726592 | 100021918195 | {"property_ids": [726592], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 1d13c3a2-b269-4ca4-a3f7-f19479081444 | cebcff9b-4a46-48f0-a648-f40b030951b2 | 2026-06-23 11:35:18.760333+00:00 | 711228 | 100020416477 | {"property_ids": [711228], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| f920f079-edd0-4e3e-893e-809e57a57292 | e6a75a2f-2165-4c6a-b929-f485db08b5a2 | 2026-06-23 11:35:11.908026+00:00 | 717435 | 22010468 | {"property_ids": [717435], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 36ec4a16-be95-4fda-8279-d7d33ed5a556 | 693c3886-efc6-48c1-b99d-576b5736c7e9 | 2026-06-23 11:35:06.439654+00:00 | 710339 | 10013151061 | {"property_ids": [710339], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 8960e551-10af-48ac-b4ad-821154a79a1c | 17791ee1-1ec6-49ea-a6fc-6f1e8d20914d | 2026-06-23 11:34:58.830828+00:00 | 721815 | 22086690 | {"property_ids": [721815], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 453ca0df-3b0d-427d-abf5-8462194f770b | 4712998d-d130-4472-860f-5b1d2471b3e3 | 2026-06-23 11:34:47.106853+00:00 | 712401 | 100020394694 | {"property_ids": [712401], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 1f5ec8fb-7202-44d6-8794-44515f9b4d82 | e50d8753-fd8b-4735-ac89-225428989ec5 | 2026-06-23 11:34:39.473828+00:00 | 723881 | 22005280 | {"property_ids": [723881], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 6ddff51f-1c29-439c-9335-b5befee64836 | dbac1632-3648-46da-97bc-0ca572bc9c45 | 2026-06-23 11:34:35.708295+00:00 | 715891 | 22082258 | {"property_ids": [715891], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 3255673d-7cba-49f8-ba88-106301dfa029 | 620f5571-d6c5-469a-afe3-8986b53dd041 | 2026-06-23 11:34:32.737237+00:00 | 716049 | 22104161 | {"property_ids": [716049], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
+| 9b1a8289-de92-4935-afd6-b93a89f400e6 | 35abffbe-7574-448a-b8cf-89586bf9057d | 2026-06-23 11:34:31.003170+00:00 | 730259 | 100061905741 | {"property_ids": [730259], "portfolio_id": 796, "scenario_id": 1268, "no_solar": false, "dry_run": false} |
diff --git a/scripts/fill_domna_addresses.py b/scripts/fill_domna_addresses.py
new file mode 100644
index 000000000..e4a7e18b8
--- /dev/null
+++ b/scripts/fill_domna_addresses.py
@@ -0,0 +1,353 @@
+"""Fill the DOMNA columns in the AddressProfilingResults spreadsheet.
+
+Input: scripts/manipulation(2).xlsx, sheet "AddressProfilingResults", columns
+    Organisation Reference | UPRN | DOMNA FOUND UPRN | DOMNA FOUND ADDRESS | Address | Postcode
+
+Per-row rule ("if there's a UPRN in the UPRN column we're done"):
+
+  * UPRN present AND Address present   -> nothing to do (already sorted).
+  * UPRN present AND Address missing   -> reverse-lookup the address from the UPRN
+                                          via the EPC API -> DOMNA FOUND ADDRESS.
+  * UPRN missing  AND Address present  -> resolve a UPRN from address + postcode
+                                          (EPC API, then Ordnance Survey) -> writes
+                                          DOMNA FOUND UPRN + DOMNA FOUND ADDRESS.
+  * not resolvable                     -> marked "NOT FOUND" and listed in the
+                                          unresolved report.
+
+Relaxed matching (this batch only — production AddressMatch is untouched): the
+landlord writes flats as "3 GLADYS COURT" while EPC stores "Flat 3 Gladys
+Court", which the production matcher hard-rejects. So per address we try several
+query variants — the full string, just the first comma-segment, and a
+"Flat <n> ..." form — and keep the best-scoring, unambiguous match. The unit
+number must still match exactly (AddressMatch zeroes mismatched numbers), so a
+wrong-unit match stays unlikely. Each fill carries its score + source so you can
+spot-check (DOMNA SCORE / DOMNA SOURCE).
+
+Rows that already have a DOMNA FOUND UPRN are skipped (idempotent / resumable).
+
+    python -m scripts.fill_domna_addresses
+    python -m scripts.fill_domna_addresses --limit 200   # smoke test first N
+
+Keys come from backend/.env (OPEN_EPC_API_TOKEN, ORDNANCE_SURVEY_API_KEY). Run
+from the worktree root (import trap).
+"""
+
+from __future__ import annotations
+
+import argparse
+import os
+import re
+import sys
+from pathlib import Path
+from typing import Optional
+
+import pandas as pd
+
+_REPO_ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
+
+from backend.address2UPRN.main import get_epc_data_with_postcode  # noqa: E402
+from backend.address2UPRN.scoring import all_uprns_match, rank_address_similarity  # noqa: E402
+from backend.ordnanceSurvey.helpers import (  # noqa: E402
+    lookup_os_places,
+    os_places_results_to_dataframe,
+)
+from backend.utils.addressMatch import AddressMatch  # noqa: E402
+from datatypes.epc.search import EpcSearchResult  # noqa: E402
+from infrastructure.epc_client.epc_client_service import EpcClientService  # noqa: E402
+from scripts.resolve_uprns_for_finaliser import clean_postcode, load_keys  # noqa: E402
+
+SHEET = "AddressProfilingResults"
+UPRN_COL = "UPRN"
+ADDRESS_COL = "Address"
+POSTCODE_COL = "Postcode"
+REF_COL = "Organisation Reference"
+FOUND_UPRN_COL = "DOMNA FOUND UPRN"
+FOUND_ADDRESS_COL = "DOMNA FOUND ADDRESS"
+SCORE_COL = "DOMNA SCORE"
+SOURCE_COL = "DOMNA SOURCE"
+NOT_FOUND = "NOT FOUND"
+
+# EPC matches are tight (short addresses) so we hold the production 0.7 bar; OS
+# addresses carry more trailing tokens, so a slightly lower bar is appropriate.
+EPC_THRESHOLD = 0.7
+OS_THRESHOLD = 0.6
+
+_DEFAULT_IN = _REPO_ROOT / "scripts" / "manipulation(2).xlsx"
+_DEFAULT_OUT = _REPO_ROOT / "scripts" / "manipulation_filled.xlsx"
+_DEFAULT_UNRESOLVED = _REPO_ROOT / "scripts" / "manipulation_unresolved.csv"
+
+# A resolved hit: (uprn, matched_address, score, source).
+Hit = tuple[str, str, float, str]
+
+
+def cell_str(value: object) -> str:
+    """Coerce a spreadsheet cell to a trimmed string ("" for NaN/None)."""
+    if value is None:
+        return ""
+    text = str(value).strip()
+    return "" if text.lower() == "nan" else text
+
+
+def parse_uprn_cell(value: object) -> Optional[int]:
+    """Read a UPRN cell that pandas loaded as float64 back into an int."""
+    text = cell_str(value)
+    if not text:
+        return None
+    try:
+        return int(float(text))
+    except ValueError:
+        return None
+
+
+def address_variants(address: str) -> list[str]:
+    """Query forms to try for one input address, best-discriminating first.
+
+    Landlord flats read "3 GLADYS COURT, 260 REIGATE ROAD" but EPC stores
+    "Flat 3 Gladys Court"; the full string scores low (extra tokens) and the
+    bare "3 ..." trips the flat guard. So we also try the first comma-segment
+    and a "Flat <segment>" form.
+    """
+    address = address.strip()
+    first = address.split(",")[0].strip()
+    variants = [address, first]
+    if re.match(r"^\d", first):  # starts with a unit/house number
+        variants.append("Flat " + first)
+        variants.append("Flat " + address)
+    seen: set[str] = set()
+    out: list[str] = []
+    for v in variants:
+        key = v.lower()
+        if v and key not in seen:
+            seen.add(key)
+            out.append(v)
+    return out
+
+
+def resolve_epc_relaxed(
+    address: str,
+    postcode_clean: str,
+    epc_cache: dict[str, pd.DataFrame],
+    threshold: float = EPC_THRESHOLD,
+) -> Optional[Hit]:
+    """Best unambiguous EPC match across the address variants (cached per postcode)."""
+    epc_df = epc_cache.get(postcode_clean)
+    if epc_df is None:
+        epc_df = get_epc_data_with_postcode(postcode=postcode_clean)
+        epc_cache[postcode_clean] = epc_df
+    if epc_df.empty:
+        return None
+
+    best: Optional[Hit] = None
+    for variant in address_variants(address):
+        scored = rank_address_similarity(epc_df, user_address=variant)
+        if scored.empty:
+            continue
+        score = float(scored.iloc[0]["lexiscore"])
+        if best is not None and score <= best[2]:
+            continue
+        top_rank = scored[scored["lexirank"] == 1]
+        # rank-1 rows must agree on one UPRN, else it's ambiguous — skip.
+        if not all_uprns_match(top_rank, top_rank.iloc[0]["uprn"]):
+            continue
+        uprn = str(top_rank.iloc[0]["uprn"])
+        if uprn in ("", "nan"):
+            continue
+        best = (uprn, str(scored.iloc[0]["address"]), score, "epc")
+
+    return best if best is not None and best[2] >= threshold else None
+
+
+def resolve_os_relaxed(
+    address: str,
+    postcode_clean: str,
+    os_api_key: str,
+    os_cache: dict[str, pd.DataFrame],
+    threshold: float = OS_THRESHOLD,
+) -> Optional[Hit]:
+    """Best OS Places match across the address variants (cached per postcode)."""
+    places_df = os_cache.get(postcode_clean)
+    if places_df is None:
+        response = lookup_os_places(postcode_clean, os_api_key)
+        if response.get("status") == 200 and "data" in response:
+            places_df = os_places_results_to_dataframe(response["data"])
+        else:
+            places_df = pd.DataFrame()
+        os_cache[postcode_clean] = places_df
+    if places_df.empty or "ADDRESS" not in places_df.columns:
+        return None
+
+    records: list[dict[str, object]] = places_df.to_dict(orient="records")
+    best: Optional[Hit] = None
+    for variant in address_variants(address):
+        for rec in records:
+            candidate = str(rec.get("ADDRESS", ""))
+            score = AddressMatch.score(variant, candidate)
+            if best is None or score > best[2]:
+                best = (str(rec.get("UPRN", "")), candidate, score, "ordnance_survey")
+    return best if best is not None and best[2] >= threshold else None
+
+
+def _address_from_search(result: EpcSearchResult) -> str:
+    parts = [
+        result.address_line_1,
+        result.address_line_2,
+        result.address_line_3,
+        result.address_line_4,
+        result.post_town,
+    ]
+    return ", ".join(p.strip() for p in parts if p and p.strip())
+
+
+def reverse_address_from_uprn(
+    uprn: int,
+    postcode_clean: str,
+    service: EpcClientService,
+    search_cache: dict[str, list[EpcSearchResult]],
+) -> Optional[str]:
+    """Find the EPC address for a known UPRN by searching its postcode (cached)."""
+    results = search_cache.get(postcode_clean)
+    if results is None:
+        results = service.search_by_postcode(postcode_clean)
+        search_cache[postcode_clean] = results
+    for result in results:
+        if result.uprn is not None and int(result.uprn) == uprn:
+            return _address_from_search(result)
+    return None
+
+
+def fill(df: pd.DataFrame, *, os_api_key: Optional[str]) -> list[dict[str, str]]:
+    """Fill the DOMNA columns in place. Returns the unresolved rows."""
+    for col in (FOUND_UPRN_COL, FOUND_ADDRESS_COL, SCORE_COL, SOURCE_COL):
+        if col not in df.columns:
+            df[col] = ""
+    df[FOUND_UPRN_COL] = df[FOUND_UPRN_COL].astype("object")
+    df[FOUND_ADDRESS_COL] = df[FOUND_ADDRESS_COL].astype("object")
+
+    token = os.environ.get("OPEN_EPC_API_TOKEN")
+    service = EpcClientService(auth_token=token) if token else None
+    epc_cache: dict[str, pd.DataFrame] = {}
+    os_cache: dict[str, pd.DataFrame] = {}
+    search_cache: dict[str, list[EpcSearchResult]] = {}
+
+    unresolved: list[dict[str, str]] = []
+    resolved_uprn = resolved_addr = skipped = 0
+    total = len(df)
+
+    for n, idx in enumerate(df.index, start=1):
+        ref = cell_str(df.at[idx, REF_COL])
+        given_uprn = parse_uprn_cell(df.at[idx, UPRN_COL])
+        address = cell_str(df.at[idx, ADDRESS_COL])
+        postcode_raw = cell_str(df.at[idx, POSTCODE_COL])
+        postcode_clean = clean_postcode(postcode_raw)
+
+        # Already sorted (UPRN + address) or already filled by a prior run.
+        if given_uprn is not None and address:
+            skipped += 1
+            continue
+        if cell_str(df.at[idx, FOUND_UPRN_COL]) and cell_str(df.at[idx, FOUND_UPRN_COL]) != NOT_FOUND:
+            skipped += 1
+            continue
+
+        def mark_not_found(reason: str) -> None:
+            df.at[idx, FOUND_UPRN_COL] = NOT_FOUND if given_uprn is None else ""
+            df.at[idx, FOUND_ADDRESS_COL] = NOT_FOUND
+            df.at[idx, SOURCE_COL] = "not_found"
+            unresolved.append(
+                {
+                    "Organisation Reference": ref,
+                    "reason": reason,
+                    "Address": address,
+                    "Postcode": postcode_raw,
+                }
+            )
+
+        # Case B — UPRN present, address missing: reverse-lookup the address.
+        if given_uprn is not None and not address:
+            found: Optional[str] = None
+            if service is not None and postcode_clean:
+                try:
+                    found = reverse_address_from_uprn(
+                        given_uprn, postcode_clean, service, search_cache
+                    )
+                except Exception as exc:
+                    print(f"  reverse failed {ref} {given_uprn}: {exc}")
+            if found:
+                df.at[idx, FOUND_ADDRESS_COL] = found
+                df.at[idx, SOURCE_COL] = "epc_reverse"
+                resolved_addr += 1
+            else:
+                mark_not_found("no address for UPRN")
+            continue
+
+        # Case A — no UPRN, has address: resolve a UPRN.
+        if given_uprn is None and address:
+            if not postcode_clean:
+                mark_not_found("no postcode")
+                continue
+            hit: Optional[Hit] = None
+            if token:
+                try:
+                    hit = resolve_epc_relaxed(address, postcode_clean, epc_cache)
+                except Exception as exc:
+                    print(f"  EPC failed {ref} {postcode_clean}: {exc}")
+            if hit is None and os_api_key:
+                try:
+                    hit = resolve_os_relaxed(address, postcode_clean, os_api_key, os_cache)
+                except Exception as exc:
+                    print(f"  OS failed {ref} {postcode_clean}: {exc}")
+            if hit is not None:
+                uprn, matched, score, source = hit
+                df.at[idx, FOUND_UPRN_COL] = uprn
+                df.at[idx, FOUND_ADDRESS_COL] = matched
+                df.at[idx, SCORE_COL] = round(score, 4)
+                df.at[idx, SOURCE_COL] = source
+                resolved_uprn += 1
+            else:
+                mark_not_found("no UPRN match")
+            if n % 100 == 0:
+                print(
+                    f"[{n}/{total}] resolved={resolved_uprn} not_found={len(unresolved)}"
+                )
+            continue
+
+        # Case C — neither a UPRN nor an address.
+        mark_not_found("no UPRN and no address")
+
+    print(
+        f"\nResolved {resolved_uprn} UPRNs, {resolved_addr} addresses; "
+        f"{skipped} already sorted/done; {len(unresolved)} not found."
+    )
+    return unresolved
+
+
+def _parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--in", dest="inp", type=Path, default=_DEFAULT_IN)
+    parser.add_argument("--out", type=Path, default=_DEFAULT_OUT)
+    parser.add_argument("--unresolved", type=Path, default=_DEFAULT_UNRESOLVED)
+    parser.add_argument("--limit", type=int, default=None, help="process first N rows")
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = _parse_args()
+    _epc_token, os_api_key = load_keys()
+
+    df = pd.read_excel(args.inp, sheet_name=SHEET)
+    if args.limit is not None:
+        df = df.head(args.limit).copy()
+    print(f"Loaded {len(df)} rows from {args.inp} [{SHEET}]")
+
+    unresolved = fill(df, os_api_key=os_api_key)
+
+    df.to_excel(args.out, sheet_name=SHEET, index=False)
+    print(f"Wrote filled sheet -> {args.out}")
+    if unresolved:
+        pd.DataFrame(unresolved).to_csv(args.unresolved, index=False)
+        print(f"Wrote {len(unresolved)} unresolved rows -> {args.unresolved}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/finalise_to_property_table.py b/scripts/finalise_to_property_table.py
new file mode 100644
index 000000000..751e8c59a
--- /dev/null
+++ b/scripts/finalise_to_property_table.py
@@ -0,0 +1,331 @@
+"""Insert resolved manipulation_filled rows into the FE-owned ``property`` table.
+
+Reuses the bulk_upload_finaliser's own row->PropertyIdentityInsert mapping
+(``BulkUploadFinaliserOrchestrator._row_to_insert``) and the same
+``PropertyPostgresRepository.insert_all`` the Lambda uses, so a row inserted here
+is identical to one the real finaliser would write. The status-writer /
+property_overrides path is skipped — this only populates ``property`` (no
+BulkUpload task needed).
+
+Insert is ON CONFLICT (portfolio_id, uprn) DO NOTHING, so re-running is safe.
+
+    # one random resolved row into portfolio 796, then read it back
+    python -m scripts.finalise_to_property_table --portfolio 796 --one
+
+    # a specific Organisation Reference
+    python -m scripts.finalise_to_property_table --portfolio 796 --ref 56100000101
+
+    # the whole sheet (resolved rows only by default; --include-unmatched to add
+    # null-UPRN rows too)
+    python -m scripts.finalise_to_property_table --portfolio 796 --all
+
+Postgres target comes from the root .env (POSTGRES_*). Run from the worktree root.
+"""
+
+from __future__ import annotations
+
+import argparse
+import os
+import sys
+from pathlib import Path
+from typing import Optional
+
+import pandas as pd
+from dotenv import load_dotenv
+from sqlmodel import select
+
+_REPO_ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
+
+from infrastructure.postgres.config import PostgresConfig  # noqa: E402
+from infrastructure.postgres.engine import commit_scope, make_engine, make_session  # noqa: E402
+from infrastructure.postgres.property_table import PropertyRow  # noqa: E402
+from orchestration.bulk_upload_finaliser_orchestrator import (  # noqa: E402
+    BulkUploadFinaliserOrchestrator,
+)
+from repositories.property.property_postgres_repository import (  # noqa: E402
+    PropertyPostgresRepository,
+)
+from repositories.property.property_repository import PropertyIdentityInsert  # noqa: E402
+from scripts.fill_domna_addresses import (  # noqa: E402
+    ADDRESS_COL,
+    FOUND_ADDRESS_COL,
+    FOUND_UPRN_COL,
+    POSTCODE_COL,
+    REF_COL,
+    SCORE_COL,
+    SHEET,
+    UPRN_COL,
+    NOT_FOUND,
+    cell_str,
+    parse_uprn_cell,
+)
+
+_DEFAULT_IN = _REPO_ROOT / "scripts" / "manipulation_filled.xlsx"
+
+
+def _final_uprn(row: pd.Series) -> Optional[int]:
+    """The authoritative UPRN: the given one, else the DOMNA-found one."""
+    given = parse_uprn_cell(row.get(UPRN_COL))
+    if given is not None:
+        return given
+    found = cell_str(row.get(FOUND_UPRN_COL))
+    if found and found != NOT_FOUND:
+        return parse_uprn_cell(found)
+    return None
+
+
+def to_combiner_row(row: pd.Series) -> dict[str, str]:
+    """Map one spreadsheet row to the combiner-output shape the finaliser reads."""
+    given_uprn = parse_uprn_cell(row.get(UPRN_COL))
+    address = cell_str(row.get(ADDRESS_COL))
+    uprn = _final_uprn(row)
+
+    domna_addr = cell_str(row.get(FOUND_ADDRESS_COL))
+    if domna_addr == NOT_FOUND:
+        domna_addr = ""
+    # Matched address: the resolved one when we found it, else the given address
+    # (for rows that already had a UPRN + address).
+    matched = domna_addr or (address if given_uprn is not None else "")
+    score = cell_str(row.get(SCORE_COL))
+
+    return {
+        "Address 1": address,
+        "Address 2": "",
+        "Address 3": "",
+        "postcode": cell_str(row.get(POSTCODE_COL)),
+        "Internal Reference": cell_str(row.get(REF_COL)),
+        "address2uprn_uprn": "" if uprn is None else str(uprn),
+        "address2uprn_address": matched,
+        "address2uprn_lexiscore": score,
+    }
+
+
+def load_rows(
+    path: Path, *, include_unmatched: bool
+) -> tuple[pd.DataFrame, list[dict[str, str]]]:
+    """Load the sheet and the combiner rows. By default drop rows with no UPRN."""
+    df = pd.read_excel(path, sheet_name=SHEET)
+    df = df.reset_index(drop=True)
+    if not include_unmatched:
+        keep = df.apply(lambda r: _final_uprn(r) is not None, axis=1)
+        df = df[keep].reset_index(drop=True)
+    rows = [to_combiner_row(r) for _, r in df.iterrows()]
+    return df, rows
+
+
+def dedupe_by_uprn(
+    rows: list[dict[str, str]],
+) -> tuple[list[dict[str, str]], list[dict[str, str]]]:
+    """Keep the first row per UPRN; return (kept, dropped collisions).
+
+    The DB INSERT collapses duplicate (portfolio, uprn) via ON CONFLICT DO
+    NOTHING anyway, so this just makes the collision explicit (the dropped rows
+    are written out for review) rather than letting an arbitrary ref win silently.
+    """
+    seen: set[str] = set()
+    kept: list[dict[str, str]] = []
+    dropped: list[dict[str, str]] = []
+    for row in rows:
+        uprn = row["address2uprn_uprn"]
+        if uprn in seen:
+            dropped.append(row)
+        else:
+            seen.add(uprn)
+            kept.append(row)
+    return kept, dropped
+
+
+# Force-reload teardown order (bottom-up). property_overrides is ON DELETE
+# CASCADE so it clears itself when the property goes; everything below is NO
+# ACTION and must be deleted first, deepest child first.
+#   property -> epc_property -> {these children}
+_EPC_CHILD_TABLES = (
+    "epc_energy_element",
+    "epc_window",
+    "epc_main_heating_detail",
+    "epc_renewable_heat_incentive",
+    "epc_building_part",
+    "epc_flat_details",
+)
+#   property -> {these direct dependents}, deleted after the epc children
+_PROPERTY_DEPENDENTS = ("epc_property", "plan")
+_INSERT_CHUNK = 4000  # 9 cols/row -> well under psycopg2's 65535-param limit
+
+
+def _reset_portfolio(session: object, portfolio_id: int) -> int:
+    """Delete a portfolio's properties and their NO ACTION dependency tree.
+
+    Returns the number of property rows deleted (property_overrides cascade).
+    """
+    from sqlalchemy import text
+
+    pids = "SELECT id FROM property WHERE portfolio_id = :pid"
+    epc_ids = f"SELECT id FROM epc_property WHERE property_id IN ({pids})"
+    for table in _EPC_CHILD_TABLES:
+        session.execute(  # type: ignore[attr-defined]
+            text(f"DELETE FROM {table} WHERE epc_property_id IN ({epc_ids})"),
+            {"pid": portfolio_id},
+        )
+    for table in _PROPERTY_DEPENDENTS:
+        session.execute(  # type: ignore[attr-defined]
+            text(f"DELETE FROM {table} WHERE property_id IN ({pids})"),
+            {"pid": portfolio_id},
+        )
+    result = session.execute(  # type: ignore[attr-defined]
+        text("DELETE FROM property WHERE portfolio_id = :pid"), {"pid": portfolio_id}
+    )
+    return result.rowcount
+
+
+def clean_reload(
+    rows: list[dict[str, str]], portfolio_id: int, *, reset: bool
+) -> tuple[int, int]:
+    """Optionally wipe the portfolio, then chunk-insert rows. One transaction.
+
+    Returns (properties_deleted, properties_inserted).
+    """
+    inserts: list[PropertyIdentityInsert] = [
+        BulkUploadFinaliserOrchestrator._row_to_insert(r, portfolio_id) for r in rows
+    ]
+    engine = _engine()
+    session = make_session(engine)
+    deleted = 0
+    inserted = 0
+    try:
+        repo = PropertyPostgresRepository(session)
+        with commit_scope(session):
+            if reset:
+                deleted = _reset_portfolio(session, portfolio_id)
+            for start in range(0, len(inserts), _INSERT_CHUNK):
+                inserted += repo.insert_all(inserts[start : start + _INSERT_CHUNK])
+    finally:
+        session.close()
+    return deleted, inserted
+
+
+def _engine():
+    load_dotenv(_REPO_ROOT / ".env")
+    return make_engine(PostgresConfig.from_env(os.environ))
+
+
+def insert_rows(rows: list[dict[str, str]], portfolio_id: int) -> int:
+    """Insert via the finaliser's mapper + repository. Returns rows inserted."""
+    inserts: list[PropertyIdentityInsert] = [
+        BulkUploadFinaliserOrchestrator._row_to_insert(r, portfolio_id) for r in rows
+    ]
+    engine = _engine()
+    session = make_session(engine)
+    try:
+        repo = PropertyPostgresRepository(session)
+        with commit_scope(session):
+            inserted = repo.insert_all(inserts)
+    finally:
+        session.close()
+    return inserted
+
+
+def fetch_by_ref(portfolio_id: int, ref: str) -> list[PropertyRow]:
+    """Read back inserted rows for one Organisation Reference (for verification)."""
+    engine = _engine()
+    session = make_session(engine)
+    try:
+        stmt = select(PropertyRow).where(
+            PropertyRow.portfolio_id == portfolio_id,
+            PropertyRow.landlord_property_id == ref,
+        )
+        return list(session.exec(stmt).all())
+    finally:
+        session.close()
+
+
+def _show(row: dict[str, str], insert: PropertyIdentityInsert) -> None:
+    print("\nSource (combiner) row:")
+    for k, v in row.items():
+        print(f"  {k}: {v!r}")
+    print("\nMapped PropertyIdentityInsert:")
+    for k, v in insert.__dict__.items():
+        print(f"  {k}: {v!r}")
+
+
+def _parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--in", dest="inp", type=Path, default=_DEFAULT_IN)
+    parser.add_argument("--portfolio", type=int, required=True)
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument("--one", action="store_true", help="one random resolved row")
+    group.add_argument("--ref", help="a specific Organisation Reference")
+    group.add_argument("--all", action="store_true", help="every row")
+    parser.add_argument(
+        "--include-unmatched",
+        action="store_true",
+        help="also insert rows with no UPRN (null-UPRN property rows)",
+    )
+    parser.add_argument(
+        "--reset",
+        action="store_true",
+        help="(with --all) DELETE all properties in the portfolio first "
+        "(cascades property_overrides; clears plan/epc_property)",
+    )
+    parser.add_argument(
+        "--collisions",
+        type=Path,
+        default=_REPO_ROOT / "scripts" / "manipulation_collisions.csv",
+        help="where to write rows dropped as duplicate-UPRN collisions",
+    )
+    parser.add_argument("--seed", type=int, default=0, help="random seed for --one")
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = _parse_args()
+    df, rows = load_rows(args.inp, include_unmatched=args.include_unmatched)
+    print(f"Loaded {len(rows)} candidate rows from {args.inp}")
+
+    if args.all:
+        kept, dropped = dedupe_by_uprn(rows)
+        if dropped:
+            pd.DataFrame(dropped).to_csv(args.collisions, index=False)
+            print(
+                f"{len(dropped)} duplicate-UPRN rows dropped -> {args.collisions} "
+                f"({len(kept)} unique to insert)"
+            )
+        deleted, inserted = clean_reload(kept, args.portfolio, reset=args.reset)
+        if args.reset:
+            print(f"Deleted {deleted} existing properties in portfolio {args.portfolio}.")
+        print(f"Inserted {inserted} properties into portfolio {args.portfolio}.")
+        return 0
+
+    # Single-row paths: pick the row, show the mapping, insert, read back.
+    if args.ref:
+        match = [r for r in rows if r["Internal Reference"] == args.ref]
+        if not match:
+            print(f"No resolved row with Organisation Reference {args.ref!r}.")
+            return 1
+        row = match[0]
+    else:  # --one: deterministic "random" pick via seed
+        idx = (args.seed * 7919) % len(rows)
+        row = rows[idx]
+
+    ref = row["Internal Reference"]
+    insert = BulkUploadFinaliserOrchestrator._row_to_insert(row, args.portfolio)
+    _show(row, insert)
+
+    inserted = insert_rows([row], args.portfolio)
+    print(
+        f"\ninsert_all -> {inserted} new row(s) "
+        f"(0 means it already existed; ON CONFLICT DO NOTHING)."
+    )
+
+    print(f"\nproperty rows for portfolio {args.portfolio}, ref {ref!r}:")
+    for pr in fetch_by_ref(args.portfolio, ref):
+        print(
+            f"  id={pr.id} uprn={pr.uprn} address={pr.address!r} "
+            f"postcode={pr.postcode!r} status={pr.creation_status} "
+            f"lexiscore={pr.lexiscore}"
+        )
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/hyde/RESUME_AFTER_KHALIM.md b/scripts/hyde/RESUME_AFTER_KHALIM.md
new file mode 100644
index 000000000..f29275774
--- /dev/null
+++ b/scripts/hyde/RESUME_AFTER_KHALIM.md
@@ -0,0 +1,44 @@
+# Resume prompt — finish the Hyde portfolio-796 property_overrides run (after Khalim review)
+
+Paste the block below to continue. It tells the assistant to review the unknown-override
+decisions with me, verify them, confirm before writing, then run the remaining steps.
+
+---
+
+We paused the Hyde property-overrides bulk load to review the UNKNOWN classifications with
+Khalim. Pick it back up.
+
+**Context (already done):**
+- Target is **portfolio 796** in DevAssessmentModelDB (NOT 795 — 795 is empty).
+- Script: `scripts/hyde/build_property_overrides.py`. Pass 1 (`classify`) is DONE — the
+  `landlord_*_overrides` ledger is populated; re-running classify is free (cache hits).
+- The 19 unresolved descriptions are documented in `scripts/hyde/unknowns_review.md`, with
+  proposed values already written to `overrides_edits.csv` (gitignored).
+- Env (DB creds + `OPENAI_API_KEY`) is in `/workspaces/home/github/Model/.env`; load it with
+  python-dotenv and set `POSTGRES_DRIVER=psycopg2`. Writes are idempotent upserts (unique on
+  `property_id, override_component, building_part`) — safe to re-run, never duplicates.
+
+**Do this, in order:**
+1. **Ask me what Khalim decided** for the unknowns. The one real judgement call is the
+   flat-roof reading: `Flat: As Built` (1,172 rows) + `Flat: Unknown` (194) → which of
+   `Flat, no insulation (assumed)` / `Flat, insulated (assumed)` / `Flat, limited insulation
+   (assumed)`. The `construction_age_band` bands (29,829 rows) are deterministic (band = first
+   letter) — keep as-is unless I say otherwise. Confirm the other roof/wall proposals too.
+2. **Update `overrides_edits.csv`** (`corrected_value` column) to match Khalim's decisions.
+3. Run `validate --edits overrides_edits.csv` and fix anything it rejects.
+4. **Show me the final edits + the planned write counts, and WAIT for my explicit go-ahead
+   before any `--apply`.** Do not write to the DB before I confirm.
+5. On my go-ahead:
+   - `apply-edits --edits overrides_edits.csv --portfolio-id 796 --apply` (user corrections → ledger)
+   - `write --excel scripts/hyde/hyde_property_overrides.xlsx --portfolio-id 796` (DRY RUN —
+     report unmatched org_refs + unresolved across all 31,773 first)
+   - then the same `write ... --apply`
+6. `verify --portfolio-id 796 --org-ref <a few org_refs>` to confirm property_overrides +
+   overlays landed.
+7. Remind me about the deferred **age-classifier prompt-hint fix** for the production lambda
+   (the live frontend will hit the same `"D: 1950-1966"` → UNKNOWN until that lands).
+
+Every DB command loads env from `/workspaces/home/github/Model/.env`. Read-only checks
+(`verify`, dry-run `write`) are fine to run unprompted; anything `--apply` needs my confirm.
+
+---
diff --git a/scripts/hyde/build_10070004512.py b/scripts/hyde/build_10070004512.py
new file mode 100644
index 000000000..2210242ae
--- /dev/null
+++ b/scripts/hyde/build_10070004512.py
@@ -0,0 +1,288 @@
+"""Elmhurst build for UPRN 10070004512 (SAP-Schema-16.0, GROUND-FLOOR FLAT,
+band B, cavity FILLED, ELECTRIC STORAGE HEATERS (SAP 402 SEB, manual charge
+control CSA/2401) + electric immersion off-peak (Economy-7 Dual meter) with a
+cylinder (size 1), roof = another dwelling above, floor to EXTERNAL AIR, double
+glazed, TFA 33.24, window 4.88 m². Engine 66 = lodged 66.
+
+P1 of the modelling_e2e corpus validation — the built_form fix cert (16.0 omitted
+built_form; mapper derives it from dwelling_type → flat→modal 4). built_form is
+ML-only so SAP-neutral; engine reproduces lodged exactly. Storage-heater build
+(see build_10022893721.py). Engine models NO secondary (sap_heating.
+secondary_heating_type is None) → secondary present=No to match. Run:
+    DISPLAY=:99 python scripts/hyde/build_10070004512.py <page>
+"""
+from __future__ import annotations
+import sys
+import elmhurst_lib as E
+
+DIM = "TabContainer_TabPanelMain_WebUserControlDimensionsMain_"
+WALL = ("TabContainer_TabPanelMain_InnerTabContainerMain_"
+        "TabPanelExternalWallMain_WebUserControlWallMain_")
+ROOF = "TabContainer_TabPanelMain_WebUserControlRoofMain_"
+FLOOR = "TabContainer_TabPanelMain_WebUserControlFloorsMain_"
+WP = "TabContainer_TabPanelWindowsPanel_"
+DP = "TabContainer_TabPanelDoorsPanel_"
+VP = "TabContainer_TabPanelVentilationPanel_"
+APT = "TabContainer_TabPanelAirPressureTest_"
+LP = "TabContainer_TabPanelLighting_"
+MV = "TabContainer_TabPanelMechVent_"
+WH = "TabContainer_TabPanelWaterHeating_"
+
+
+def _pick(page, suffix, contains):
+    val = page.evaluate(
+        """(a)=>{const s=document.getElementById(a[0]);if(!s)return null;
+        for(const o of s.options){if(o.text.toLowerCase().includes(a[1].toLowerCase()))return o.value;}return null;}""",
+        [f"{E.FP}{suffix}", contains])
+    if val is not None:
+        E.set_select(page, suffix, val)
+    return val
+
+
+def _options(page, suffix):
+    return page.evaluate(
+        """(id)=>{const s=document.getElementById(id);if(!s)return [];
+        return Array.from(s.options).map(o=>o.text);}""", f"{E.FP}{suffix}")
+
+
+def property_description(page):
+    E.goto(page, "PropertyDescription", "WebFormPropertyDescription.aspx")
+    E.set_select(page, "DropDownListPropertyType1", "F Flat")
+    _pick(page, "DropDownListPropertyType2", "mid-terrace")  # built_form 4
+    E.set_text(page, "TextBoxStoreys", "1")
+    E.set_text(page, "TextBoxHabitableRooms", "2")
+    E.set_text(page, "TextBoxHeatedHabitableRooms", "2")
+    print("date ->", _pick(page, "DropDownListDateBuiltMain", "1900-1929"))  # band B
+    E.set_select(page, "DropDownListDateBuiltFirst", "")
+    E.set_select(page, "DropDownListRoomInRoofMain", "")
+    E.save_close(page)
+
+
+def flats(page):
+    E.goto(page, "Flats", "WebFormFlats.aspx")
+    E.set_select(page, "DropDownListPositionOfFlat", "Ground Floor")
+    E.set_text(page, "TextBoxFloor", "0")
+    E.set_select(page, "RadioButtonListFlatCoridor", "None")
+    E.save_close(page)
+
+
+def dimensions(page):
+    E.goto(page, "Dimensions", "WebFormDimensions.aspx")
+    E.set_text(page, f"{DIM}TextBoxFloorAreaLowestFloor", "33.24")
+    E.set_text(page, f"{DIM}TextBoxRoomHeightLowestFloor", "2.42")
+    E.set_text(page, f"{DIM}TextBoxWallPerimeterLowestFloor", "10.39")
+    # 16.0 lodges no party_wall_length; a flat's side party walls are unmodelled by
+    # the engine. Try 0 (Elmhurst may require non-zero — adjust if Recommendations
+    # complains).
+    E.set_text(page, f"{DIM}TextBoxPartyWallLengthLowestFloor", "0")
+    E.save_close(page)
+
+
+def walls(page):
+    E.goto(page, "Walls", "WebFormWalls.aspx")
+    E.set_select(page, f"{WALL}DropDownListType", "CA Cavity")
+    page.wait_for_timeout(400)
+    print("insulation ->", _pick(page, f"{WALL}DropDownListInsulation", "filled"))
+    E.save_close(page)
+
+
+def roofs(page):
+    E.goto(page, "Roofs", "WebFormRoofs.aspx")
+    _pick(page, f"{ROOF}DropDownListType", "another dwelling above")
+    E.save_close(page)
+
+
+def floors(page):
+    E.goto(page, "Floors", "WebFormFloors.aspx")
+    # Floor is "to external air" — that is the LOCATION/exposure, not a TYPE.
+    _pick(page, f"{FLOOR}DropDownListLocation", "external air")  # E To external air
+    page.wait_for_timeout(400)
+    _pick(page, f"{FLOOR}DropDownListType", "solid")  # construction; U from exposure
+    ins = page.locator(f"#{E.FP}{FLOOR}DropDownListInsulation")
+    if ins.count():
+        E.set_select(page, f"{FLOOR}DropDownListInsulation", "A As built")
+    E.save_close(page)
+
+
+def openings(page):
+    E.goto(page, "Openings", "WebFormOpenings.aspx")
+    E.click_tab(page, "TabContainer_TabPanelWindowsPanel")
+    _add_window(page, 4.88, "North", _glazing(page))
+    _delete_zero_rows(page)
+    E.click_tab(page, "TabContainer_TabPanelDoorsPanel")
+    E.set_text(page, f"{DP}TextBoxDoors", "1")
+    E.set_text(page, f"{DP}TextBoxDoorsInsulated", "0")
+    E.set_text(page, f"{DP}TextBoxDraughtProofedDoors", "0")
+    E.save_close(page)
+
+
+def _glazing(page):
+    for needle in ("unknown install date", "before 2002", "pre 2002"):
+        for opt in _options(page, f"{WP}DropDownListExtGlazing"):
+            low = opt.lower()
+            if needle in low and "triple" not in low and "single" not in low and "known data" not in low:
+                return opt
+    return "Double post or during 2022"
+
+
+def _add_window(page, area, orientation, glazing):
+    print("glazing ->", glazing)
+    E.set_select(page, f"{WP}DropDownListExtGlazing", glazing)
+    page.wait_for_timeout(400)
+    ft = page.locator(f"#{E.FP}{WP}DropDownListExtFrameType")
+    if ft.count():
+        ft.select_option("PVC")
+    gg = page.locator(f"#{E.FP}{WP}DropDownListExtGlazingGap")
+    if gg.count():
+        gg.select_option("12 mm")
+    wid = f"{E.FP}{WP}TextBoxExtWidth"
+    page.evaluate(
+        """(a)=>{const e=document.getElementById(a[0]);if(e){e.value=a[1];
+        e.dispatchEvent(new Event('input',{bubbles:true}));
+        e.dispatchEvent(new Event('change',{bubbles:true}));
+        e.dispatchEvent(new Event('blur',{bubbles:true}));}}""", [wid, str(area)])
+    page.locator(f"#{E.FP}{WP}TextBoxExtHeight").fill("1.00")
+    page.locator(f"#{E.FP}{WP}DropDownListExtOrientation").select_option(orientation)
+    page.locator(f"#{E.FP}{WP}DropDownListExtBuildingPartId").select_option("Main")
+    page.locator(f"#{E.FP}{WP}DropDownListExtLocation").select_option("External wall")
+    page.wait_for_timeout(300)
+    before = E.window_row_count(page)
+    page.evaluate("(id)=>{const e=document.getElementById(id); if(e)e.click();}", f"{E.FP}{WP}ButtonAddWindow")
+    for _ in range(25):
+        page.wait_for_timeout(200)
+        if E.window_row_count(page) > before:
+            break
+
+
+def _grid_rows(page):
+    return page.evaluate(
+        """()=>{const t=document.querySelector("[id*=GridViewExtendedWidows]");
+        if(!t)return[];return Array.from(t.querySelectorAll('tr')).slice(1)
+        .map(r=>Array.from(r.querySelectorAll('td')).map(c=>c.innerText.trim()));}""")
+
+
+def _delete_zero_rows(page):
+    g = 0
+    while g < 6 and E.window_row_count(page) > 1:
+        g += 1
+        rows = _grid_rows(page)
+        bad = next((i for i, c in enumerate(rows) if len(c) > 1 and c[1] in ("0.00", "0", "0.0")), None)
+        if bad is None:
+            break
+        _delete_row(page, bad)
+        page.wait_for_timeout(400)
+
+
+def _delete_row(page, idx):
+    before = E.window_row_count(page)
+    btn = page.evaluate(
+        """(i)=>{const b=document.querySelectorAll("[id*='GridViewExtendedWidows_DeleteButton_']");return b[i]?b[i].id:null;}""", idx)
+    if not btn:
+        return
+    page.evaluate("(id)=>{const e=document.getElementById(id); if(e)e.click();}", btn)
+    page.wait_for_selector(f"#{E.FP}DeleteWindowDialog_LinkButtonYes", state="visible", timeout=5000)
+    page.evaluate("(id)=>{const e=document.getElementById(id); if(e)e.click();}", f"{E.FP}DeleteWindowDialog_LinkButtonYes")
+    for _ in range(20):
+        page.wait_for_timeout(200)
+        if E.window_row_count(page) < before:
+            break
+
+
+def ventilation(page):
+    E.goto(page, "VentilationAndCooling", "WebFormVentilationAndCooling.aspx")
+    E.click_tab(page, "TabContainer_TabPanelVentilationPanel")
+    E.set_text(page, f"{VP}TextBoxIntermittentFans", "0")
+    cool = page.locator(f"#{E.FP}{VP}CheckBoxFixedSpaceCooling")
+    if cool.count() and cool.is_checked():
+        E.commit(page, cool.uncheck)
+    E.click_tab(page, "TabContainer_TabPanelMechVent")
+    mv = page.locator(f"#{E.FP}{MV}CheckBoxMechanicalVentilation")
+    if mv.count() and mv.is_checked():
+        E.commit(page, mv.uncheck)
+    E.click_tab(page, "TabContainer_TabPanelAirPressureTest")
+    E.set_select(page, f"{APT}DropDownListTestMethod", "Not available")
+    E.click_tab(page, "TabContainer_TabPanelLighting")
+    E.set_text(page, f"{LP}TextBoxLightsTotal", "5")
+    E.set_text(page, f"{LP}TextBoxLedLightsTotal", "5")  # 100% low energy
+    E.set_text(page, f"{LP}TextBoxCflLightsTotal", "0")
+    E.save_close(page)
+
+
+def space_heating(page):
+    # Electric storage heaters (SAP 402 = SEB), manual charge control (SAP 2401 =
+    # CSA). Two passes: clear bound PCDB boiler first, then set the SAP-table code.
+    E.goto(page, "SpaceHeating", "WebFormSpaceHeating.aspx")
+    page.wait_for_timeout(1000)
+    rid = f"{E.MH1}TextBoxPCDFBoilerReference"
+    ref = page.locator(f"#{rid}").input_value()
+    if ref not in ("0", ""):
+        print(f"clearing bound PCDB boiler {ref} -> 0 (rerun space_heating)")
+        page.evaluate("""(rid)=>{const r=document.getElementById(rid);r.value='0';
+          r.dispatchEvent(new Event('change',{bubbles:true}));}""", rid)
+        page.wait_for_timeout(500)
+        E.save_close(page)
+        return
+    E.set_heating_dialog(page, "TabContainer_TabPanelMainHeating1_WebUserControlMainHeating1_ButtonMainHeatingCode",
+                         "^Electric", "^Electric", "Storage", "SEB Modern slimline")
+    print("code:", page.locator(f"#{E.MH1}TextBoxMainHeatingCode").input_value())
+    E.set_heating_dialog(page, "TabContainer_TabPanelMainHeating1_WebUserControlMainHeating1_ButtonMainHeatingControls",
+                         "Storage Radiator", "CSA Manual charge control")
+    print("control:", page.locator(f"#{E.MH1}TextBoxMainHeatingControls").input_value())
+    E.set_select(page, "DropDownListSecondaryHeatingPresent", "No")
+    # Economy-7 Dual meter (cert meter_type 1) — hidden Meters sub-tab.
+    E.click_tab(page, "TabContainer_TabPanelMeters")
+    E.set_select(page, "TabContainer_TabPanelMeters_RadioButtonListElectricityType", "Dual")
+    print("meter:", page.locator("#ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMeters_RadioButtonListElectricityType").input_value())
+    E.save_close(page)
+
+
+def water_heating(page):
+    # Electric immersion off-peak (Dual) WITH cylinder (size 1 = small). The
+    # immersion code REQUIRES a cylinder.
+    E.goto(page, "WaterHeating", "WebFormWaterHeating.aspx")
+    E.click_tab(page, "TabContainer_TabPanelWaterHeating")
+    page.wait_for_timeout(600)
+    E.set_heating_dialog(page, f"{WH}ButtonWaterHeatingCode",
+                         "Water Heater", "^Electric", "Immersion")
+    print("water code:", page.locator(f"#{E.FP}{WH}TextBoxWaterHeatingCode").input_value())
+    cid = f"{E.FP}{WH}CheckBoxHotWaterCylinder"
+    cyl = page.locator(f"#{cid}")
+    if cyl.count() and not cyl.is_checked():
+        try:
+            with page.expect_navigation(wait_until="load", timeout=8000):
+                page.evaluate(
+                    """(id)=>{const c=document.getElementById(id);if(c){c.checked=true;
+                    c.dispatchEvent(new Event('click',{bubbles:true}));
+                    c.dispatchEvent(new Event('change',{bubbles:true}));}}""", cid)
+        except Exception:
+            page.wait_for_timeout(2000)
+    print("cylinder present:", cyl.is_checked() if cyl.count() else "n/a")
+    print("cyl sizes:", _options(page, f"{WH}DropDownListCylinderSize"))
+    _pick(page, f"{WH}DropDownListCylinderSize", "small") or \
+        E.set_select(page, f"{WH}DropDownListCylinderSize", "Normal")
+    E.set_select(page, f"{WH}DropDownListInsulated", "Foam")
+    isuf = f"{WH}DropDownListInsulationThickness"
+    if page.locator(f"#{E.FP}{isuf}").count():
+        _pick(page, isuf, "Unknown") or E.set_select(page, isuf, "25 mm")
+    imm = page.locator(f"#{E.FP}{WH}RadioButtonListImmersionHeater")
+    if imm.count():
+        E.set_select(page, f"{WH}RadioButtonListImmersionHeater", "Dual")
+    E.save_close(page)
+
+
+_ORDER = ["property_description", "flats", "dimensions", "walls", "roofs",
+          "floors", "openings", "ventilation", "space_heating", "water_heating"]
+
+
+def main():
+    if len(sys.argv) < 2 or sys.argv[1] not in _ORDER:
+        print("usage: build_10070004512.py <" + "|".join(_ORDER) + ">")
+        return 2
+    with E.session() as (ctx, page):
+        globals()[sys.argv[1]](page)
+        print("done:", sys.argv[1], "->", page.url)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/scripts/hyde/build_22086693.py b/scripts/hyde/build_22086693.py
new file mode 100644
index 000000000..5f102a45c
--- /dev/null
+++ b/scripts/hyde/build_22086693.py
@@ -0,0 +1,307 @@
+"""Elmhurst build for UPRN 22086693 (RdSAP-Schema-20.0.0, SEMI-DETACHED HOUSE,
+2-storey, band C 1930-1949, cavity UNINSULATED, mains-gas COMBI (no PCDB index →
+generic SAP Table 4b combi), control 2106 (CBE), pitched 200 mm loft, suspended
+uninsulated floor, party wall 6.8 m, double glazed, 2× PV ARRAYS @1.14 kW
+(orientations SE/SW, pitch 30°, overshading modest), electric SECONDARY room
+heater (SAP 691 REA), TFA ~74, window 11.84 m². Engine 66 / lodged 72.
+
+P2 of the modelling_e2e corpus validation — the photovoltaic_supply-as-list fix
+cert. The PV adds +5 (engine 61→66) so it IS credited; the −6 vs lodged is a
+fabric/heating gap to localise. NEW build elements: generic (no-PCDB) combi +
+the Renewables/PV page. Run:
+    DISPLAY=:99 python scripts/hyde/build_22086693.py <page>
+"""
+from __future__ import annotations
+import sys
+import elmhurst_lib as E
+
+DIM = "TabContainer_TabPanelMain_WebUserControlDimensionsMain_"
+WALL = ("TabContainer_TabPanelMain_InnerTabContainerMain_"
+        "TabPanelExternalWallMain_WebUserControlWallMain_")
+PWALL = "TabContainer_TabPanelMain_InnerTabContainerMain_TabPanelPartyWallMain_WebUserControlPartyWallMain_"
+ROOF = "TabContainer_TabPanelMain_WebUserControlRoofMain_"
+FLOOR = "TabContainer_TabPanelMain_WebUserControlFloorsMain_"
+WP = "TabContainer_TabPanelWindowsPanel_"
+DP = "TabContainer_TabPanelDoorsPanel_"
+VP = "TabContainer_TabPanelVentilationPanel_"
+APT = "TabContainer_TabPanelAirPressureTest_"
+LP = "TabContainer_TabPanelLighting_"
+MV = "TabContainer_TabPanelMechVent_"
+WH = "TabContainer_TabPanelWaterHeating_"
+MH1B = "TabContainer_TabPanelMainHeating1_WebUserControlMainHeating1_"
+
+
+def _pick(page, suffix, contains):
+    val = page.evaluate(
+        """(a)=>{const s=document.getElementById(a[0]);if(!s)return null;
+        for(const o of s.options){if(o.text.toLowerCase().includes(a[1].toLowerCase()))return o.value;}return null;}""",
+        [f"{E.FP}{suffix}", contains])
+    if val is not None:
+        E.set_select(page, suffix, val)
+    return val
+
+
+def _options(page, suffix):
+    return page.evaluate(
+        """(id)=>{const s=document.getElementById(id);if(!s)return [];
+        return Array.from(s.options).map(o=>o.text);}""", f"{E.FP}{suffix}")
+
+
+def property_description(page):
+    E.goto(page, "PropertyDescription", "WebFormPropertyDescription.aspx")
+    E.set_select(page, "DropDownListPropertyType1", "H House")
+    _pick(page, "DropDownListPropertyType2", "semi")  # built_form 2
+    E.set_text(page, "TextBoxStoreys", "2")
+    E.set_text(page, "TextBoxHabitableRooms", "4")
+    E.set_text(page, "TextBoxHeatedHabitableRooms", "4")
+    print("date ->", _pick(page, "DropDownListDateBuiltMain", "1930-1949"))  # band C
+    E.set_select(page, "DropDownListDateBuiltFirst", "")
+    E.set_select(page, "DropDownListRoomInRoofMain", "")
+    E.save_close(page)
+
+
+def dimensions(page):
+    E.goto(page, "Dimensions", "WebFormDimensions.aspx")
+    E.set_text(page, f"{DIM}TextBoxFloorAreaLowestFloor", "36.86")
+    E.set_text(page, f"{DIM}TextBoxRoomHeightLowestFloor", "2.30")
+    E.set_text(page, f"{DIM}TextBoxWallPerimeterLowestFloor", "13.4")
+    E.set_text(page, f"{DIM}TextBoxPartyWallLengthLowestFloor", "6.8")
+    E.set_text(page, f"{DIM}TextBoxFloorArea1stFloor", "36.86")
+    E.set_text(page, f"{DIM}TextBoxRoomHeight1stFloor", "2.30")
+    E.set_text(page, f"{DIM}TextBoxWallPerimeter1stFloor", "17.4")
+    E.set_text(page, f"{DIM}TextBoxPartyWallLength1stFloor", "6.8")
+    E.save_close(page)
+
+
+def walls(page):
+    E.goto(page, "Walls", "WebFormWalls.aspx")
+    E.set_select(page, f"{WALL}DropDownListType", "CA Cavity")
+    page.wait_for_timeout(400)
+    print("insulation ->", _pick(page, f"{WALL}DropDownListInsulation", "as built"))  # uninsulated
+    # Semi party wall: cavity. Match "masonry filled" → CF (U≈0); avoid loose "filled".
+    pw = _pick(page, f"{PWALL}DropDownListPartyWallType", "masonry filled") \
+        or _pick(page, f"{PWALL}DropDownListPartyWallType", "determine")
+    print("party wall ->", pw)
+    E.save_close(page)
+
+
+def roofs(page):
+    E.goto(page, "Roofs", "WebFormRoofs.aspx")
+    _pick(page, f"{ROOF}DropDownListType", "access to loft")
+    _pick(page, f"{ROOF}DropDownListInsulationAt", "joists")
+    E.set_select(page, f"{ROOF}DropDownListThickness", "200 mm")
+    E.save_close(page)
+
+
+def floors(page):
+    E.goto(page, "Floors", "WebFormFloors.aspx")
+    E.set_select(page, f"{FLOOR}DropDownListLocation", "G Ground  floor")
+    _pick(page, f"{FLOOR}DropDownListType", "suspended timber")
+    E.set_select(page, f"{FLOOR}DropDownListInsulation", "A As built")
+    E.save_close(page)
+
+
+def openings(page):
+    E.goto(page, "Openings", "WebFormOpenings.aspx")
+    E.click_tab(page, "TabContainer_TabPanelWindowsPanel")
+    _add_window(page, 11.84, "North", _glazing(page))
+    _delete_zero_rows(page)
+    E.click_tab(page, "TabContainer_TabPanelDoorsPanel")
+    E.set_text(page, f"{DP}TextBoxDoors", "1")
+    E.set_text(page, f"{DP}TextBoxDoorsInsulated", "0")
+    E.set_text(page, f"{DP}TextBoxDraughtProofedDoors", "0")
+    E.save_close(page)
+
+
+def _glazing(page):
+    for needle in ("unknown install date", "before 2002", "pre 2002"):
+        for opt in _options(page, f"{WP}DropDownListExtGlazing"):
+            low = opt.lower()
+            if needle in low and "triple" not in low and "single" not in low and "known data" not in low:
+                return opt
+    return "Double post or during 2022"
+
+
+def _add_window(page, area, orientation, glazing):
+    print("glazing ->", glazing)
+    E.set_select(page, f"{WP}DropDownListExtGlazing", glazing)
+    page.wait_for_timeout(400)
+    ft = page.locator(f"#{E.FP}{WP}DropDownListExtFrameType")
+    if ft.count():
+        ft.select_option("PVC")
+    gg = page.locator(f"#{E.FP}{WP}DropDownListExtGlazingGap")
+    if gg.count():
+        gg.select_option("12 mm")
+    wid = f"{E.FP}{WP}TextBoxExtWidth"
+    page.evaluate(
+        """(a)=>{const e=document.getElementById(a[0]);if(e){e.value=a[1];
+        e.dispatchEvent(new Event('input',{bubbles:true}));
+        e.dispatchEvent(new Event('change',{bubbles:true}));
+        e.dispatchEvent(new Event('blur',{bubbles:true}));}}""", [wid, str(area)])
+    page.locator(f"#{E.FP}{WP}TextBoxExtHeight").fill("1.00")
+    page.locator(f"#{E.FP}{WP}DropDownListExtOrientation").select_option(orientation)
+    page.locator(f"#{E.FP}{WP}DropDownListExtBuildingPartId").select_option("Main")
+    page.locator(f"#{E.FP}{WP}DropDownListExtLocation").select_option("External wall")
+    page.wait_for_timeout(300)
+    before = E.window_row_count(page)
+    page.evaluate("(id)=>{const e=document.getElementById(id); if(e)e.click();}", f"{E.FP}{WP}ButtonAddWindow")
+    for _ in range(25):
+        page.wait_for_timeout(200)
+        if E.window_row_count(page) > before:
+            break
+
+
+def fix_window(page):
+    """Edit-in-place: overwrite the shared assessment's leftover window width to ours."""
+    E.goto(page, "Openings", "WebFormOpenings.aspx")
+    E.click_tab(page, "TabContainer_TabPanelWindowsPanel")
+    page.wait_for_timeout(800)
+    wid = f"{E.FP}{WP}TextBoxExtWidth"
+    page.evaluate("""(a)=>{const e=document.getElementById(a[0]);if(e){e.value=a[1];
+        e.dispatchEvent(new Event('input',{bubbles:true}));
+        e.dispatchEvent(new Event('change',{bubbles:true}));
+        e.dispatchEvent(new Event('blur',{bubbles:true}));}}""", [wid, "11.84"])
+    print("window width now:", page.locator(f"#{wid}").input_value())
+    E.save_close(page)
+
+
+def _grid_rows(page):
+    return page.evaluate(
+        """()=>{const t=document.querySelector("[id*=GridViewExtendedWidows]");
+        if(!t)return[];return Array.from(t.querySelectorAll('tr')).slice(1)
+        .map(r=>Array.from(r.querySelectorAll('td')).map(c=>c.innerText.trim()));}""")
+
+
+def _delete_zero_rows(page):
+    g = 0
+    while g < 6 and E.window_row_count(page) > 1:
+        g += 1
+        rows = _grid_rows(page)
+        bad = next((i for i, c in enumerate(rows) if len(c) > 1 and c[1] in ("0.00", "0", "0.0")), None)
+        if bad is None:
+            break
+        _delete_row(page, bad)
+        page.wait_for_timeout(400)
+
+
+def _delete_row(page, idx):
+    before = E.window_row_count(page)
+    btn = page.evaluate(
+        """(i)=>{const b=document.querySelectorAll("[id*='GridViewExtendedWidows_DeleteButton_']");return b[i]?b[i].id:null;}""", idx)
+    if not btn:
+        return
+    page.evaluate("(id)=>{const e=document.getElementById(id); if(e)e.click();}", btn)
+    page.wait_for_selector(f"#{E.FP}DeleteWindowDialog_LinkButtonYes", state="visible", timeout=5000)
+    page.evaluate("(id)=>{const e=document.getElementById(id); if(e)e.click();}", f"{E.FP}DeleteWindowDialog_LinkButtonYes")
+    for _ in range(20):
+        page.wait_for_timeout(200)
+        if E.window_row_count(page) < before:
+            break
+
+
+def ventilation(page):
+    E.goto(page, "VentilationAndCooling", "WebFormVentilationAndCooling.aspx")
+    E.click_tab(page, "TabContainer_TabPanelVentilationPanel")
+    E.set_text(page, f"{VP}TextBoxIntermittentFans", "0")
+    cool = page.locator(f"#{E.FP}{VP}CheckBoxFixedSpaceCooling")
+    if cool.count() and cool.is_checked():
+        E.commit(page, cool.uncheck)
+    E.click_tab(page, "TabContainer_TabPanelMechVent")
+    mv = page.locator(f"#{E.FP}{MV}CheckBoxMechanicalVentilation")
+    if mv.count() and mv.is_checked():
+        E.commit(page, mv.uncheck)
+    E.click_tab(page, "TabContainer_TabPanelAirPressureTest")
+    E.set_select(page, f"{APT}DropDownListTestMethod", "Not available")
+    E.click_tab(page, "TabContainer_TabPanelLighting")
+    E.set_text(page, f"{LP}TextBoxLightsTotal", "10")
+    E.set_text(page, f"{LP}TextBoxLedLightsTotal", "10")  # 100% LED
+    E.set_text(page, f"{LP}TextBoxCflLightsTotal", "0")
+    E.save_close(page)
+
+
+def space_heating(page):
+    # Generic (no-PCDB) mains-gas combi. The shared assessment may carry a prior
+    # cert's storage SEB / PCDB boiler — clear it first if present, then select a
+    # generic gas combi via the boiler dialog. Two passes if a SAP code is bound.
+    E.goto(page, "SpaceHeating", "WebFormSpaceHeating.aspx")
+    page.wait_for_timeout(1000)
+    # Pass 1: clear a leftover SAP-table MainHeatingCode (e.g. SEB) so the boiler
+    # search/dialog is usable.
+    mhc = page.locator(f"#{E.MH1}TextBoxMainHeatingCode")
+    code = mhc.input_value() if mhc.count() else ""
+    if code and code not in ("0",):
+        print(f"clearing leftover MainHeatingCode {code}")
+        page.evaluate("""(id)=>{const e=document.getElementById(id);if(e){e.value='';
+            e.dispatchEvent(new Event('change',{bubbles:true}));}}""", f"{E.MH1}TextBoxMainHeatingCode")
+        page.wait_for_timeout(400)
+        E.save_close(page)
+        return
+    # Generic (no-PCDB) mains-gas boiler via the cascade: Gas → Mains gas →
+    # Boilers → Post 1998 → Condensing (combi vs regular is set by the water-
+    # heating page: "from primary" + no cylinder = combi). ~89% SAP Table 4b.
+    E.set_heating_dialog(page, f"{MH1B}ButtonMainHeatingCode",
+                         "^Gas", "Mains gas", "Boilers", "Post 1998", "Condensing",
+                         "Combi condens")  # L6 = BGW Post 98 Combi condens. (SAP 4b ~89%)
+    print("code:", page.locator(f"#{E.MH1}TextBoxMainHeatingCode").input_value())
+    E.set_heating_dialog(page, f"{MH1B}ButtonMainHeatingControls",
+                         "^Boilers", "^Standard", "CBE Programmer, room thermostat and TRVs")
+    print("control:", page.locator(f"#{E.MH1}TextBoxMainHeatingControls").input_value())
+    E.save_close(page)
+
+
+def secondary(page):
+    # Lodged secondary: SAP 691 = REA electric panel/convector/radiant room heater.
+    E.goto(page, "SpaceHeating", "WebFormSpaceHeating.aspx")
+    page.wait_for_timeout(600)
+    E.set_select(page, "DropDownListSecondaryHeatingPresent", "Yes")
+    page.wait_for_timeout(900)
+    E.set_heating_dialog(page, "ButtonSecondaryHeatingCode",
+                         "Electric", "Electric", "Room Heater", "REA Panel")
+    tb = page.locator(f"#{E.FP}TextBoxSecondaryHeatingCode")
+    print("secondary code:", tb.input_value() if tb.count() else "?")
+    E.save_close(page)
+
+
+def water_heating(page):
+    E.goto(page, "WaterHeating", "WebFormWaterHeating.aspx")
+    E.click_tab(page, "TabContainer_TabPanelWaterHeating")
+    page.wait_for_timeout(400)
+    E.clear_hot_water_cylinder(page)
+    E.set_heating_dialog(page, f"{WH}ButtonWaterHeatingCode",
+                         "From Space Heating", "From the primary heating system")
+    print("water code:", page.locator(f"#{E.FP}{WH}TextBoxWaterHeatingCode").input_value())
+    E.save_close(page)
+
+
+def renewables(page):
+    # 2× PV arrays @1.14 kW. Discover the Renewables/PV page structure.
+    for url in ("WebFormRenewables.aspx", "WebFormPhotovoltaics.aspx", "WebFormSolar.aspx"):
+        try:
+            E.goto(page, url.replace("WebForm", "").replace(".aspx", ""), url)
+            page.wait_for_timeout(800)
+            print("PV page:", url, "->", page.url)
+            inputs = page.evaluate(
+                """()=>Array.from(document.querySelectorAll("[id*=ContentPlaceHolder1] input,[id*=ContentPlaceHolder1] select")).map(e=>e.id.replace('ContentBody_ContentPlaceHolder1_','')).filter(i=>/pv|photov|solar|peak|orient|pitch|oversh|panel/i.test(i)).slice(0,30)""")
+            print("PV-ish fields:", inputs)
+            return
+        except Exception as e:
+            print("  ", url, "->", type(e).__name__)
+
+
+_ORDER = ["property_description", "dimensions", "walls", "roofs", "floors",
+          "openings", "fix_window", "ventilation", "space_heating", "secondary",
+          "water_heating", "renewables"]
+
+
+def main():
+    if len(sys.argv) < 2 or sys.argv[1] not in _ORDER:
+        print("usage: build_22086693.py <" + "|".join(_ORDER) + ">")
+        return 2
+    with E.session() as (ctx, page):
+        globals()[sys.argv[1]](page)
+        print("done:", sys.argv[1], "->", page.url)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/scripts/hyde/build_property_overrides.py b/scripts/hyde/build_property_overrides.py
new file mode 100644
index 000000000..4a554586b
--- /dev/null
+++ b/scripts/hyde/build_property_overrides.py
@@ -0,0 +1,479 @@
+"""Build ``property_overrides`` for a portfolio from the Hyde Excel, bypassing the
+frontend + lambdas, using the ``landlord_*_overrides`` tables as the durable
+classification ledger.
+
+Why the ledger (not a throwaway cache): ``landlord_*_overrides`` stores
+``(portfolio_id, description) -> value`` with a ``source`` (classifier|user).
+  * Re-runs classify only descriptions NOT already stored -> saves ChatGPT calls.
+  * Human corrections are stored as ``source=user`` and the classifier is
+    forbidden from overwriting them (ADR-0003) -> edits are permanent.
+Then we resolve the vocab + match each row to a ``property.id`` by **org_ref**
+(Excel "Organisation Reference" -> property.landlord_property_id) and upsert
+``property_overrides`` (the fact layer the SAP overlay reads).
+
+Subcommands:
+  list-values                         print each component's valid override values (reference)
+  classify  --excel f --portfolio-id 795
+                                      PASS 1: classify cache-misses via ChatGPT,
+                                      upsert to landlord tables, write
+                                      overrides_unknowns.csv (with allowed_values)
+  validate  --edits overrides_edits.csv
+                                      check a hand-edited file: every corrected_value
+                                      must be a valid enum value (suggests fixes)
+  apply-edits --edits overrides_edits.csv --portfolio-id 795 [--apply]
+                                      upsert validated corrections as source=user
+  write     --excel f --portfolio-id 795 [--apply]
+                                      PASS 2: build + upsert property_overrides from vocab
+
+Env: POSTGRES_* (PostgresConfig.from_env) and OPENAI_API_KEY (ChatGPT).
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import difflib
+import logging
+import os
+from collections import Counter
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from enum import Enum
+from typing import Any, Optional
+
+import pandas as pd  # pyright: ignore[reportMissingTypeStubs]
+from sqlalchemy import Table, text
+from sqlalchemy.dialects.postgresql import insert as pg_insert
+from sqlmodel import SQLModel
+
+from domain.epc.property_overrides.built_form_type import BuiltFormType
+from domain.epc.property_overrides.construction_age_band import ConstructionAgeBand
+from domain.epc.property_overrides.glazing_type import GlazingType
+from domain.epc.property_overrides.main_fuel_type import MainFuelType
+from domain.epc.property_overrides.main_heating_system_type import MainHeatingSystemType
+from domain.epc.property_overrides.property_type import PropertyType
+from domain.epc.property_overrides.roof_type import RoofType
+from domain.epc.property_overrides.wall_type import WallType
+from domain.epc.property_overrides.wall_type_construction_dates import (
+    wall_type_construction_date_prompt_hint,
+)
+from domain.epc.property_overrides.water_heating_type import WaterHeatingType
+from infrastructure.chatgpt.chatgpt import ChatGPT
+from infrastructure.chatgpt.chatgpt_column_classifier import ChatGptColumnClassifier
+from infrastructure.landlord_overrides.landlord_override_reader_postgres_repository import (
+    LandlordOverrideReaderPostgresRepository,
+)
+from infrastructure.landlord_overrides.landlord_overrides_postgres_repository import (
+    LandlordOverridesRepository,
+)
+from infrastructure.postgres.config import PostgresConfig
+from infrastructure.postgres.engine import commit_scope, make_engine, make_session
+from infrastructure.postgres.landlord_built_form_type_override_table import (
+    LandlordBuiltFormTypeOverrideRow,
+)
+from infrastructure.postgres.landlord_construction_age_band_override_table import (
+    LandlordConstructionAgeBandOverrideRow,
+)
+from infrastructure.postgres.landlord_glazing_override_table import (
+    LandlordGlazingOverrideRow,
+)
+from infrastructure.postgres.landlord_main_fuel_override_table import (
+    LandlordMainFuelOverrideRow,
+)
+from infrastructure.postgres.landlord_main_heating_system_override_table import (
+    LandlordMainHeatingSystemOverrideRow,
+)
+from infrastructure.postgres.landlord_override_enums import OverrideSource
+from infrastructure.postgres.landlord_property_type_override_table import (
+    LandlordPropertyTypeOverrideRow,
+)
+from infrastructure.postgres.landlord_roof_type_override_table import (
+    LandlordRoofTypeOverrideRow,
+)
+from infrastructure.postgres.landlord_wall_type_override_table import (
+    LandlordWallTypeOverrideRow,
+)
+from infrastructure.postgres.landlord_water_heating_override_table import (
+    LandlordWaterHeatingOverrideRow,
+)
+from repositories.property.landlord_override_overlays import overlays_from
+from repositories.property.property_override_postgres_repository import (
+    PropertyOverridePostgresRepository,
+)
+from repositories.property.property_override_repository import PropertyOverrideInsert
+from repositories.property.property_overrides_postgres_reader import (
+    PropertyOverridesPostgresReader,
+)
+
+logging.basicConfig(level=logging.INFO, format="%(message)s")
+logger = logging.getLogger("build_property_overrides")
+
+ORG_REF_COLUMN = "Organisation Reference"
+UNKNOWNS_PATH = "overrides_unknowns.csv"
+
+# A "party ceiling" roof (another/same dwelling or premises above) means the
+# dwelling has no exposed roof, which is only physically valid for a Flat or
+# Maisonette. When the property type says House/Bungalow the two landlord fields
+# contradict (a house has nothing above it). Per Khalim these may be houses split
+# into flats — leave them entirely as-is for joint review, so we SKIP the whole
+# property (write NO overrides for it) and record the org_refs for that review
+# (ADR-0033; surfaced by scripts/hyde/audit_hyde_rows.py).
+_PARTY_CEILING_ROOF_VALUES: frozenset[str] = frozenset({
+    "(another dwelling above)", "(same dwelling above)",
+    "(other premises above)", "(another premises above)",
+    "Another Premises Above",
+})
+_FLAT_PTYPE_PREFIXES: tuple[str, ...] = ("flat", "maisonette")
+SKIPPED_PATH = "skipped_contradictory_properties.csv"
+
+
+@dataclass(frozen=True)
+class ComponentSpec:
+    component: str
+    enum_cls: type[Enum]
+    unknown: Enum
+    row_type: type[SQLModel]
+    excel_header: str
+    per_building_part: bool  # comma = building parts (wall/roof/age) vs whole-dwelling
+    extra_instructions: Optional[str] = None
+
+    def allowed_values(self) -> list[str]:
+        """Valid override values a human may pick (excludes UNKNOWN)."""
+        return sorted(m.value for m in self.enum_cls if m is not self.unknown)
+
+
+def _component_specs() -> list[ComponentSpec]:
+    return [
+        ComponentSpec("property_type", PropertyType, PropertyType.UNKNOWN, LandlordPropertyTypeOverrideRow, "Property Type", False),
+        ComponentSpec("built_form_type", BuiltFormType, BuiltFormType.UNKNOWN, LandlordBuiltFormTypeOverrideRow, "Property Type", False),
+        ComponentSpec("wall_type", WallType, WallType.UNKNOWN, LandlordWallTypeOverrideRow, "Walls", True, wall_type_construction_date_prompt_hint()),
+        ComponentSpec("roof_type", RoofType, RoofType.UNKNOWN, LandlordRoofTypeOverrideRow, "Roofs", True),
+        ComponentSpec("construction_age_band", ConstructionAgeBand, ConstructionAgeBand.UNKNOWN, LandlordConstructionAgeBandOverrideRow, "Age", True),
+        ComponentSpec("main_fuel", MainFuelType, MainFuelType.UNKNOWN, LandlordMainFuelOverrideRow, "Main Fuel", False),
+        ComponentSpec("glazing", GlazingType, GlazingType.UNKNOWN, LandlordGlazingOverrideRow, "Glazing", False),
+        ComponentSpec("water_heating", WaterHeatingType, WaterHeatingType.UNKNOWN, LandlordWaterHeatingOverrideRow, "Hot Water", False),
+        ComponentSpec("main_heating_system", MainHeatingSystemType, MainHeatingSystemType.UNKNOWN, LandlordMainHeatingSystemOverrideRow, "Heating", False),
+    ]
+
+
+def _specs_by_component() -> dict[str, ComponentSpec]:
+    return {s.component: s for s in _component_specs()}
+
+
+def _norm(s: Any) -> str:
+    """Vocab key normalisation — mirrors the orchestrator (strip + lower)."""
+    return str(s or "").strip().lower()
+
+
+def _split_entries(cell: Any, per_building_part: bool) -> list[str]:
+    raw = "" if cell is None else str(cell)
+    if not raw.strip():
+        return []
+    if not per_building_part:
+        return [raw.strip()]
+    return [part.strip() for part in raw.split(",") if part.strip()]
+
+
+def _load_rows(excel: str, sheet: str) -> list[dict[str, Any]]:
+    return pd.read_excel(excel, sheet_name=sheet).to_dict(orient="records")  # type: ignore[return-value]
+
+
+def _filter_rows(rows: list[dict[str, Any]], org_ref: Optional[str],
+                 limit: Optional[int]) -> list[dict[str, Any]]:
+    """Narrow to one property (--org-ref) or the first N rows (--limit) for a
+    cheap smoke test before the full run."""
+    if org_ref:
+        rows = [r for r in rows if str(r.get(ORG_REF_COLUMN, "")).strip() == org_ref]
+    if limit:
+        rows = rows[:limit]
+    return rows
+
+
+def _distinct_entries(rows: list[dict[str, Any]], spec: ComponentSpec) -> Counter[str]:
+    counts: Counter[str] = Counter()
+    for row in rows:
+        for entry in _split_entries(row.get(spec.excel_header), spec.per_building_part):
+            counts[entry] += 1
+    return counts
+
+
+# --------------------------------------------------------------------------- #
+def list_values(_: argparse.Namespace) -> None:
+    """Print the valid override values per component (the reference for edits)."""
+    for spec in _component_specs():
+        print(f"\n## {spec.component}  (Excel: {spec.excel_header})")
+        for v in spec.allowed_values():
+            print(f"   {v}")
+
+
+def validate(args: argparse.Namespace) -> None:
+    """Check a hand-edited CSV: every corrected_value must be a valid enum value."""
+    specs = _specs_by_component()
+    bad = 0
+    with open(args.edits, newline="") as f:
+        for i, r in enumerate(csv.DictReader(f), start=2):
+            val = (r.get("corrected_value") or "").strip()
+            if not val:
+                continue
+            comp = (r.get("component") or "").strip()
+            spec = specs.get(comp)
+            if spec is None:
+                logger.error("row %d: unknown component %r", i, comp)
+                bad += 1
+                continue
+            if val not in spec.allowed_values():
+                hint = difflib.get_close_matches(val, spec.allowed_values(), n=2)
+                logger.error("row %d [%s]: %r is not a valid value.%s",
+                             i, comp, val,
+                             f" Did you mean: {hint}?" if hint else
+                             " Run 'list-values' for the allowed set.")
+                bad += 1
+    if bad:
+        raise SystemExit(f"{bad} invalid corrected_value(s) — fix them before apply-edits.")
+    logger.info("All corrected values are valid enum values. ✓")
+
+
+def _db_session() -> Any:
+    return make_session(make_engine(PostgresConfig.from_env(os.environ)))
+
+
+def classify(args: argparse.Namespace) -> None:
+    rows = _filter_rows(_load_rows(args.excel, args.sheet), args.org_ref, args.limit)
+    logger.info("Classifying over %d row(s).", len(rows))
+    chat_gpt = ChatGPT()
+    session = _db_session()
+    reader = LandlordOverrideReaderPostgresRepository(session)
+    try:
+        vocab = reader.load_for_portfolio(args.portfolio_id)  # {component: {desc: value}}
+        unknown_rows: list[tuple[str, str, int, str]] = []
+
+        for spec in _component_specs():
+            counts = _distinct_entries(rows, spec)
+            known = vocab.get(spec.component, {})  # already-classified (cache)
+            to_classify = {d for d in counts if _norm(d) not in known}
+            logger.info("%-22s %4d distinct | %4d cached | %4d to classify",
+                        spec.component, len(counts), len(counts) - len(to_classify), len(to_classify))
+
+            resolved: dict[str, Enum] = {}
+            if to_classify:
+                classifier: ChatGptColumnClassifier[Any] = ChatGptColumnClassifier(
+                    chat_gpt, spec.enum_cls, spec.unknown, extra_instructions=spec.extra_instructions)
+                resolved = classifier.classify(to_classify)
+                repo: LandlordOverridesRepository[Any] = LandlordOverridesRepository(session, spec.row_type)
+                with commit_scope(session):
+                    # store keyed on the normalised description (matches the reader/finaliser lookup)
+                    repo.upsert_all(args.portfolio_id, {_norm(d): m for d, m in resolved.items()})
+
+            # collect UNKNOWNs (freshly classified + anything cached as UNKNOWN) for review
+            unk = spec.unknown.value
+            for desc, n in counts.items():
+                v = resolved.get(desc).value if desc in resolved and resolved[desc] else known.get(_norm(desc))  # type: ignore[union-attr]
+                if v is None or v == unk:
+                    allowed = " | ".join(spec.allowed_values())
+                    unknown_rows.append((spec.component, desc, n, allowed))
+
+        with open(UNKNOWNS_PATH, "w", newline="") as f:
+            w = csv.writer(f)
+            w.writerow(["component", "description", "count", "corrected_value", "allowed_values"])
+            for comp, desc, n, allowed in sorted(unknown_rows, key=lambda r: (-r[2])):
+                w.writerow([comp, desc, n, "", allowed])
+        logger.info("\nWrote %s — fill 'corrected_value' (must match 'allowed_values'), "
+                    "then: validate -> apply-edits -> write.", UNKNOWNS_PATH)
+    finally:
+        session.close()
+
+
+def _upsert_user_corrections(session: Any, portfolio_id: int,
+                             by_component: dict[str, dict[str, str]]) -> int:
+    """Upsert validated human corrections as source=user (always wins on conflict)."""
+    specs = _specs_by_component()
+    n = 0
+    now = datetime.now(timezone.utc)
+    for comp, mapping in by_component.items():
+        spec = specs[comp]
+        table: Table = getattr(spec.row_type, "__table__")
+        rows = [{"portfolio_id": portfolio_id, "description": _norm(d), "value": v,
+                 "source": OverrideSource.USER, "created_at": now, "updated_at": now}
+                for d, v in mapping.items()]
+        if not rows:
+            continue
+        stmt = pg_insert(table).values(rows)
+        stmt = stmt.on_conflict_do_update(
+            index_elements=["portfolio_id", "description"],
+            set_={"value": stmt.excluded.value, "source": stmt.excluded.source,
+                  "updated_at": stmt.excluded.updated_at})
+        session.execute(stmt)
+        n += len(rows)
+    return n
+
+
+def apply_edits(args: argparse.Namespace) -> None:
+    validate(args)  # fail before touching the DB
+    specs = _specs_by_component()
+    by_component: dict[str, dict[str, str]] = {}
+    with open(args.edits, newline="") as f:
+        for r in csv.DictReader(f):
+            val = (r.get("corrected_value") or "").strip()
+            if val and r["component"] in specs:
+                by_component.setdefault(r["component"], {})[r["description"]] = val
+    session = _db_session()
+    try:
+        if not args.apply:
+            total = sum(len(m) for m in by_component.values())
+            logger.info("DRY RUN — %d user corrections ready. Re-run with --apply.", total)
+            return
+        with commit_scope(session):
+            n = _upsert_user_corrections(session, args.portfolio_id, by_component)
+        logger.info("Upserted %d user corrections (source=user).", n)
+    finally:
+        session.close()
+
+
+def _org_ref_to_property_id(session: Any, portfolio_id: int) -> dict[str, int]:
+    stmt = text("SELECT landlord_property_id, id FROM property "
+                "WHERE portfolio_id = :pid AND landlord_property_id IS NOT NULL")
+    return {str(ref).strip(): int(pid) for ref, pid in session.execute(stmt, {"pid": portfolio_id})}
+
+
+def write(args: argparse.Namespace) -> None:
+    rows = _filter_rows(_load_rows(args.excel, args.sheet), args.org_ref, args.limit)
+    logger.info("Writing over %d row(s).", len(rows))
+    session = _db_session()
+    reader = LandlordOverrideReaderPostgresRepository(session)
+    try:
+        vocab = reader.load_for_portfolio(args.portfolio_id)
+        org_ref_map = _org_ref_to_property_id(session, args.portfolio_id)
+        logger.info("Portfolio %d: %d properties with org_ref.", args.portfolio_id, len(org_ref_map))
+
+        ptype_header = _specs_by_component()["property_type"].excel_header
+        roof_header = _specs_by_component()["roof_type"].excel_header
+        roof_vocab = vocab.get("roof_type", {})
+        inserts: list[PropertyOverrideInsert] = []
+        unmatched: Counter[str] = Counter()
+        unresolved: Counter[str] = Counter()
+        skipped: list[tuple[str, str, str]] = []  # (org_ref, property_type, roof)
+        for row in rows:
+            org_ref = str(row.get(ORG_REF_COLUMN, "")).strip()
+            property_id = org_ref_map.get(org_ref)
+            if property_id is None:
+                unmatched[org_ref] += 1
+                continue
+            ptype_raw = str(row.get(ptype_header) or "").strip()
+            roof_raw = str(row.get(roof_header) or "").strip()
+            row_is_flat = ptype_raw.lower().startswith(_FLAT_PTYPE_PREFIXES)
+            roof_resolved = {
+                roof_vocab.get(_norm(e))
+                for e in _split_entries(row.get(roof_header), True)
+            }
+            if not row_is_flat and roof_resolved & _PARTY_CEILING_ROOF_VALUES:
+                # Party-ceiling roof on a non-flat dwelling — contradictory source
+                # data (maybe a house split into flats). Leave the property fully
+                # as-is for joint review: write NO overrides, record it (see above).
+                skipped.append((org_ref, ptype_raw, roof_raw))
+                continue
+            for spec in _component_specs():
+                comp_vocab = vocab.get(spec.component, {})
+                for building_part, entry in enumerate(
+                    _split_entries(row.get(spec.excel_header), spec.per_building_part)):
+                    value = comp_vocab.get(_norm(entry))
+                    if not value or value == spec.unknown.value:
+                        unresolved[f"{spec.component}: {entry}"] += 1
+                        continue
+                    inserts.append(PropertyOverrideInsert(
+                        property_id=property_id, portfolio_id=args.portfolio_id,
+                        building_part=building_part, override_component=spec.component,
+                        override_value=value, original_spreadsheet_description=entry))
+
+        logger.info("Built %d rows | %d unmatched org_refs | %d unresolved | "
+                    "%d contradictory properties skipped (left as-is)",
+                    len(inserts), sum(unmatched.values()), sum(unresolved.values()),
+                    len(skipped))
+        if skipped:
+            out = os.path.join(os.path.dirname(args.excel) or ".", SKIPPED_PATH)
+            with open(out, "w", newline="") as f:
+                w = csv.writer(f)
+                w.writerow(["org_ref", "property_type", "roof"])
+                w.writerows(sorted(skipped))
+            logger.info("Recorded %d skipped properties -> %s (for joint review)",
+                        len(skipped), out)
+        if unresolved:
+            logger.info("Top unresolved (need apply-edits): %s", unresolved.most_common(10))
+        if not args.apply:
+            logger.info("DRY RUN — not writing. Re-run with --apply.")
+            for ins in inserts[:10]:
+                logger.info("  %s", ins)
+            return
+        with commit_scope(session):
+            affected = PropertyOverridePostgresRepository(session).upsert_all(inserts)
+        logger.info("Upserted %d property_overrides.", affected)
+    finally:
+        session.close()
+
+
+def verify(args: argparse.Namespace) -> None:
+    """For one property (by org_ref): show the persisted property_overrides rows
+    and the EpcSimulation overlays they produce — the end-to-end proof that the
+    chain reaches the SAP overlay surface."""
+    session = _db_session()
+    try:
+        org_ref_map = _org_ref_to_property_id(session, args.portfolio_id)
+        property_id = org_ref_map.get(args.org_ref)
+        if property_id is None:
+            raise SystemExit(f"org_ref {args.org_ref!r} not found in portfolio {args.portfolio_id}.")
+        reader = PropertyOverridesPostgresReader(lambda: session)
+        resolved = reader.overrides_for(property_id)
+        logger.info("property_id %d — %d property_overrides rows:", property_id, len(resolved.rows))
+        for r in resolved.rows:
+            logger.info("  part %d | %-22s = %s", r.building_part, r.override_component, r.override_value)
+        overlays = overlays_from(resolved)
+        logger.info("\n-> %d EpcSimulation overlay(s) produced (what the SAP calc applies):", len(overlays))
+        for o in overlays:
+            logger.info("  %s", o)
+    finally:
+        session.close()
+
+
+def main() -> None:
+    p = argparse.ArgumentParser(description=__doc__)
+    sub = p.add_subparsers(dest="cmd", required=True)
+
+    sub.add_parser("list-values").set_defaults(func=list_values)
+
+    v = sub.add_parser("validate")
+    v.add_argument("--edits", required=True)
+    v.set_defaults(func=validate)
+
+    c = sub.add_parser("classify")
+    c.add_argument("--excel", required=True)
+    c.add_argument("--sheet", default="AddressProfilingResults")
+    c.add_argument("--portfolio-id", type=int, required=True)
+    c.add_argument("--org-ref", default=None, help="smoke test: only this property's org_ref")
+    c.add_argument("--limit", type=int, default=None, help="smoke test: first N rows")
+    c.set_defaults(func=classify)
+
+    a = sub.add_parser("apply-edits")
+    a.add_argument("--edits", required=True)
+    a.add_argument("--portfolio-id", type=int, required=True)
+    a.add_argument("--apply", action="store_true")
+    a.set_defaults(func=apply_edits)
+
+    w = sub.add_parser("write")
+    w.add_argument("--excel", required=True)
+    w.add_argument("--sheet", default="AddressProfilingResults")
+    w.add_argument("--portfolio-id", type=int, required=True)
+    w.add_argument("--org-ref", default=None, help="smoke test: only this property's org_ref")
+    w.add_argument("--limit", type=int, default=None, help="smoke test: first N rows")
+    w.add_argument("--apply", action="store_true")
+    w.set_defaults(func=write)
+
+    vf = sub.add_parser("verify")
+    vf.add_argument("--portfolio-id", type=int, required=True)
+    vf.add_argument("--org-ref", required=True)
+    vf.set_defaults(func=verify)
+
+    args = p.parse_args()
+    args.func(args)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/hyde/case_a_population_sweep.py b/scripts/hyde/case_a_population_sweep.py
new file mode 100644
index 000000000..f96c0af5d
--- /dev/null
+++ b/scripts/hyde/case_a_population_sweep.py
@@ -0,0 +1,125 @@
+"""Local population sanity sweep for the full-SAP baseline-downgrade fix (ADR-0037).
+
+For a sample of Case A properties (portfolio 796, full-SAP path: epc_property
+assessment_type+sap_version NULL), re-map the real cert with the NEW mapper, run
+the SAP-10.2 calculator, and compute the post-fix Effective SAP/band. Compare to
+the lodged figures to (a) confirm the fix flips Effective off the stale lodged
+value and (b) flag survivors — drops too large to be a 2012→10.2 methodology
+shift (>15 SAP or >=2 bands below lodged), candidate deeper-calc/cert bugs.
+
+Read-only. No DB writes.
+"""
+from __future__ import annotations
+
+import os
+import random  # noqa: F401 — only used with a fixed seed below
+
+from scripts.e2e_common import load_env, build_engine
+from sqlalchemy import text
+
+load_env()
+
+from infrastructure.epc_client.epc_client_service import EpcClientService
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+from domain.sap10_calculator.calculator import Sap10Calculator
+from datatypes.epc.domain.epc import Epc
+
+_BAND_IDX = {b: i for i, b in enumerate(["G", "F", "E", "D", "C", "B", "A"])}
+
+
+def _band_letter(epc_band: object) -> str:
+    s = str(epc_band)
+    return s.split(".")[-1] if "." in s else s
+
+
+def main() -> None:
+    eng = build_engine()
+    with eng.connect() as c:
+        # 30 worst old-drops + 30 spread across the cohort (deterministic order).
+        worst = c.execute(text("""
+            SELECT p.uprn, pbp.lodged_sap_score, pbp.lodged_epc_band,
+                   pbp.effective_sap_score AS old_eff, pl.post_sap_points AS old_post
+            FROM property p
+            JOIN epc_property ep ON ep.uprn=p.uprn
+            JOIN property_baseline_performance pbp ON pbp.property_id=p.id
+            JOIN plan pl ON pl.property_id=p.id
+            WHERE p.portfolio_id=796 AND ep.assessment_type IS NULL
+              AND ep.sap_version IS NULL
+            ORDER BY (pbp.effective_sap_score - pl.post_sap_points) DESC
+            LIMIT 30
+        """)).fetchall()
+        spread = c.execute(text("""
+            SELECT p.uprn, pbp.lodged_sap_score, pbp.lodged_epc_band,
+                   pbp.effective_sap_score AS old_eff, pl.post_sap_points AS old_post
+            FROM property p
+            JOIN epc_property ep ON ep.uprn=p.uprn
+            JOIN property_baseline_performance pbp ON pbp.property_id=p.id
+            JOIN plan pl ON pl.property_id=p.id
+            WHERE p.portfolio_id=796 AND ep.assessment_type IS NULL
+              AND ep.sap_version IS NULL AND (p.uprn % 7) = 0
+            ORDER BY p.uprn LIMIT 30
+        """)).fetchall()
+
+    rows = {r._mapping["uprn"]: dict(r._mapping) for r in worst}
+    for r in spread:
+        rows.setdefault(r._mapping["uprn"], dict(r._mapping))
+
+    svc = EpcClientService(os.environ["OPEN_EPC_API_TOKEN"])
+    calc = Sap10Calculator()
+
+    n = 0
+    flipped = 0
+    calc_errors = 0
+    survivors = []
+    drops = []
+    for uprn, row in rows.items():
+        n += 1
+        try:
+            results = svc._search(uprn=int(uprn))
+            if not results:
+                print(f"  uprn={uprn} NO_CERT")
+                continue
+            latest = max(results, key=lambda x: x.registration_date)
+            raw = svc._fetch_certificate(latest.certificate_number)
+            epc = EpcPropertyDataMapper.from_api_response(raw)
+            new_sap = calc.calculate(epc).sap_score
+        except Exception as e:  # noqa: BLE001 — sweep tolerates per-cert failure
+            calc_errors += 1
+            print(f"  uprn={uprn} CALC_ERROR {type(e).__name__}: {str(e)[:90]}")
+            continue
+        new_band = _band_letter(Epc.from_sap_score(new_sap))
+        lodged = row["lodged_sap_score"]
+        lodged_band = row["lodged_epc_band"]
+        drop = lodged - new_sap
+        drops.append(drop)
+        if epc.sap_version is not None and epc.sap_version < 10.2:
+            flipped += 1
+        band_drop = _BAND_IDX.get(lodged_band, 0) - _BAND_IDX.get(new_band, 0)
+        survivor = drop > 15 or band_drop >= 2
+        tag = "  *** SURVIVOR" if survivor else ""
+        if survivor:
+            survivors.append((uprn, lodged, lodged_band, new_sap, new_band, drop))
+        print(
+            f"  uprn={uprn} lodged={lodged}/{lodged_band} "
+            f"new_eff={new_sap}/{new_band} drop={drop} "
+            f"(old_eff={row['old_eff']} old_post={round(float(row['old_post']),1)}){tag}"
+        )
+
+    computed = len(drops)
+    print("\n==== SUMMARY ====")
+    print(f"sampled={n}  computed={computed}  calc_errors={calc_errors}")
+    print(f"rebaseline flipped (sap_version<10.2 now set) = {flipped}/{computed}")
+    if drops:
+        drops_sorted = sorted(drops)
+        print(
+            f"lodged-new_eff drop: min={min(drops)} median="
+            f"{drops_sorted[len(drops_sorted)//2]} max={max(drops)} "
+            f"mean={round(sum(drops)/len(drops),1)}"
+        )
+    print(f"survivors (>15 SAP or >=2 bands below lodged) = {len(survivors)}")
+    for s in survivors:
+        print(f"   SURVIVOR uprn={s[0]} lodged={s[1]}/{s[2]} new={s[3]}/{s[4]} drop={s[5]}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/hyde/elmhurst_dom/conservatories.json b/scripts/hyde/elmhurst_dom/conservatories.json
index ec9eb26b9..d1584219d 100644
--- a/scripts/hyde/elmhurst_dom/conservatories.json
+++ b/scripts/hyde/elmhurst_dom/conservatories.json
@@ -87,12 +87,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/dimensions.json b/scripts/hyde/elmhurst_dom/dimensions.json
index 8034554d1..c3e38cec7 100644
--- a/scripts/hyde/elmhurst_dom/dimensions.json
+++ b/scripts/hyde/elmhurst_dom/dimensions.json
@@ -9,7 +9,7 @@
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$RadioButtonDimensionsType",
       "label": "Type",
       "value": "Internal",
-      "disabled": true,
+      "disabled": false,
       "autopostback": false,
       "options": [
         {
@@ -29,13 +29,53 @@
         }
       ]
     },
+    {
+      "tag": "input",
+      "type": "text",
+      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_WebUserControlDimensionsMain_TextBoxFloorArea1stFloor",
+      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$WebUserControlDimensionsMain$TextBoxFloorArea1stFloor",
+      "label": "",
+      "value": "31.06",
+      "disabled": false,
+      "autopostback": true
+    },
+    {
+      "tag": "input",
+      "type": "text",
+      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_WebUserControlDimensionsMain_TextBoxRoomHeight1stFloor",
+      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$WebUserControlDimensionsMain$TextBoxRoomHeight1stFloor",
+      "label": "",
+      "value": "2.65",
+      "disabled": false,
+      "autopostback": true
+    },
+    {
+      "tag": "input",
+      "type": "text",
+      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_WebUserControlDimensionsMain_TextBoxWallPerimeter1stFloor",
+      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$WebUserControlDimensionsMain$TextBoxWallPerimeter1stFloor",
+      "label": "",
+      "value": "15.80",
+      "disabled": false,
+      "autopostback": true
+    },
+    {
+      "tag": "input",
+      "type": "text",
+      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_WebUserControlDimensionsMain_TextBoxPartyWallLength1stFloor",
+      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$WebUserControlDimensionsMain$TextBoxPartyWallLength1stFloor",
+      "label": "",
+      "value": "0.00",
+      "disabled": false,
+      "autopostback": true
+    },
     {
       "tag": "input",
       "type": "text",
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_WebUserControlDimensionsMain_TextBoxFloorAreaLowestFloor",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$WebUserControlDimensionsMain$TextBoxFloorAreaLowestFloor",
       "label": "",
-      "value": "59.50",
+      "value": "31.06",
       "disabled": false,
       "autopostback": true
     },
@@ -55,7 +95,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_WebUserControlDimensionsMain_TextBoxWallPerimeterLowestFloor",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$WebUserControlDimensionsMain$TextBoxWallPerimeterLowestFloor",
       "label": "",
-      "value": "13.86",
+      "value": "15.80",
       "disabled": false,
       "autopostback": true
     },
@@ -65,7 +105,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_WebUserControlDimensionsMain_TextBoxPartyWallLengthLowestFloor",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$WebUserControlDimensionsMain$TextBoxPartyWallLengthLowestFloor",
       "label": "",
-      "value": "13.86",
+      "value": "0.00",
       "disabled": false,
       "autopostback": true
     },
@@ -154,12 +194,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/floors.json b/scripts/hyde/elmhurst_dom/floors.json
index 903d937df..a40f496bd 100644
--- a/scripts/hyde/elmhurst_dom/floors.json
+++ b/scripts/hyde/elmhurst_dom/floors.json
@@ -198,12 +198,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/newtechnologies.json b/scripts/hyde/elmhurst_dom/newtechnologies.json
index 4350be333..44554d352 100644
--- a/scripts/hyde/elmhurst_dom/newtechnologies.json
+++ b/scripts/hyde/elmhurst_dom/newtechnologies.json
@@ -184,12 +184,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/openings.json b/scripts/hyde/elmhurst_dom/openings.json
index edc9c7353..809af7bd7 100644
--- a/scripts/hyde/elmhurst_dom/openings.json
+++ b/scripts/hyde/elmhurst_dom/openings.json
@@ -22,73 +22,13 @@
       "disabled": false,
       "autopostback": false
     },
-    {
-      "tag": "input",
-      "type": "image",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_GridViewExtendedWidows_DeleteButton_1",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$GridViewExtendedWidows$ctl03$DeleteButton",
-      "label": "2",
-      "value": "",
-      "disabled": false,
-      "autopostback": false
-    },
-    {
-      "tag": "input",
-      "type": "image",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_GridViewExtendedWidows_CopyButton_1",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$GridViewExtendedWidows$ctl03$CopyButton",
-      "label": "2",
-      "value": "",
-      "disabled": false,
-      "autopostback": false
-    },
-    {
-      "tag": "input",
-      "type": "image",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_GridViewExtendedWidows_DeleteButton_2",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$GridViewExtendedWidows$ctl04$DeleteButton",
-      "label": "3",
-      "value": "",
-      "disabled": false,
-      "autopostback": false
-    },
-    {
-      "tag": "input",
-      "type": "image",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_GridViewExtendedWidows_CopyButton_2",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$GridViewExtendedWidows$ctl04$CopyButton",
-      "label": "3",
-      "value": "",
-      "disabled": false,
-      "autopostback": false
-    },
-    {
-      "tag": "input",
-      "type": "image",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_GridViewExtendedWidows_DeleteButton_3",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$GridViewExtendedWidows$ctl05$DeleteButton",
-      "label": "4",
-      "value": "",
-      "disabled": false,
-      "autopostback": false
-    },
-    {
-      "tag": "input",
-      "type": "image",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_GridViewExtendedWidows_CopyButton_3",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$GridViewExtendedWidows$ctl05$CopyButton",
-      "label": "4",
-      "value": "",
-      "disabled": false,
-      "autopostback": false
-    },
     {
       "tag": "input",
       "type": "text",
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_TextBoxExtWidth",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$TextBoxExtWidth",
       "label": "",
-      "value": "1.44",
+      "value": "0.00",
       "disabled": false,
       "autopostback": true
     },
@@ -98,7 +38,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_TextBoxExtHeight",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$TextBoxExtHeight",
       "label": "",
-      "value": "1.00",
+      "value": "0.00",
       "disabled": false,
       "autopostback": true
     },
@@ -108,7 +48,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_TextBoxExtArea",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$TextBoxExtArea",
       "label": "",
-      "value": "1.44",
+      "value": "0.00",
       "disabled": true,
       "autopostback": false
     },
@@ -140,14 +80,14 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_DropDownListExtGlazing",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$DropDownListExtGlazing",
       "label": "",
-      "value": "Double with unknown install date",
+      "value": "",
       "disabled": false,
       "autopostback": true,
       "options": [
         {
           "value": "",
           "text": "",
-          "selected": false
+          "selected": true
         },
         {
           "value": "Single glazing",
@@ -172,7 +112,7 @@
         {
           "value": "Double with unknown install date",
           "text": "Double with unknown install date",
-          "selected": true
+          "selected": false
         },
         {
           "value": "Secondary glazing",
@@ -216,89 +156,25 @@
         }
       ]
     },
-    {
-      "tag": "select",
-      "type": "select-one",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_DropDownListExtFrameType",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$DropDownListExtFrameType",
-      "label": "",
-      "value": "PVC",
-      "disabled": false,
-      "autopostback": true,
-      "options": [
-        {
-          "value": "",
-          "text": "",
-          "selected": false
-        },
-        {
-          "value": "PVC",
-          "text": "PVC",
-          "selected": true
-        },
-        {
-          "value": "Wood",
-          "text": "Wood",
-          "selected": false
-        },
-        {
-          "value": "Metal",
-          "text": "Metal",
-          "selected": false
-        }
-      ]
-    },
-    {
-      "tag": "select",
-      "type": "select-one",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_DropDownListExtGlazingGap",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$DropDownListExtGlazingGap",
-      "label": "",
-      "value": "12 mm",
-      "disabled": false,
-      "autopostback": true,
-      "options": [
-        {
-          "value": "",
-          "text": "",
-          "selected": false
-        },
-        {
-          "value": "6 mm",
-          "text": "6 mm",
-          "selected": false
-        },
-        {
-          "value": "12 mm",
-          "text": "12 mm",
-          "selected": true
-        },
-        {
-          "value": "16 mm or more",
-          "text": "16 mm or more",
-          "selected": false
-        }
-      ]
-    },
     {
       "tag": "select",
       "type": "select-one",
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_DropDownListExtBuildingPartId",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$DropDownListExtBuildingPartId",
       "label": "",
-      "value": "Main",
+      "value": "",
       "disabled": false,
       "autopostback": true,
       "options": [
         {
           "value": "",
           "text": "",
-          "selected": false
+          "selected": true
         },
         {
           "value": "Main",
           "text": "Main",
-          "selected": true
+          "selected": false
         }
       ]
     },
@@ -308,24 +184,14 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_DropDownListExtLocation",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$DropDownListExtLocation",
       "label": "",
-      "value": "External wall",
+      "value": "",
       "disabled": false,
       "autopostback": true,
       "options": [
         {
           "value": "",
           "text": "",
-          "selected": false
-        },
-        {
-          "value": "External wall",
-          "text": "External wall",
           "selected": true
-        },
-        {
-          "value": "Alternative wall 1",
-          "text": "Alternative wall 1",
-          "selected": false
         }
       ]
     },
@@ -335,19 +201,19 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_DropDownListExtOrientation",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$DropDownListExtOrientation",
       "label": "",
-      "value": "North",
+      "value": "",
       "disabled": false,
       "autopostback": true,
       "options": [
         {
           "value": "",
           "text": "",
-          "selected": false
+          "selected": true
         },
         {
           "value": "North",
           "text": "North",
-          "selected": true
+          "selected": false
         },
         {
           "value": "North East",
@@ -397,7 +263,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_TextBoxExtUValue",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$TextBoxExtUValue",
       "label": "",
-      "value": "2.80",
+      "value": "0.00",
       "disabled": true,
       "autopostback": true
     },
@@ -407,7 +273,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWindowsPanel_TextBoxExtGValue",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWindowsPanel$TextBoxExtGValue",
       "label": "",
-      "value": "0.76",
+      "value": "0.00",
       "disabled": true,
       "autopostback": true
     },
@@ -420,7 +286,7 @@
       "value": "on",
       "disabled": false,
       "autopostback": false,
-      "checked": true
+      "checked": false
     },
     {
       "tag": "select",
@@ -582,12 +448,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/propertydescription.json b/scripts/hyde/elmhurst_dom/propertydescription.json
index 89996d136..dcefb4c41 100644
--- a/scripts/hyde/elmhurst_dom/propertydescription.json
+++ b/scripts/hyde/elmhurst_dom/propertydescription.json
@@ -8,7 +8,7 @@
       "id": "ContentBody_ContentPlaceHolder1_DropDownListPropertyType1",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$DropDownListPropertyType1",
       "label": "",
-      "value": "F Flat",
+      "value": "H House",
       "disabled": false,
       "autopostback": true,
       "options": [
@@ -20,7 +20,7 @@
         {
           "value": "H House",
           "text": "H House",
-          "selected": false
+          "selected": true
         },
         {
           "value": "B Bungalow",
@@ -30,7 +30,7 @@
         {
           "value": "F Flat",
           "text": "F Flat",
-          "selected": true
+          "selected": false
         },
         {
           "value": "M Maisonette",
@@ -44,13 +44,60 @@
         }
       ]
     },
+    {
+      "tag": "select",
+      "type": "select-one",
+      "id": "ContentBody_ContentPlaceHolder1_DropDownListPropertyType2",
+      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$DropDownListPropertyType2",
+      "label": "",
+      "value": "E  End-Terrace",
+      "disabled": false,
+      "autopostback": true,
+      "options": [
+        {
+          "value": "",
+          "text": "",
+          "selected": false
+        },
+        {
+          "value": "D  Detached",
+          "text": "D Detached",
+          "selected": false
+        },
+        {
+          "value": "S  Semi-Detached",
+          "text": "S Semi-Detached",
+          "selected": false
+        },
+        {
+          "value": "M  Mid-Terrace",
+          "text": "M Mid-Terrace",
+          "selected": false
+        },
+        {
+          "value": "E  End-Terrace",
+          "text": "E End-Terrace",
+          "selected": true
+        },
+        {
+          "value": "EM Enclosed Mid-Terrace",
+          "text": "EM Enclosed Mid-Terrace",
+          "selected": false
+        },
+        {
+          "value": "EE Enclosed End-Terrace",
+          "text": "EE Enclosed End-Terrace",
+          "selected": false
+        }
+      ]
+    },
     {
       "tag": "input",
       "type": "text",
       "id": "ContentBody_ContentPlaceHolder1_TextBoxStoreys",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TextBoxStoreys",
       "label": "Storeys",
-      "value": "1",
+      "value": "2",
       "disabled": false,
       "autopostback": true
     },
@@ -60,7 +107,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TextBoxHabitableRooms",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TextBoxHabitableRooms",
       "label": "Habitable Rooms",
-      "value": "3",
+      "value": "4",
       "disabled": false,
       "autopostback": false
     },
@@ -70,7 +117,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TextBoxHeatedHabitableRooms",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TextBoxHeatedHabitableRooms",
       "label": "Heated Habitable Rooms",
-      "value": "3",
+      "value": "4",
       "disabled": false,
       "autopostback": true
     },
@@ -80,7 +127,7 @@
       "id": "ContentBody_ContentPlaceHolder1_DropDownListDateBuiltMain",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$DropDownListDateBuiltMain",
       "label": "Main Property",
-      "value": "L 2012-2022",
+      "value": "G 1983-1990",
       "disabled": false,
       "autopostback": true,
       "options": [
@@ -122,7 +169,7 @@
         {
           "value": "G 1983-1990",
           "text": "G 1983-1990",
-          "selected": false
+          "selected": true
         },
         {
           "value": "H 1991-1995",
@@ -147,7 +194,7 @@
         {
           "value": "L 2012-2022",
           "text": "L 2012-2022",
-          "selected": true
+          "selected": false
         },
         {
           "value": "M 2023 onwards",
@@ -968,12 +1015,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/propertydetails.json b/scripts/hyde/elmhurst_dom/propertydetails.json
index 1e0f5367b..1b38c18ea 100644
--- a/scripts/hyde/elmhurst_dom/propertydetails.json
+++ b/scripts/hyde/elmhurst_dom/propertydetails.json
@@ -228,12 +228,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/roofs.json b/scripts/hyde/elmhurst_dom/roofs.json
index 17ff7a112..537679b98 100644
--- a/scripts/hyde/elmhurst_dom/roofs.json
+++ b/scripts/hyde/elmhurst_dom/roofs.json
@@ -97,7 +97,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_WebUserControlRoofMain_DropDownListThickness",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$WebUserControlRoofMain$DropDownListThickness",
       "label": "Insulation Thickness",
-      "value": "270 mm",
+      "value": "100 mm",
       "disabled": false,
       "autopostback": true,
       "options": [
@@ -129,7 +129,7 @@
         {
           "value": "100 mm",
           "text": "100 mm",
-          "selected": false
+          "selected": true
         },
         {
           "value": "125 mm",
@@ -164,7 +164,7 @@
         {
           "value": "270 mm",
           "text": "270 mm",
-          "selected": true
+          "selected": false
         },
         {
           "value": "300 mm",
@@ -273,12 +273,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/spaceheating.json b/scripts/hyde/elmhurst_dom/spaceheating.json
index ddeb30afe..306583d01 100644
--- a/scripts/hyde/elmhurst_dom/spaceheating.json
+++ b/scripts/hyde/elmhurst_dom/spaceheating.json
@@ -18,7 +18,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMainHeating1_WebUserControlMainHeating1_TextBoxMainHeatingCode",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMainHeating1$WebUserControlMainHeating1$TextBoxMainHeatingCode",
       "label": "Main Heating EES Code",
-      "value": "BGB",
+      "value": "BGW",
       "disabled": false,
       "autopostback": true
     },
@@ -114,7 +114,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMainHeating1_WebUserControlMainHeating1_RadioButtonListFlueType",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMainHeating1$WebUserControlMainHeating1$RadioButtonListFlueType",
       "label": "Flue Type",
-      "value": "Open",
+      "value": "Balanced",
       "disabled": false,
       "autopostback": true,
       "options": [
@@ -126,12 +126,12 @@
         {
           "value": "Balanced",
           "text": "Balanced",
-          "selected": false
+          "selected": true
         },
         {
           "value": "Open",
           "text": "Open",
-          "selected": true
+          "selected": false
         }
       ]
     },
@@ -335,7 +335,7 @@
       "id": "ContentBody_ContentPlaceHolder1_DropDownListSecondaryHeatingPresent",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$DropDownListSecondaryHeatingPresent",
       "label": "",
-      "value": "Yes",
+      "value": "No",
       "disabled": false,
       "autopostback": true,
       "options": [
@@ -347,25 +347,15 @@
         {
           "value": "No",
           "text": "No",
-          "selected": false
+          "selected": true
         },
         {
           "value": "Yes",
           "text": "Yes",
-          "selected": true
+          "selected": false
         }
       ]
     },
-    {
-      "tag": "input",
-      "type": "text",
-      "id": "ContentBody_ContentPlaceHolder1_TextBoxSecondaryHeatingCode",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TextBoxSecondaryHeatingCode",
-      "label": "Secondary Heating EES Code",
-      "value": "RWM",
-      "disabled": false,
-      "autopostback": true
-    },
     {
       "tag": "input",
       "type": "image",
@@ -845,12 +835,6 @@
       "onclick": null,
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMainHeating2_WebUserControlMainHeating2_ButtonMainHeatingCode"
     },
-    {
-      "text": "",
-      "href": "javascript:__doPostBack('ctl00$ctl00$ContentBody$ContentPlaceHolder1$ButtonSecondaryHeatingCode','')",
-      "onclick": null,
-      "id": "ContentBody_ContentPlaceHolder1_ButtonSecondaryHeatingCode"
-    },
     {
       "text": "Boiler search",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$ContentPlaceHolder1$SelectBoilerDialog$HyperLinkActionBoilerSearch\", \"\", true, \"\", \"\", false, true))",
@@ -911,12 +895,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/ventilationandcooling.json b/scripts/hyde/elmhurst_dom/ventilationandcooling.json
index 7a3c3419e..dcce4e706 100644
--- a/scripts/hyde/elmhurst_dom/ventilationandcooling.json
+++ b/scripts/hyde/elmhurst_dom/ventilationandcooling.json
@@ -152,19 +152,19 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelAirPressureTest_DropDownListTestMethod",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelAirPressureTest$DropDownListTestMethod",
       "label": "Test Method",
-      "value": "Not available",
+      "value": "Blower Door",
       "disabled": false,
       "autopostback": true,
       "options": [
         {
           "value": "Not available",
           "text": "Not available",
-          "selected": true
+          "selected": false
         },
         {
           "value": "Blower Door",
           "text": "Blower Door",
-          "selected": false
+          "selected": true
         },
         {
           "value": "Pulse",
@@ -173,13 +173,33 @@
         }
       ]
     },
+    {
+      "tag": "input",
+      "type": "text",
+      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelAirPressureTest_TextBoxTestResult",
+      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelAirPressureTest$TextBoxTestResult",
+      "label": "Pressure Test Result",
+      "value": "3.59",
+      "disabled": false,
+      "autopostback": true
+    },
+    {
+      "tag": "input",
+      "type": "text",
+      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelAirPressureTest_TextBoxTestCertificateNumber",
+      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelAirPressureTest$TextBoxTestCertificateNumber",
+      "label": "Certificate Number",
+      "value": "APT-10093116330",
+      "disabled": false,
+      "autopostback": true
+    },
     {
       "tag": "input",
       "type": "text",
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelLighting_TextBoxLightsTotal",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelLighting$TextBoxLightsTotal",
       "label": "",
-      "value": "6",
+      "value": "9",
       "disabled": false,
       "autopostback": true
     },
@@ -200,7 +220,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelLighting_TextBoxLedLightsTotal",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelLighting$TextBoxLedLightsTotal",
       "label": "",
-      "value": "6",
+      "value": "0",
       "disabled": false,
       "autopostback": true
     },
@@ -210,7 +230,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelLighting_TextBoxCflLightsTotal",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelLighting$TextBoxCflLightsTotal",
       "label": "",
-      "value": "0",
+      "value": "2",
       "disabled": false,
       "autopostback": true
     },
@@ -220,7 +240,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelLighting_TextBoxLelLightsTotal",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelLighting$TextBoxLelLightsTotal",
       "label": "",
-      "value": "6",
+      "value": "2",
       "disabled": true,
       "autopostback": true
     },
@@ -230,7 +250,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelLighting_TextBoxIncandescentLights",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelLighting$TextBoxIncandescentLights",
       "label": "",
-      "value": "0",
+      "value": "7",
       "disabled": true,
       "autopostback": false
     },
@@ -402,12 +422,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/walls.json b/scripts/hyde/elmhurst_dom/walls.json
index 144262a63..b6a6c2b04 100644
--- a/scripts/hyde/elmhurst_dom/walls.json
+++ b/scripts/hyde/elmhurst_dom/walls.json
@@ -8,7 +8,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_InnerTabContainerMain_TabPanelExternalWallMain_WebUserControlWallMain_DropDownListType",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$InnerTabContainerMain$TabPanelExternalWallMain$WebUserControlWallMain$DropDownListType",
       "label": "Type",
-      "value": "TI Timber Frame",
+      "value": "CA Cavity",
       "disabled": false,
       "autopostback": true,
       "options": [
@@ -40,12 +40,12 @@
         {
           "value": "CA Cavity",
           "text": "CA Cavity",
-          "selected": false
+          "selected": true
         },
         {
           "value": "TI Timber Frame",
           "text": "TI Timber Frame",
-          "selected": true
+          "selected": false
         },
         {
           "value": "SY System Build",
@@ -65,7 +65,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_InnerTabContainerMain_TabPanelExternalWallMain_WebUserControlWallMain_DropDownListInsulation",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$InnerTabContainerMain$TabPanelExternalWallMain$WebUserControlWallMain$DropDownListInsulation",
       "label": "Insulation",
-      "value": "A As Built",
+      "value": "F Filled Cavity",
       "disabled": false,
       "autopostback": true,
       "options": [
@@ -74,6 +74,36 @@
           "text": "",
           "selected": false
         },
+        {
+          "value": "E External",
+          "text": "E External",
+          "selected": false
+        },
+        {
+          "value": "F Filled Cavity",
+          "text": "F Filled Cavity",
+          "selected": true
+        },
+        {
+          "value": "FI Filled Cavity + Internal",
+          "text": "FI Filled Cavity + Internal",
+          "selected": false
+        },
+        {
+          "value": "FE Filled Cavity + External",
+          "text": "FE Filled Cavity + External",
+          "selected": false
+        },
+        {
+          "value": "UI Unfilled Cavity + Internal",
+          "text": "UI Unfilled Cavity + Internal",
+          "selected": false
+        },
+        {
+          "value": "UE Unfilled Cavity + External",
+          "text": "UE Unfilled Cavity + External",
+          "selected": false
+        },
         {
           "value": "I Internal",
           "text": "I Internal",
@@ -82,7 +112,7 @@
         {
           "value": "A As Built",
           "text": "A As Built",
-          "selected": true
+          "selected": false
         },
         {
           "value": "U Unknown",
@@ -97,7 +127,7 @@
       "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMain_InnerTabContainerMain_TabPanelExternalWallMain_WebUserControlWallMain_TextBoxWallThickness",
       "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelMain$InnerTabContainerMain$TabPanelExternalWallMain$WebUserControlWallMain$TextBoxWallThickness",
       "label": "Wall Thickness [mm]",
-      "value": "400",
+      "value": "280",
       "disabled": false,
       "autopostback": true
     },
@@ -217,12 +247,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_dom/waterheating.json b/scripts/hyde/elmhurst_dom/waterheating.json
index ce0a46246..1e120c837 100644
--- a/scripts/hyde/elmhurst_dom/waterheating.json
+++ b/scripts/hyde/elmhurst_dom/waterheating.json
@@ -21,154 +21,7 @@
       "value": "on",
       "disabled": true,
       "autopostback": false,
-      "checked": true
-    },
-    {
-      "tag": "select",
-      "type": "select-one",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWaterHeating_DropDownListCylinderSize",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWaterHeating$DropDownListCylinderSize",
-      "label": "",
-      "value": "Large",
-      "disabled": false,
-      "autopostback": true,
-      "options": [
-        {
-          "value": "",
-          "text": "",
-          "selected": false
-        },
-        {
-          "value": "No Access",
-          "text": "No Access",
-          "selected": false
-        },
-        {
-          "value": "Normal",
-          "text": "Normal",
-          "selected": false
-        },
-        {
-          "value": "Medium",
-          "text": "Medium",
-          "selected": false
-        },
-        {
-          "value": "Large",
-          "text": "Large",
-          "selected": true
-        },
-        {
-          "value": "Value known",
-          "text": "Value known",
-          "selected": false
-        }
-      ]
-    },
-    {
-      "tag": "select",
-      "type": "select-one",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWaterHeating_DropDownListInsulated",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWaterHeating$DropDownListInsulated",
-      "label": "",
-      "value": "Foam",
-      "disabled": false,
-      "autopostback": true,
-      "options": [
-        {
-          "value": "",
-          "text": "",
-          "selected": false
-        },
-        {
-          "value": "No Insulation",
-          "text": "No Insulation",
-          "selected": false
-        },
-        {
-          "value": "Jacket",
-          "text": "Jacket",
-          "selected": false
-        },
-        {
-          "value": "Foam",
-          "text": "Foam",
-          "selected": true
-        },
-        {
-          "value": "Measured Loss",
-          "text": "Measured Loss",
-          "selected": false
-        }
-      ]
-    },
-    {
-      "tag": "select",
-      "type": "select-one",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWaterHeating_DropDownListInsulationThickness",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWaterHeating$DropDownListInsulationThickness",
-      "label": "",
-      "value": "120 mm",
-      "disabled": false,
-      "autopostback": true,
-      "options": [
-        {
-          "value": "",
-          "text": "",
-          "selected": false
-        },
-        {
-          "value": "None",
-          "text": "None",
-          "selected": false
-        },
-        {
-          "value": "12 mm",
-          "text": "12 mm",
-          "selected": false
-        },
-        {
-          "value": "25 mm",
-          "text": "25 mm",
-          "selected": false
-        },
-        {
-          "value": "38 mm",
-          "text": "38 mm",
-          "selected": false
-        },
-        {
-          "value": "50 mm",
-          "text": "50 mm",
-          "selected": false
-        },
-        {
-          "value": "80 mm",
-          "text": "80 mm",
-          "selected": false
-        },
-        {
-          "value": "120 mm",
-          "text": "120 mm",
-          "selected": true
-        },
-        {
-          "value": "160 mm",
-          "text": "160 mm",
-          "selected": false
-        }
-      ]
-    },
-    {
-      "tag": "input",
-      "type": "checkbox",
-      "id": "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelWaterHeating_CheckBoxCylinderThermostat",
-      "name": "ctl00$ctl00$ContentBody$ContentPlaceHolder1$TabContainer$TabPanelWaterHeating$CheckBoxCylinderThermostat",
-      "label": "",
-      "value": "on",
-      "disabled": false,
-      "autopostback": false,
-      "checked": true
+      "checked": false
     },
     {
       "tag": "input",
@@ -811,12 +664,6 @@
       "onclick": "waitForAction(this);",
       "id": "ContentBody_buttonActionConservatories_Link"
     },
-    {
-      "text": "Flats",
-      "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionFlats$Link\", \"\", true, \"\", \"\", false, true))",
-      "onclick": "waitForAction(this);",
-      "id": "ContentBody_buttonActionFlats_Link"
-    },
     {
       "text": "Walls",
       "href": "javascript:WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions(\"ctl00$ctl00$ContentBody$buttonActionWalls$Link\", \"\", true, \"\", \"\", false, true))",
diff --git a/scripts/hyde/elmhurst_download.py b/scripts/hyde/elmhurst_download.py
index 2bc656569..6e9e48057 100644
--- a/scripts/hyde/elmhurst_download.py
+++ b/scripts/hyde/elmhurst_download.py
@@ -28,7 +28,7 @@ SESSION_DIR = HERE / ".elmhurst-session"
 SAMPLE_DIR = (
     HERE.parent.parent
     / "backend/epc_api/json_samples/real_life_examples"
-    / "SAP-Schema-17.1/uprn_10092973954"
+    / "RdSAP-Schema-20.0.0/uprn_22086693"
 )
 
 ASSESSMENT_GUID = "B44A0DB4-4C08-4241-B818-86F060172105"
@@ -85,6 +85,12 @@ def download_reports() -> int:
 
         print(f"entering assessment {ASSESSMENT_GUID} ...", flush=True)
         page.goto(ENTRY_URL, wait_until="networkidle", timeout=60_000)
+        # The Summary nav only fires AFTER the Recommendations validation gate has
+        # been visited — clicking Summary straight from the Address page is a no-op.
+        print("navigating via Recommendations ...", flush=True)
+        with page.expect_navigation(wait_until="networkidle", timeout=60_000):
+            page.click("#ContentBody_buttonActionRecommendations_Link", timeout=15_000)
+        page.wait_for_timeout(600)
         print("navigating to Energy Report Summary ...", flush=True)
         with page.expect_navigation(wait_until="networkidle", timeout=60_000):
             page.click("#ContentBody_buttonActionSummary_Link", timeout=15_000)
diff --git a/scripts/hyde/elmhurst_lib.py b/scripts/hyde/elmhurst_lib.py
index 4f1379880..71d1ba792 100644
--- a/scripts/hyde/elmhurst_lib.py
+++ b/scripts/hyde/elmhurst_lib.py
@@ -49,6 +49,7 @@ from __future__ import annotations
 
 import json
 import os
+import re
 from contextlib import contextmanager
 from pathlib import Path
 from typing import Callable, Generator, Optional
@@ -64,8 +65,12 @@ HERE = Path(__file__).parent
 SESSION_DIR = HERE / ".elmhurst-session"
 CREDS_FILE = HERE / ".elmhurst-creds.json"  # gitignored; {"access":..,"pwd":..}
 
-# The single reusable campaign assessment ("Khalim-test"). Overwrite it per UPRN.
-ASSESSMENT_GUID = "B44A0DB4-4C08-4241-B818-86F060172105"
+# The reusable campaign assessment ("Khalim-test"), overwritten per UPRN. Can be
+# overridden per run via the `ELM_GUID` env var (e.g. a per-UPRN assessment under
+# a different account) — see Limitations "parameterize the GUID".
+ASSESSMENT_GUID = os.environ.get(
+    "ELM_GUID", "B44A0DB4-4C08-4241-B818-86F060172105"
+)
 ENTRY_URL = (
     "https://rdsap10online.elmhurstenergy.co.uk/Processing/WebFormAddress.aspx"
     f"?Guid={ASSESSMENT_GUID}"
@@ -98,17 +103,31 @@ def session() -> Generator[tuple[BrowserContext, Page], None, None]:
             headless=False,
             accept_downloads=True,
             viewport={"width": 1400, "height": 1000},
+            # Container /dev/shm is tiny (64M) → chromium renderer "Target
+            # crashed" mid-build without this. --no-sandbox for rootless Xvfb.
+            args=["--disable-dev-shm-usage", "--no-sandbox"],
         )
         page = ctx.pages[0] if ctx.pages else ctx.new_page()
         page.on("dialog", lambda d: d.accept())
-        page.goto(ENTRY_URL, wait_until="networkidle", timeout=60_000)
-        if "WebFormLogin" in page.url:
-            access, pwd = _creds()
-            page.fill("#ctl00_ctl00_ContentBody_ContentBody_TextBoxAccessCode", access)
-            page.fill("#ctl00_ctl00_ContentBody_ContentBody_TextBoxPassword", pwd)
-            with page.expect_navigation(wait_until="networkidle", timeout=60_000):
-                page.click("#ctl00_ctl00_ContentBody_ContentBody_ImageButtonEnter")
-            page.wait_for_timeout(1000)
+        # Login can be slow/flaky; retry the whole goto+fill a few times.
+        for attempt in range(4):
+            try:
+                page.goto(ENTRY_URL, wait_until="domcontentloaded", timeout=60_000)
+                if "WebFormLogin" not in page.url:
+                    break  # already authed (server session still valid)
+                access, pwd = _creds()
+                ac = "#ctl00_ctl00_ContentBody_ContentBody_TextBoxAccessCode"
+                page.wait_for_selector(ac, state="visible", timeout=30_000)
+                page.fill(ac, access)
+                page.fill("#ctl00_ctl00_ContentBody_ContentBody_TextBoxPassword", pwd)
+                with page.expect_navigation(wait_until="networkidle", timeout=60_000):
+                    page.click("#ctl00_ctl00_ContentBody_ContentBody_ImageButtonEnter")
+                page.wait_for_timeout(1000)
+                if "WebFormLogin" not in page.url:
+                    break
+            except PlaywrightTimeoutError:
+                print(f"  login attempt {attempt+1} timed out, retrying...", flush=True)
+                page.wait_for_timeout(2000)
         try:
             yield ctx, page
         finally:
@@ -162,6 +181,30 @@ def set_select(page: Page, suffix: str, value: str, autopostback: bool = True) -
         loc.select_option(value)
 
 
+def select_options(page: Page, suffix: str) -> list[tuple[str, str]]:
+    """Return [(value, visible_text), …] for the <select> at FP+suffix — lets a
+    sweep enumerate the *real* Elmhurst options instead of hard-coding label
+    strings that drift between RdSAP releases. Skips the blank placeholder."""
+    return page.evaluate(
+        """(id)=>{const s=document.getElementById(id); if(!s)return [];
+        return [...s.options].map(o=>[o.value,(o.text||'').trim()])
+          .filter(([v,t])=>v!=='' && t!=='');}""",
+        f"{FP}{suffix}",
+    )
+
+
+def select_by_contains(page: Page, suffix: str, needle: str, autopostback: bool = True) -> Optional[str]:
+    """Select the option whose visible text contains `needle` (case-insensitive),
+    by its value. Returns the chosen text, or None if no option matched — robust
+    to label drift where the exact string ("CA Cavity" vs "Cavity (CA)") is
+    uncertain until seen live."""
+    for value, text in select_options(page, suffix):
+        if needle.lower() in text.lower():
+            set_select(page, suffix, value, autopostback)
+            return text
+    return None
+
+
 def save_close(page: Page) -> None:
     """Save & Close — commits the whole server session to the DB (so the data
     survives the next fresh-login run). The body button id-suffix avoids the
@@ -226,3 +269,173 @@ def delete_first_window(page: Page) -> None:
         page.wait_for_timeout(200)
         if window_row_count(page) < before:
             break
+
+
+# --- Heating dialogs (boiler search + cascade) ---------------------------
+# Hard-won (campaign certs 100021943298 / 10096028301): every Elmhurst modal
+# dialog (PCDF boiler search, the SelectHeatingDialog cascade for water-heating
+# method and main-heating controls) sits ABOVE a `modalBackground` overlay that
+# makes Playwright's actionability hit-test see the background "intercepting
+# pointer events" — so element .click()/.fill()/.select_option() all fail even
+# with force. The reliable pattern is:
+#   * open the dialog with a JS .click() on its button,
+#   * set <select> values by JS (set .value + dispatch 'change') — this drives
+#     the AutoPostBack cascade without a real click,
+#   * commit by a raw `page.mouse.click(x, y)` at the OK/Select control's centre
+#     (coordinate clicks land on the topmost element = the dialog, not the
+#     background).
+# Typing into the boiler search box needs force-click-then-keyboard (the box is
+# overlapped); result cells are clicked by coordinate (the model column is
+# display:none at >=1024px, so match the row by its Ref-No cell and click the
+# first VISIBLE cell). Direct-writing the PCDF reference number is COSMETIC — it
+# does NOT re-resolve the boiler type/efficiency; only the search dialog does.
+MH1 = (
+    "ContentBody_ContentPlaceHolder1_TabContainer_TabPanelMainHeating1_"
+    "WebUserControlMainHeating1_"
+)
+HEATING_DIALOG = "ContentBody_OutsideUpdatePanel_SelectHeatingDialog_"
+
+
+def dialog_commit(page: Page, label: str = "OK") -> bool:
+    """Coordinate-click a dialog's commit control (a styled <span>, e.g. 'OK' or
+    'Select') — bypasses the modalBackground that defeats element clicks."""
+    pt = page.evaluate(
+        """(lbl)=>{const e=[...document.querySelectorAll('[id*=SelectHeatingDialog] span,[id*=SelectHeatingDialog] a,[id*=SelectHeatingDialog] input,[id*=SelectBoilerDialog] span')]
+        .find(x=>new RegExp('^'+lbl+'$','i').test((x.value||x.innerText||'').trim()) && x.offsetParent);
+        if(!e)return null;const c=e.getBoundingClientRect();return {x:c.x+c.width/2,y:c.y+c.height/2};}""",
+        label,
+    )
+    if not pt:
+        return False
+    page.mouse.click(pt["x"], pt["y"])
+    page.wait_for_timeout(SETTLE_MS * 3)
+    return True
+
+
+def set_heating_dialog(page: Page, open_button_suffix: str, *level_regexes: str) -> None:
+    """Open a SelectHeatingDialog cascade (water-heating method or main-heating
+    controls) via the button at FP+`open_button_suffix`, set DropDownList1..N to
+    the options matching each regex (JS, fires the cascade), then coordinate-OK.
+    e.g. water (combi): set_heating_dialog(page, MH..ButtonWaterHeatingCode,
+    'From Space Heating', 'From the primary heating system');
+    control 2106:       set_heating_dialog(page, ..ButtonMainHeatingControls,
+    '^Boilers', '^Standard', 'CBE Programmer, room thermostat and TRVs')."""
+    page.evaluate("(id)=>{const e=document.getElementById(id); if(e)e.click();}", f"{FP}{open_button_suffix}")
+    page.wait_for_timeout(SETTLE_MS * 3)
+    for i, rx in enumerate(level_regexes, start=1):
+        page.evaluate(
+            """(a)=>{const s=document.getElementById(a[0]);if(!s)return;
+            const o=[...s.options].find(o=>new RegExp(a[1],'i').test(o.text));
+            if(o){s.value=o.value;s.dispatchEvent(new Event('change',{bubbles:true}));}}""",
+            [f"{HEATING_DIALOG}DropDownList{i}", rx],
+        )
+        page.wait_for_timeout(SETTLE_MS * 4)  # AutoPostBack re-renders the next level
+    dialog_commit(page, "OK")
+
+
+def select_boiler(page: Page, query: str, ref: str) -> str:
+    """Set the main-heating boiler to PCDB `ref` via the search dialog. `query`
+    is a full-text search (brand/model) that surfaces `ref` on page 1. TWO-STEP
+    commit: click the result ROW (highlights it) then the top 'Select' span."""
+    page.evaluate("(id)=>{const e=document.getElementById(id); if(e)e.click();}", f"{MH1}ButtonBoilerReference")
+    page.wait_for_selector("[id*='SelectBoilerDialog_TextBoxFullSearch']", state="visible", timeout=10_000)
+    page.locator("[id*='SelectBoilerDialog_TextBoxFullSearch']").click(force=True)
+    page.keyboard.type(query)
+    page.locator("[id*='SelectBoilerDialog_HyperLinkActionBoilerSearch']").click(force=True)
+    page.wait_for_timeout(SETTLE_MS * 4)
+    pt = page.evaluate(
+        """(ref)=>{const t=document.querySelector("[id*=SelectBoilerDialog] [id*=GridView]");if(!t)return null;
+        for(const r of t.querySelectorAll('tr')){const tds=[...r.querySelectorAll('td')];
+        if(tds.length>2 && tds[2].innerText.replace(/\\s+/g,' ').trim()===ref){
+        const v=tds.find(td=>td.offsetParent&&td.getClientRects().length);
+        if(v){const c=v.getBoundingClientRect();return {x:c.x+c.width/2,y:c.y+c.height/2};}}}return null;}""",
+        ref,
+    )
+    if not pt:
+        return "row-not-found"
+    page.mouse.click(pt["x"], pt["y"])  # highlight the row
+    page.wait_for_timeout(SETTLE_MS)
+    page.locator("[id*=SelectBoilerDialog] span", has_text="Select").filter(
+        visible=True
+    ).first.click(force=True, timeout=8_000)
+    page.wait_for_timeout(SETTLE_MS * 3)
+    return "ok"
+
+
+def read_default_uvalue(
+    page: Page, suffix: Optional[str] = None, label_regex: str = r"Default U-value"
+) -> Optional[float]:
+    """Read the read-only "Default U-value [W/m²K]" the tool computes for the
+    active fabric element (wall/roof/floor), after the type/insulation/thickness
+    postbacks have settled.
+
+    The override checkbox ("U-value Known") is documented as unreliable to toggle,
+    but the *default* field is a plain display (a SPAN whose text IS the value,
+    e.g. `…WebUserControlWallMain_LabelUValueDefault`) that RdSAP recomputes on
+    every postback — that recomputed number is Elmhurst's
+    age-band×insulation×thickness answer, which is exactly what the probe wants.
+
+    Preferred: pass the exact `suffix` (after FP) of that label span. Without it,
+    falls back to LABEL PROXIMITY (match `label_regex`, read the nearest numeric),
+    which is brittle near the thickness box. Returns None if not found (caller
+    should fall back to the screenshot)."""
+    if suffix is not None:
+        raw_text = page.evaluate(
+            "(id)=>{const e=document.getElementById(id); return e?(e.textContent||'').trim():null;}",
+            f"{FP}{suffix}",
+        )
+        if raw_text is not None:
+            m = re.search(r"-?\d+(?:\.\d+)?", str(raw_text))
+            if m:
+                return float(m.group(0))
+        return None
+    raw = page.evaluate(
+        """(rx)=>{
+        const re=new RegExp(rx,'i');
+        // Candidate label nodes: any visible element whose own text matches.
+        const labels=[...document.querySelectorAll('label,span,td,div,th')]
+          .filter(e=>e.offsetParent && re.test((e.textContent||'').trim()));
+        const numFrom=(s)=>{const m=(s||'').match(/-?\\d+(?:\\.\\d+)?/); return m?m[0]:null;};
+        for(const lab of labels){
+          // 1) a sibling/descendant input carrying the value
+          let scope=lab.closest('tr,div,td')||lab.parentElement||lab;
+          const inp=scope.querySelector("input[type='text'],input:not([type])");
+          if(inp && numFrom(inp.value)!==null) return inp.value;
+          // 2) the next cell's text (label | value table layout)
+          let sib=lab.nextElementSibling;
+          for(let i=0;i<3 && sib;i++,sib=sib.nextElementSibling){
+            const n=numFrom(sib.textContent);
+            if(n!==null && !re.test(sib.textContent)) return n;
+          }
+          // 3) trailing number in the label's own container, after the label text
+          const tail=numFrom(scope.textContent.replace(lab.textContent,''));
+          if(tail!==null) return tail;
+        }
+        return null;}""",
+        label_regex,
+    )
+    if raw is None:
+        return None
+    try:
+        return float(str(raw).strip())
+    except ValueError:
+        return None
+
+
+def clear_hot_water_cylinder(page: Page, panel: str = "TabContainer_TabPanelWaterHeating_") -> None:
+    """Uncheck the HW cylinder (combi). The checkbox won't uncheck via
+    .uncheck()/commit (a regular-boiler default re-asserts it); JS-set
+    checked=false + fire click + change drives the AutoPostBack."""
+    cid = f"{FP}{panel}CheckBoxHotWaterCylinder"
+    if not page.locator(f"#{cid}").is_checked():
+        return
+    try:
+        with page.expect_navigation(wait_until="load", timeout=8_000):
+            page.evaluate(
+                """(id)=>{const c=document.getElementById(id);if(c){c.checked=false;
+                c.dispatchEvent(new Event('click',{bubbles:true}));
+                c.dispatchEvent(new Event('change',{bubbles:true}));}}""",
+                cid,
+            )
+    except PlaywrightTimeoutError:
+        page.wait_for_timeout(2_000)
diff --git a/scripts/hyde/unknowns_review.md b/scripts/hyde/unknowns_review.md
new file mode 100644
index 000000000..445142211
--- /dev/null
+++ b/scripts/hyde/unknowns_review.md
@@ -0,0 +1,53 @@
+# Hyde portfolio 796 — UNKNOWN overrides for review
+
+After ChatGPT classification, **19 distinct descriptions** did not auto-resolve (out of ~440 distinct across all components). Grouped below with a **proposed value** (must be one of the allowed enum values) + the row count it affects. Nothing is written to the DB until these are confirmed.
+
+## 1. construction_age_band — 29,829 rows (DETERMINISTIC, no judgement)
+
+The classifier didn't extract the band letter in batch, but the band IS the leading letter, so these are mapped mechanically (`"D: 1950-1966"` → `D`). Just confirm the approach.
+
+| description | → band | rows |
+|---|---|---|
+| D: 1950-1966 | `D` | 4,978 |
+| K: 2007-2011 | `K` | 4,201 |
+| I: 1996-2002 | `I` | 3,708 |
+| B: 1900-1929 | `B` | 3,222 |
+| H: 1991-1995 | `H` | 2,747 |
+| E: 1967-1975 | `E` | 2,479 |
+| J: 2003-2006 | `J` | 2,221 |
+| F: 1976-1982 | `F` | 2,071 |
+| C: 1930-1949 | `C` | 1,840 |
+| G: 1983-1990 | `G` | 1,615 |
+| A: pre-1900 | `A` | 615 |
+| M: 2023 onwards | `M` | 132 |
+
+## 2. roof_type (flat roofs) — 1,473 rows (NEEDS KHALIM'S CALL)
+
+Flat-roof insulation drives the SAP roof U-value. **`Flat: As Built` (1,172) + `Flat: Unknown` (194) are the load-bearing decision** — proposed conservatively as *no insulation (assumed)*.
+
+| description | proposed value | rows | alt options |
+|---|---|---|---|
+| Flat: As Built | `Flat, no insulation (assumed)` | 1,172 | Flat, insulated (assumed) / Flat, limited insulation (assumed) / Flat, no insulation (assumed) |
+| Flat: Unknown | `Flat, no insulation (assumed)` | 194 | Flat, insulated (assumed) / Flat, limited insulation (assumed) / Flat, no insulation (assumed) |
+| Flat: 150mm | `Flat, insulated` | 59 | Flat, insulated (assumed) / Flat, limited insulation (assumed) / Flat, no insulation (assumed) |
+| Flat: 100mm | `Flat, insulated` | 32 | Flat, insulated (assumed) / Flat, limited insulation (assumed) / Flat, no insulation (assumed) |
+| Flat: 50mm | `Flat, limited insulation` | 13 | Flat, insulated (assumed) / Flat, limited insulation (assumed) / Flat, no insulation (assumed) |
+| SameDwellingAbove | `(same dwelling above)` | 3 | Flat, insulated (assumed) / Flat, limited insulation (assumed) / Flat, no insulation (assumed) |
+
+## 3. wall_type — 7 rows
+
+| description | proposed value | rows |
+|---|---|---|
+| TimberFrame: Internal | `Timber frame, with additional insulation` | 7 |
+
+## How to apply after review
+
+Edit the `corrected_value` column of `overrides_edits.csv`, then:
+
+```
+python scripts/hyde/build_property_overrides.py validate    --edits overrides_edits.csv
+python scripts/hyde/build_property_overrides.py apply-edits --edits overrides_edits.csv --portfolio-id 796 --apply
+python scripts/hyde/build_property_overrides.py write       --excel scripts/hyde/hyde_property_overrides.xlsx --portfolio-id 796 --apply
+```
+
+> Note: a proper fix for the age classifier (a prompt hint so the production lambda extracts the band letter) is a separate follow-up; these script edits handle this run.
\ No newline at end of file
diff --git a/scripts/hyde_epc_schema_versions.py b/scripts/hyde_epc_schema_versions.py
new file mode 100644
index 000000000..7bb882aca
--- /dev/null
+++ b/scripts/hyde_epc_schema_versions.py
@@ -0,0 +1,159 @@
+"""Tally the EPC schema versions across the hyde list (manipulation_filled UPRNs).
+
+For every resolved UPRN we look up its EPC certificate's ``schemaType`` (e.g.
+``RdSAP-Schema-21.0.1``, ``RdSAP-Schema-17.1``, ``SAP-Schema-16.2``). The
+gov EPC ``/api/domestic/search`` endpoint returns ``schemaType`` per row, so one
+search-per-postcode covers every UPRN in that postcode — far cheaper than a
+certificate fetch per UPRN. The latest cert (max registrationDate) wins per UPRN.
+
+Outputs: a per-schema-version tally with one example UPRN each, plus a CSV
+mapping every UPRN -> schema version.
+
+    python -m scripts.hyde_epc_schema_versions
+    python -m scripts.hyde_epc_schema_versions --workers 8 --out scripts/hyde_schema_versions.csv
+
+Reads OPEN_EPC_API_TOKEN from backend/.env. Run from the worktree root.
+"""
+
+from __future__ import annotations
+
+import argparse
+import os
+import sys
+import time
+from collections import Counter, defaultdict
+from concurrent.futures import ThreadPoolExecutor
+from pathlib import Path
+from typing import Any, Optional
+
+import httpx
+from dotenv import load_dotenv
+
+_REPO_ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
+
+from scripts.fill_domna_addresses import clean_postcode  # noqa: E402
+from scripts.finalise_to_property_table import load_rows  # noqa: E402
+
+_BASE = "https://api.get-energy-performance-data.communities.gov.uk"
+_SEARCH = f"{_BASE}/api/domestic/search"
+NOT_IN_EPC = "NOT_IN_EPC"
+
+_DEFAULT_IN = _REPO_ROOT / "scripts" / "manipulation_filled.xlsx"
+_DEFAULT_OUT = _REPO_ROOT / "scripts" / "hyde_schema_versions.csv"
+
+
+def search_postcode(
+    client: httpx.Client, postcode: str, headers: dict[str, str]
+) -> list[dict[str, Any]]:
+    """Return the search rows for a postcode, retrying on rate-limit (429)."""
+    for attempt in range(5):
+        resp = client.get(_SEARCH, params={"postcode": postcode}, headers=headers, timeout=30)
+        if resp.status_code == 429:
+            retry_after = float(resp.headers.get("Retry-After", "2"))
+            time.sleep(min(retry_after, 10) * (attempt + 1))
+            continue
+        # 400 = malformed postcode (data-entry typo), 404 = no certs — skip both.
+        if resp.status_code in (400, 404):
+            return []
+        resp.raise_for_status()
+        return resp.json().get("data", [])
+    return []
+
+
+def build_uprn_schema_map(
+    postcodes: list[str], token: str, workers: int
+) -> dict[int, tuple[str, str]]:
+    """Map UPRN -> (schemaType, registrationDate) for the latest cert per UPRN.
+
+    One search per postcode (concurrent); later we look our UPRNs up in here.
+    """
+    headers = {"Authorization": f"Bearer {token}", "Accept": "application/json"}
+    by_uprn: dict[int, tuple[str, str]] = {}
+    done = 0
+    total = len(postcodes)
+
+    def fetch(pc: str) -> list[dict[str, Any]]:
+        with httpx.Client() as client:
+            return search_postcode(client, pc, headers)
+
+    with ThreadPoolExecutor(max_workers=workers) as pool:
+        for rows in pool.map(fetch, postcodes):
+            for row in rows:
+                uprn = row.get("uprn")
+                schema = row.get("schemaType")
+                reg = row.get("registrationDate") or ""
+                if uprn is None or not schema:
+                    continue
+                prev = by_uprn.get(int(uprn))
+                # Keep the latest-registered cert's schema for this UPRN.
+                if prev is None or reg > prev[1]:
+                    by_uprn[int(uprn)] = (str(schema), str(reg))
+            done += 1
+            if done % 250 == 0:
+                print(f"  searched {done}/{total} postcodes, {len(by_uprn)} uprns seen")
+    return by_uprn
+
+
+def _parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--in", dest="inp", type=Path, default=_DEFAULT_IN)
+    parser.add_argument("--out", type=Path, default=_DEFAULT_OUT)
+    parser.add_argument("--workers", type=int, default=8)
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = _parse_args()
+    load_dotenv(_REPO_ROOT / "backend" / ".env")
+    token = os.environ.get("OPEN_EPC_API_TOKEN")
+    if not token:
+        print("OPEN_EPC_API_TOKEN not set (backend/.env)")
+        return 2
+
+    _, rows = load_rows(args.inp, include_unmatched=False)
+    pairs: list[tuple[int, str, str]] = []  # (uprn, postcode_clean, address)
+    for r in rows:
+        uprn = r["address2uprn_uprn"]
+        if uprn:
+            pairs.append((int(uprn), clean_postcode(r["postcode"]), r["address2uprn_address"]))
+    postcodes = sorted({pc for _, pc, _ in pairs if pc})
+    print(f"{len(pairs)} UPRNs across {len(postcodes)} unique postcodes")
+
+    by_uprn = build_uprn_schema_map(postcodes, token, args.workers)
+    print(f"EPC search returned schema for {len(by_uprn)} distinct UPRNs")
+
+    # Resolve each hyde UPRN to its schema version.
+    tally: Counter[str] = Counter()
+    example: dict[str, tuple[int, str]] = {}
+    out_lines: list[tuple[int, str, str, str]] = []  # uprn, schema, postcode, address
+    seen: set[int] = set()
+    for uprn, pc, address in pairs:
+        if uprn in seen:
+            continue
+        seen.add(uprn)
+        schema = by_uprn.get(uprn, (NOT_IN_EPC, ""))[0]
+        tally[schema] += 1
+        example.setdefault(schema, (uprn, address))
+        out_lines.append((uprn, schema, pc, address))
+
+    # Write the full per-UPRN mapping.
+    import csv
+
+    with args.out.open("w", newline="", encoding="utf-8") as fh:
+        w = csv.writer(fh)
+        w.writerow(["uprn", "schema_version", "postcode", "matched_address"])
+        w.writerows(out_lines)
+
+    print(f"\nSchema versions across {len(seen)} distinct UPRNs:\n")
+    print(f"  {'schema version':<26} {'count':>7}   example UPRN")
+    print(f"  {'-'*26} {'-'*7}   {'-'*12}")
+    for schema, count in tally.most_common():
+        ex_uprn, ex_addr = example[schema]
+        print(f"  {schema:<26} {count:>7}   {ex_uprn}  ({ex_addr})")
+    print(f"\nFull mapping -> {args.out}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/lisasrequest/compare_to_ara.py b/scripts/lisasrequest/compare_to_ara.py
new file mode 100644
index 000000000..c30b5f29f
--- /dev/null
+++ b/scripts/lisasrequest/compare_to_ara.py
@@ -0,0 +1,169 @@
+"""Compare our step-1 UPRN resolution against the old "Ara output" data.
+
+The Ara data lives in scripts/lisasrequest/Durkan data.xlsx, sheet "Ara output",
+and carries UPRNs from our previous dataset. It is NOT treated as ground truth —
+this just lines it up against what we found / didn't find so a human can eyeball
+the differences. (We read the xlsx, not the CSV export: the CSV mangled half the
+UPRNs to Excel scientific notation, e.g. ``1.00023E+11``; the xlsx keeps them
+intact, so every comparison below is exact.)
+
+Join key is (postcode, leading number, first street word), since the UPRN is the
+thing under comparison and Ara's address strings differ from the landlord input.
+
+Each of our rows lands in one comparison bucket:
+    match            both found a UPRN and they are equal.
+    differ           both found a UPRN and they differ.
+    we_only          we resolved a UPRN, Ara had none for this address.
+    ara_only         we did NOT resolve, but Ara had a UPRN  <- recovery candidates.
+    both_missing     neither resolved a UPRN.
+    no_ara_record    the Ara sheet had no row matching this address at all.
+
+    python -m scripts.lisasrequest.compare_to_ara
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import re
+import sys
+from collections import Counter, OrderedDict
+from pathlib import Path
+from typing import Optional
+
+import pandas as pd
+
+_REPO_ROOT = Path(__file__).resolve().parents[2]
+
+ADDRESS_COL = "address"
+POSTCODE_COL = "postcode"
+OUR_UPRN_COL = "domna_address_uprn"
+OUR_SOURCE_COL = "domna_source"
+
+ARA_UPRN_COL = "EPC_B.uprn"
+ARA_ADDRESS_COL = "EPC_B.address"
+ARA_POSTCODE_COL = "EPC_B.postcode"
+ARA_SHEET = "Ara output"
+
+_OUR_IN = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_domna_filled.csv"
+_ARA_IN = _REPO_ROOT / "scripts" / "lisasrequest" / "Durkan data.xlsx"
+_DEFAULT_OUT = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_vs_ara.csv"
+
+Key = tuple[str, str, str]
+
+
+def norm_key(address: str, postcode: str) -> Key:
+    """(postcode-no-space, leading number, first street word) — the join key."""
+    pc = postcode.upper().replace(" ", "")
+    upper = address.upper()
+    nums = re.findall(r"\d+[A-Z]?", upper)
+    words = [w for w in re.findall(r"[A-Z]+", upper) if w != "FLAT"]
+    return (pc, nums[0] if nums else "", words[0] if words else "")
+
+
+def load_ara(path: Path) -> tuple[dict[Key, dict[str, str]], int]:
+    """Index the Ara-output xlsx sheet by join key (first row wins).
+
+    Returns (index, duplicates). Read as strings so UPRNs keep their full value.
+    """
+    df = pd.read_excel(path, sheet_name=ARA_SHEET, dtype=str)
+    rows: list[dict[str, str]] = df.fillna("").to_dict(orient="records")
+    index: dict[Key, dict[str, str]] = OrderedDict()
+    dupes = 0
+    for row in rows:
+        address = str(row.get(ARA_ADDRESS_COL) or "").strip()
+        postcode = str(row.get(ARA_POSTCODE_COL) or row.get(POSTCODE_COL) or "").strip()
+        if not address:
+            continue
+        key = norm_key(address, postcode)
+        if key in index:
+            dupes += 1
+            continue
+        index[key] = row
+    return index, dupes
+
+
+def classify(
+    our_uprn: str, our_found: bool, ara: Optional[dict[str, str]]
+) -> tuple[str, str, str]:
+    """Return (comparison, ara_uprn, ara_address) for one of our rows."""
+    if ara is None:
+        return ("no_ara_record", "", "")
+    ara_uprn = (ara.get(ARA_UPRN_COL) or "").strip()
+    ara_address = (ara.get(ARA_ADDRESS_COL) or "").strip()
+    ara_found = bool(ara_uprn)
+
+    if our_found and ara_found:
+        comparison = "match" if our_uprn == ara_uprn else "differ"
+    elif our_found and not ara_found:
+        comparison = "we_only"
+    elif not our_found and ara_found:
+        comparison = "ara_only"
+    else:
+        comparison = "both_missing"
+    return (comparison, ara_uprn, ara_address)
+
+
+def compare(
+    our_rows: list[dict[str, str]], ara_index: dict[Key, dict[str, str]]
+) -> list[dict[str, str]]:
+    out: list[dict[str, str]] = []
+    for row in our_rows:
+        address = (row.get(ADDRESS_COL) or "").strip()
+        postcode = (row.get(POSTCODE_COL) or "").strip()
+        our_uprn = (row.get(OUR_UPRN_COL) or "").strip()
+        our_source = (row.get(OUR_SOURCE_COL) or "").strip()
+        our_found = bool(our_uprn) and our_source != "not_found"
+
+        ara = ara_index.get(norm_key(address, postcode))
+        comparison, ara_uprn, ara_address = classify(our_uprn, our_found, ara)
+        out.append(
+            {
+                "address": address,
+                "postcode": postcode,
+                "our_uprn": our_uprn,
+                "our_source": our_source,
+                "ara_uprn": ara_uprn,
+                "ara_address": ara_address,
+                "comparison": comparison,
+            }
+        )
+    return out
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--ours", type=Path, default=_OUR_IN)
+    parser.add_argument("--ara", type=Path, default=_ARA_IN)
+    parser.add_argument("--out", type=Path, default=_DEFAULT_OUT)
+    args = parser.parse_args()
+
+    with args.ours.open(newline="", encoding="utf-8-sig") as fh:
+        our_rows = [dict(r) for r in csv.DictReader(fh)]
+    ara_index, dupes = load_ara(args.ara)
+    print(f"Loaded {len(our_rows)} of our rows; {len(ara_index)} Ara keys "
+          f"({dupes} duplicate Ara rows ignored).")
+
+    result = compare(our_rows, ara_index)
+    fieldnames = list(result[0].keys())
+    with args.out.open("w", newline="", encoding="utf-8") as fh:
+        writer = csv.DictWriter(fh, fieldnames=fieldnames)
+        writer.writeheader()
+        writer.writerows(result)
+
+    counts = Counter(r["comparison"] for r in result)
+    print(f"\nComparison of {len(result)} rows -> {args.out}")
+    for name in (
+        "match",
+        "differ",
+        "we_only",
+        "ara_only",
+        "both_missing",
+        "no_ara_record",
+    ):
+        print(f"  {name}: {counts.get(name, 0)}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/lisasrequest/durkan_805_schema_check.py b/scripts/lisasrequest/durkan_805_schema_check.py
new file mode 100644
index 000000000..776a7813d
--- /dev/null
+++ b/scripts/lisasrequest/durkan_805_schema_check.py
@@ -0,0 +1,142 @@
+"""EPC SAP-schema check for portfolio 805, and whether each is mapper-supported.
+
+For every UPRN currently in the ``property`` table for portfolio 805, look up its
+latest EPC certificate's ``schemaType`` (one /api/domestic/search per postcode,
+reusing scripts.hyde_epc_schema_versions) and check it against the schemas the
+EpcPropertyData mapper actually handles
+(``EpcPropertyDataMapper.from_api_response``, datatypes/epc/domain/mapper.py).
+
+Prints a per-schema tally with a supported? flag and an example UPRN, and writes
+the full per-UPRN mapping to durkan_805_schema_check.csv.
+
+    python -m scripts.lisasrequest.durkan_805_schema_check
+    python -m scripts.lisasrequest.durkan_805_schema_check --portfolio 805 --workers 8
+
+Reads OPEN_EPC_API_TOKEN from backend/.env and POSTGRES_* from the root .env.
+Run from the worktree root.
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import os
+import sys
+from collections import Counter
+from pathlib import Path
+
+from dotenv import load_dotenv
+from sqlmodel import select
+
+_REPO_ROOT = Path(__file__).resolve().parents[2]
+sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
+
+from infrastructure.postgres.config import PostgresConfig  # noqa: E402
+from infrastructure.postgres.engine import make_engine, make_session  # noqa: E402
+from infrastructure.postgres.property_table import PropertyRow  # noqa: E402
+from scripts.fill_domna_addresses import clean_postcode  # noqa: E402
+from scripts.hyde_epc_schema_versions import (  # noqa: E402
+    NOT_IN_EPC,
+    build_uprn_schema_map,
+)
+
+# Schemas EpcPropertyDataMapper.from_api_response dispatches on (everything else
+# raises "Unsupported EPC schema"). Keep in sync with mapper.py:2539-2603.
+SUPPORTED_SCHEMAS = frozenset(
+    {
+        "RdSAP-Schema-17.0",
+        "RdSAP-Schema-17.1",
+        "RdSAP-Schema-18.0",
+        "RdSAP-Schema-19.0",
+        "RdSAP-Schema-20.0.0",
+        "RdSAP-Schema-21.0.0",
+        "RdSAP-Schema-21.0.1",
+        "SAP-Schema-16.0",
+        "SAP-Schema-16.2",
+        "SAP-Schema-16.3",
+        "SAP-Schema-17.0",
+        "SAP-Schema-17.1",
+        "SAP-Schema-18.0.0",
+    }
+)
+
+_DEFAULT_OUT = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_805_schema_check.csv"
+
+
+def load_portfolio_uprns(portfolio_id: int) -> list[tuple[int, str]]:
+    """Return (uprn, postcode) for every property in the portfolio with a UPRN."""
+    load_dotenv(_REPO_ROOT / ".env")
+    engine = make_engine(PostgresConfig.from_env(os.environ))
+    session = make_session(engine)
+    try:
+        stmt = select(PropertyRow.uprn, PropertyRow.postcode).where(
+            PropertyRow.portfolio_id == portfolio_id
+        )
+        out: list[tuple[int, str]] = []
+        for uprn, postcode in session.exec(stmt).all():
+            if uprn is not None:
+                out.append((int(uprn), str(postcode or "")))
+        return out
+    finally:
+        session.close()
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--portfolio", type=int, default=805)
+    parser.add_argument("--out", type=Path, default=_DEFAULT_OUT)
+    parser.add_argument("--workers", type=int, default=8)
+    args = parser.parse_args()
+
+    load_dotenv(_REPO_ROOT / "backend" / ".env")
+    token = os.environ.get("OPEN_EPC_API_TOKEN")
+    if not token:
+        print("OPEN_EPC_API_TOKEN not set (backend/.env)")
+        return 2
+
+    pairs = load_portfolio_uprns(args.portfolio)
+    postcodes = sorted({clean_postcode(pc) for _, pc in pairs if pc})
+    print(
+        f"Portfolio {args.portfolio}: {len(pairs)} UPRNs across "
+        f"{len(postcodes)} unique postcodes"
+    )
+
+    by_uprn = build_uprn_schema_map(postcodes, token, args.workers)
+    print(f"EPC search returned a schema for {len(by_uprn)} distinct UPRNs")
+
+    tally: Counter[str] = Counter()
+    example: dict[str, int] = {}
+    rows_out: list[tuple[int, str, str, str]] = []  # uprn, schema, supported, postcode
+    seen: set[int] = set()
+    for uprn, pc in pairs:
+        if uprn in seen:
+            continue
+        seen.add(uprn)
+        schema = by_uprn.get(uprn, (NOT_IN_EPC, ""))[0]
+        supported = "yes" if schema in SUPPORTED_SCHEMAS else "no"
+        tally[schema] += 1
+        example.setdefault(schema, uprn)
+        rows_out.append((uprn, schema, supported, clean_postcode(pc)))
+
+    with args.out.open("w", newline="", encoding="utf-8") as fh:
+        writer = csv.writer(fh)
+        writer.writerow(["uprn", "schema_version", "mapper_supported", "postcode"])
+        writer.writerows(rows_out)
+
+    supported_count = sum(c for s, c in tally.items() if s in SUPPORTED_SCHEMAS)
+    print(f"\nSchema versions across {len(seen)} distinct UPRNs in portfolio "
+          f"{args.portfolio}:\n")
+    print(f"  {'schema version':<26} {'count':>5}  {'supported?':<10} example UPRN")
+    print(f"  {'-' * 26} {'-' * 5}  {'-' * 10} {'-' * 12}")
+    for schema, count in tally.most_common():
+        supported = "yes" if schema in SUPPORTED_SCHEMAS else "NO"
+        print(f"  {schema:<26} {count:>5}  {supported:<10} {example[schema]}")
+    print(
+        f"\nMapper-supported: {supported_count}/{len(seen)} UPRNs. "
+        f"Full mapping -> {args.out}"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/lisasrequest/fill_domna_address.py b/scripts/lisasrequest/fill_domna_address.py
new file mode 100644
index 000000000..98d700710
--- /dev/null
+++ b/scripts/lisasrequest/fill_domna_address.py
@@ -0,0 +1,200 @@
+"""Step 1 (Durkan portfolio): resolve a UPRN per CSV row via EPC then OS.
+
+Input: scripts/lisasrequest/260611_Sample_Seed_Portfolio_Durkan_split_addresses(Split Addresses).csv
+    columns include ``address`` and ``postcode``.
+
+Every row carries an address and none carry a UPRN, so there is a single case:
+
+  * resolve a UPRN from ``address`` + ``postcode`` via the EPC API (relaxed
+    address variants, threshold 0.7), then Ordnance Survey Places as a fallback
+    (threshold 0.6).
+  * not resolvable -> domna_source = "not_found"; uprn/address/score left empty.
+
+Writes a NEW CSV = every original column, in order, plus four DOMNA columns:
+
+    domna_address_found   the canonical address EPC/OS returned (matched string)
+    domna_address_uprn    the resolved UPRN ("" when unresolved)
+    domna_lexiscore       the match score in [0, 1] ("" when unresolved)
+    domna_source          epc / ordnance_survey / not_found
+
+This is the human-review file; step 2 (resolve_uprns_for_finaliser) reshapes it
+into the finaliser columns without re-hitting the APIs.
+
+    python -m scripts.lisasrequest.fill_domna_address
+    python -m scripts.lisasrequest.fill_domna_address --limit 20   # smoke test
+
+Resolution reuses the relaxed matchers from scripts.fill_domna_addresses. Keys
+come from backend/.env (OPEN_EPC_API_TOKEN, ORDNANCE_SURVEY_API_KEY). Run from
+the worktree root (import trap).
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import sys
+from pathlib import Path
+from typing import Optional
+
+import pandas as pd
+
+_REPO_ROOT = Path(__file__).resolve().parents[2]
+sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
+
+from scripts.fill_domna_addresses import (  # noqa: E402
+    Hit,
+    resolve_epc_relaxed,
+    resolve_os_relaxed,
+)
+from scripts.resolve_uprns_for_finaliser import clean_postcode, load_keys  # noqa: E402
+
+ADDRESS_COL = "address"
+POSTCODE_COL = "postcode"
+FOUND_ADDRESS_COL = "domna_address_found"
+FOUND_UPRN_COL = "domna_address_uprn"
+LEXISCORE_COL = "domna_lexiscore"
+SOURCE_COL = "domna_source"
+NOT_FOUND = "not_found"
+_RESULT_COLS = (FOUND_ADDRESS_COL, FOUND_UPRN_COL, LEXISCORE_COL, SOURCE_COL)
+
+_CSV_NAME = "260611_Sample_Seed_Portfolio_Durkan_split_addresses(Split Addresses).csv"
+_DEFAULT_IN = _REPO_ROOT / "scripts" / "lisasrequest" / _CSV_NAME
+_DEFAULT_OUT = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_domna_filled.csv"
+
+
+def read_rows(path: Path) -> tuple[list[dict[str, str]], list[str]]:
+    """Read a CSV into (rows, fieldnames), preserving column order."""
+    with path.open(newline="", encoding="utf-8-sig") as fh:
+        reader = csv.DictReader(fh)
+        fieldnames = list(reader.fieldnames or [])
+        rows = [dict(row) for row in reader]
+    return rows, fieldnames
+
+
+def resolve_one(
+    address: str,
+    postcode_raw: str,
+    *,
+    epc_token: Optional[str],
+    os_api_key: Optional[str],
+    epc_cache: dict[str, pd.DataFrame],
+    os_cache: dict[str, pd.DataFrame],
+) -> Optional[Hit]:
+    """Resolve one row's UPRN: EPC (relaxed) first, then OS Places fallback."""
+    postcode_clean = clean_postcode(postcode_raw)
+    if not address or not postcode_clean:
+        return None
+
+    hit: Optional[Hit] = None
+    if epc_token:
+        try:
+            hit = resolve_epc_relaxed(address, postcode_clean, epc_cache)
+        except Exception as exc:
+            print(f"  EPC failed {address!r} / {postcode_clean}: {exc}")
+    if hit is None and os_api_key:
+        try:
+            hit = resolve_os_relaxed(address, postcode_clean, os_api_key, os_cache)
+        except Exception as exc:
+            print(f"  OS failed {address!r} / {postcode_clean}: {exc}")
+    return hit
+
+
+def fill(
+    rows: list[dict[str, str]],
+    *,
+    epc_token: Optional[str],
+    os_api_key: Optional[str],
+) -> tuple[int, int, int]:
+    """Fill the DOMNA columns on each row in place.
+
+    Returns (epc_hits, os_hits, not_found) counts.
+    """
+    epc_cache: dict[str, pd.DataFrame] = {}
+    os_cache: dict[str, pd.DataFrame] = {}
+    epc_hits = os_hits = not_found = 0
+    total = len(rows)
+
+    for n, row in enumerate(rows, start=1):
+        address = str(row.get(ADDRESS_COL, "") or "").strip()
+        postcode_raw = str(row.get(POSTCODE_COL, "") or "").strip()
+        hit = resolve_one(
+            address,
+            postcode_raw,
+            epc_token=epc_token,
+            os_api_key=os_api_key,
+            epc_cache=epc_cache,
+            os_cache=os_cache,
+        )
+        if hit is None:
+            row[FOUND_ADDRESS_COL] = ""
+            row[FOUND_UPRN_COL] = ""
+            row[LEXISCORE_COL] = ""
+            row[SOURCE_COL] = NOT_FOUND
+            not_found += 1
+        else:
+            uprn, matched, score, source = hit
+            row[FOUND_ADDRESS_COL] = matched
+            row[FOUND_UPRN_COL] = uprn
+            row[LEXISCORE_COL] = str(round(score, 4))
+            row[SOURCE_COL] = source
+            if source == "epc":
+                epc_hits += 1
+            else:
+                os_hits += 1
+        print(
+            f"[{n}/{total}] {address!r} -> "
+            f"{row[FOUND_UPRN_COL] or '(no match)'} ({row[SOURCE_COL]})"
+        )
+
+    return epc_hits, os_hits, not_found
+
+
+def write_rows(rows: list[dict[str, str]], path: Path, fieldnames: list[str]) -> None:
+    """Write rows to CSV, preserving input columns and appending DOMNA columns."""
+    out_fields = list(fieldnames)
+    for col in _RESULT_COLS:
+        if col not in out_fields:
+            out_fields.append(col)
+    with path.open("w", newline="", encoding="utf-8") as fh:
+        writer = csv.DictWriter(fh, fieldnames=out_fields, extrasaction="ignore")
+        writer.writeheader()
+        writer.writerows(rows)
+
+
+def _parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--in", dest="inp", type=Path, default=_DEFAULT_IN)
+    parser.add_argument("--out", type=Path, default=_DEFAULT_OUT)
+    parser.add_argument("--limit", type=int, default=None, help="process first N rows")
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = _parse_args()
+    epc_token, os_api_key = load_keys()
+    if not epc_token:
+        print("OPEN_EPC_API_TOKEN not set (backend/.env) — EPC resolution disabled")
+    if not os_api_key:
+        print("ORDNANCE_SURVEY_API_KEY not set (backend/.env) — OS fallback disabled")
+
+    rows, fieldnames = read_rows(args.inp)
+    if args.limit is not None:
+        rows = rows[: args.limit]
+    print(f"Loaded {len(rows)} rows from {args.inp}")
+
+    epc_hits, os_hits, not_found = fill(
+        rows, epc_token=epc_token, os_api_key=os_api_key
+    )
+
+    write_rows(rows, args.out, fieldnames)
+    resolved = epc_hits + os_hits
+    print(
+        f"\nResolved {resolved}/{len(rows)} "
+        f"(epc={epc_hits}, ordnance_survey={os_hits}); {not_found} not found."
+    )
+    print(f"Wrote filled CSV -> {args.out}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/lisasrequest/finalise_to_property_table.py b/scripts/lisasrequest/finalise_to_property_table.py
new file mode 100644
index 000000000..eee66a0f7
--- /dev/null
+++ b/scripts/lisasrequest/finalise_to_property_table.py
@@ -0,0 +1,111 @@
+"""Step 3 (Durkan portfolio): insert the reshaped rows into the ``property`` table.
+
+Reads durkan_finaliser_input.csv (step 2) and, per row, maps it with the real
+finaliser mapper (``BulkUploadFinaliserOrchestrator._row_to_insert``) and inserts
+via the same ``PropertyPostgresRepository.insert_all`` the Lambda uses — so a row
+written here is identical to one the production finaliser would write. Insert is
+ON CONFLICT (portfolio_id, uprn) DO NOTHING, so re-running is safe.
+
+DRY RUN BY DEFAULT — it dedupes, reports, and writes the collisions file but does
+NOT touch the database. Add --commit to actually insert.
+
+    # preview only (no DB writes): dedupe + mapping report
+    python -m scripts.lisasrequest.finalise_to_property_table --portfolio 805
+
+    # actually insert
+    python -m scripts.lisasrequest.finalise_to_property_table --portfolio 805 --commit
+
+Postgres target comes from the root .env (POSTGRES_*). Run from the worktree root.
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import sys
+from pathlib import Path
+
+_REPO_ROOT = Path(__file__).resolve().parents[2]
+sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
+
+from scripts.finalise_to_property_table import (  # noqa: E402
+    dedupe_by_uprn,
+    insert_rows,
+)
+
+_DEFAULT_IN = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_finaliser_input.csv"
+_DEFAULT_COLLISIONS = (
+    _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_finaliser_collisions.csv"
+)
+UPRN_COL = "address2uprn_uprn"
+MATCHED_ADDRESS_COL = "address2uprn_address"
+POSTCODE_COL = "postcode"
+LEXISCORE_COL = "address2uprn_lexiscore"
+
+
+def read_rows(path: Path) -> list[dict[str, str]]:
+    with path.open(newline="", encoding="utf-8-sig") as fh:
+        return [dict(row) for row in csv.DictReader(fh)]
+
+
+def _preview(rows: list[dict[str, str]]) -> None:
+    """Show the first few rows as they will be inserted (no DB, no mapper call).
+
+    The finalise step applies the standard finaliser mapper
+    (BulkUploadFinaliserOrchestrator) on insert; the fields below are its inputs.
+    """
+    print("\nSample rows to insert (uprn | matched address | postcode | lexiscore):")
+    for row in rows[:3]:
+        print(
+            f"  {row.get(UPRN_COL)} | {row.get(MATCHED_ADDRESS_COL)!r} | "
+            f"{row.get(POSTCODE_COL)!r} | {row.get(LEXISCORE_COL)}"
+        )
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--in", dest="inp", type=Path, default=_DEFAULT_IN)
+    parser.add_argument("--portfolio", type=int, required=True)
+    parser.add_argument(
+        "--commit",
+        action="store_true",
+        help="actually insert into property (default is a dry-run preview)",
+    )
+    parser.add_argument("--collisions", type=Path, default=_DEFAULT_COLLISIONS)
+    args = parser.parse_args()
+
+    rows = read_rows(args.inp)
+    print(f"Loaded {len(rows)} finaliser rows from {args.inp}")
+
+    kept, dropped = dedupe_by_uprn(rows)
+    if dropped:
+        with args.collisions.open("w", newline="", encoding="utf-8") as fh:
+            writer = csv.DictWriter(fh, fieldnames=list(dropped[0].keys()))
+            writer.writeheader()
+            writer.writerows(dropped)
+        print(
+            f"{len(dropped)} duplicate-UPRN rows dropped -> {args.collisions} "
+            f"({len(kept)} unique to insert)"
+        )
+    else:
+        print(f"No duplicate-UPRN collisions; {len(kept)} unique rows to insert.")
+
+    _preview(kept)
+
+    if not args.commit:
+        print(
+            f"\nDRY RUN — nothing written. {len(kept)} rows would be inserted into "
+            f"portfolio {args.portfolio}. Re-run with --commit to write."
+        )
+        return 0
+
+    inserted = insert_rows(kept, args.portfolio)
+    print(
+        f"\nInserted {inserted} new properties into portfolio {args.portfolio} "
+        f"({len(kept) - inserted} already existed; ON CONFLICT DO NOTHING)."
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/lisasrequest/resolve_uprns_for_finaliser.py b/scripts/lisasrequest/resolve_uprns_for_finaliser.py
new file mode 100644
index 000000000..6107b8378
--- /dev/null
+++ b/scripts/lisasrequest/resolve_uprns_for_finaliser.py
@@ -0,0 +1,212 @@
+"""Step 2 (Durkan portfolio): split step-1 matches, reshape the confident ones.
+
+Reads durkan_domna_filled.csv (step 1) and SPLITS it in two — no re-resolution,
+just column work:
+
+  * Rows we cannot confidently insert are held back to a client-clarification CSV
+    (durkan_client_clarification.csv) for Khalim to take to the client. Reasons:
+      not_found_no_match     no UPRN was resolved.
+      no_flat_level_uprn     a block of flats all collapsed onto one building
+                             UPRN — OS/EPC carry no flat-level records, so we
+                             can't tell the flats apart.
+      unit_number_mismatch   the matched house number differs from the input
+                             (e.g. "9 ..." matched "9A ..."), so the property is
+                             ambiguous.
+  * Every remaining row is reshaped into the columns the finaliser reads
+    (bulk_upload_finaliser_orchestrator), written to durkan_finaliser_input.csv
+    ready for step 3:
+      Address 1/2/3 | postcode | Internal Reference | address2uprn_uprn
+      | address2uprn_address | address2uprn_lexiscore
+    Internal Reference is left blank (landlord_property_id null, by decision).
+
+    python -m scripts.lisasrequest.resolve_uprns_for_finaliser
+
+This stage hits no APIs. The held rows are not lost — once the client confirms
+them they can be appended to the finaliser input by hand.
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import sys
+from collections import Counter
+from pathlib import Path
+from typing import Optional
+
+_REPO_ROOT = Path(__file__).resolve().parents[2]
+sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
+
+from scripts.lisasrequest.fill_domna_address import (  # noqa: E402
+    ADDRESS_COL,
+    FOUND_ADDRESS_COL,
+    FOUND_UPRN_COL,
+    LEXISCORE_COL,
+    POSTCODE_COL,
+    SOURCE_COL,
+)
+from scripts.lisasrequest.review_flags import address_numbers, input_unit  # noqa: E402
+
+# Finaliser input columns — must match bulk_upload_finaliser_orchestrator
+# (ADDRESS_COLS / POSTCODE_COL / INTERNAL_REF_COL / UPRN_COL /
+# MATCHED_ADDRESS_COL / LEXISCORE_COL). Hard-coded to keep this a light,
+# stdlib-only reshape; step 3 imports the real orchestrator and will fail loudly
+# if these ever drift.
+FIN_ADDRESS_1, FIN_ADDRESS_2, FIN_ADDRESS_3 = "Address 1", "Address 2", "Address 3"
+FIN_POSTCODE = "postcode"
+FIN_INTERNAL_REF = "Internal Reference"
+FIN_UPRN = "address2uprn_uprn"
+FIN_MATCHED_ADDRESS = "address2uprn_address"
+FIN_LEXISCORE = "address2uprn_lexiscore"
+_FINALISER_COLS = [
+    FIN_ADDRESS_1,
+    FIN_ADDRESS_2,
+    FIN_ADDRESS_3,
+    FIN_POSTCODE,
+    FIN_INTERNAL_REF,
+    FIN_UPRN,
+    FIN_MATCHED_ADDRESS,
+    FIN_LEXISCORE,
+]
+
+# Client-clarification report columns (kept human-readable for the client).
+CONTEXT_COLS = ["address", "postcode", "No.", "Address Block"]
+DOMNA_COLS = [FOUND_ADDRESS_COL, FOUND_UPRN_COL, LEXISCORE_COL, SOURCE_COL]
+REASON_COL = "clarification_reason"
+ACTION_COL = "action_needed"
+_CLARIFY_COLS = CONTEXT_COLS + DOMNA_COLS + [REASON_COL, ACTION_COL]
+
+_REASON_ORDER = {
+    "not_found_no_match": 0,
+    "no_flat_level_uprn": 1,
+    "unit_number_mismatch": 2,
+}
+_REASON_ACTION = {
+    "not_found_no_match": "No UPRN found for this address — please confirm the "
+    "exact address or provide the UPRN.",
+    "no_flat_level_uprn": "Address registers hold only the building, not the "
+    "individual flats — please provide a UPRN per flat, or confirm a "
+    "building-level record is acceptable.",
+    "unit_number_mismatch": "Closest match has a different unit number (see "
+    "domna_address_found) — please confirm the correct property / UPRN.",
+}
+
+_DEFAULT_IN = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_domna_filled.csv"
+_DEFAULT_FINALISER = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_finaliser_input.csv"
+_DEFAULT_CLARIFY = (
+    _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_client_clarification.csv"
+)
+
+
+def read_rows(path: Path) -> list[dict[str, str]]:
+    with path.open(newline="", encoding="utf-8-sig") as fh:
+        return [dict(row) for row in csv.DictReader(fh)]
+
+
+def clarification_reason(
+    row: dict[str, str], uprn_counts: Counter[str]
+) -> Optional[str]:
+    """Why this row can't be inserted yet, or None if it's safe to finalise."""
+    uprn = row.get(FOUND_UPRN_COL, "")
+    if row.get(SOURCE_COL) == "not_found" or not uprn:
+        return "not_found_no_match"
+
+    unit = input_unit(row.get(ADDRESS_COL, ""))
+    unit_missing = bool(unit) and unit not in address_numbers(
+        row.get(FOUND_ADDRESS_COL, "")
+    )
+    duplicate = uprn_counts[uprn] > 1
+    if unit_missing:
+        return "no_flat_level_uprn" if duplicate else "unit_number_mismatch"
+    if duplicate:
+        # A shared UPRN with the right unit number still collides at finalise.
+        return "no_flat_level_uprn"
+    return None
+
+
+def to_finaliser_row(row: dict[str, str]) -> dict[str, str]:
+    """Rename a confident step-1 row into the finaliser's input columns."""
+    return {
+        FIN_ADDRESS_1: row.get(ADDRESS_COL, ""),
+        FIN_ADDRESS_2: "",
+        FIN_ADDRESS_3: "",
+        FIN_POSTCODE: row.get(POSTCODE_COL, ""),
+        FIN_INTERNAL_REF: "",  # landlord_property_id null, by decision
+        FIN_UPRN: row.get(FOUND_UPRN_COL, ""),
+        FIN_MATCHED_ADDRESS: row.get(FOUND_ADDRESS_COL, ""),
+        FIN_LEXISCORE: row.get(LEXISCORE_COL, ""),
+    }
+
+
+def to_clarify_row(row: dict[str, str], reason: str) -> dict[str, str]:
+    out = {col: row.get(col, "") for col in CONTEXT_COLS + DOMNA_COLS}
+    out[REASON_COL] = reason
+    out[ACTION_COL] = _REASON_ACTION[reason]
+    return out
+
+
+def split(
+    rows: list[dict[str, str]],
+    *,
+    accept_unit_mismatch: bool = False,
+) -> tuple[list[dict[str, str]], list[dict[str, str]]]:
+    """Return (finaliser_rows, clarification_rows).
+
+    ``accept_unit_mismatch`` reshapes the ``unit_number_mismatch`` rows (a
+    near-miss like 9 -> 9A the client has already confirmed) into the finaliser
+    input instead of holding them back.
+    """
+    uprn_counts: Counter[str] = Counter(
+        r.get(FOUND_UPRN_COL, "") for r in rows if r.get(FOUND_UPRN_COL)
+    )
+    finaliser: list[dict[str, str]] = []
+    clarify: list[dict[str, str]] = []
+    for row in rows:
+        reason = clarification_reason(row, uprn_counts)
+        if reason is None or (
+            accept_unit_mismatch and reason == "unit_number_mismatch"
+        ):
+            finaliser.append(to_finaliser_row(row))
+        else:
+            clarify.append(to_clarify_row(row, reason))
+    clarify.sort(key=lambda r: _REASON_ORDER.get(r[REASON_COL], 9))
+    return finaliser, clarify
+
+
+def write_csv(rows: list[dict[str, str]], path: Path, fieldnames: list[str]) -> None:
+    with path.open("w", newline="", encoding="utf-8") as fh:
+        writer = csv.DictWriter(fh, fieldnames=fieldnames, extrasaction="ignore")
+        writer.writeheader()
+        writer.writerows(rows)
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--in", dest="inp", type=Path, default=_DEFAULT_IN)
+    parser.add_argument("--finaliser-out", type=Path, default=_DEFAULT_FINALISER)
+    parser.add_argument("--clarify-out", type=Path, default=_DEFAULT_CLARIFY)
+    parser.add_argument(
+        "--accept-unit-mismatch",
+        action="store_true",
+        help="reshape unit_number_mismatch rows (e.g. 9->9A) into the finaliser "
+        "input instead of holding them for the client",
+    )
+    args = parser.parse_args()
+
+    rows = read_rows(args.inp)
+    finaliser, clarify = split(rows, accept_unit_mismatch=args.accept_unit_mismatch)
+
+    write_csv(finaliser, args.finaliser_out, _FINALISER_COLS)
+    write_csv(clarify, args.clarify_out, _CLARIFY_COLS)
+
+    counts = Counter(r[REASON_COL] for r in clarify)
+    print(f"Read {len(rows)} step-1 rows.")
+    print(f"  -> {len(finaliser)} confident rows reshaped -> {args.finaliser_out}")
+    print(f"  -> {len(clarify)} held for client -> {args.clarify_out}")
+    for reason in _REASON_ORDER:
+        print(f"       {reason}: {counts.get(reason, 0)}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/lisasrequest/review_flags.py b/scripts/lisasrequest/review_flags.py
new file mode 100644
index 000000000..4bf710e29
--- /dev/null
+++ b/scripts/lisasrequest/review_flags.py
@@ -0,0 +1,135 @@
+"""Flag step-1 matches that need a human eye, for review before finalising.
+
+Reads durkan_domna_filled.csv (the step-1 output) and writes a review CSV of
+only the rows carrying at least one flag, newest-doubt-first:
+
+    not_found          no UPRN resolved at all.
+    unit_not_in_match  the input flat/house number does NOT appear in the matched
+                       address — the high-precision "wrong property" signal. Two
+                       shapes: a near-miss ("9 VANBRUGH" matched "9A, VANBRUGH")
+                       or a flat collapsing onto its building ("FLAT 1, 20 WARWICK"
+                       matched "20, WARWICK ROAD").
+    dup_uprn           the same UPRN was resolved for >1 input row — typically a
+                       block of flats all collapsing onto the building UPRN; all
+                       but one will be dropped at finalise.
+    low_score          lexiscore < 0.70 (a weak match, just over the OS bar). NOTE:
+                       on its own this is noisy — truncated EPC addresses and extra
+                       locality tokens push correct matches below 0.70. Treat it as
+                       informational unless paired with one of the flags above.
+
+    python -m scripts.lisasrequest.review_flags
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import re
+import sys
+from collections import Counter
+from pathlib import Path
+
+_REPO_ROOT = Path(__file__).resolve().parents[2]
+
+ADDRESS_COL = "address"
+POSTCODE_COL = "postcode"
+FOUND_ADDRESS_COL = "domna_address_found"
+FOUND_UPRN_COL = "domna_address_uprn"
+LEXISCORE_COL = "domna_lexiscore"
+SOURCE_COL = "domna_source"
+LOW_SCORE = 0.70
+
+_DEFAULT_IN = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_domna_filled.csv"
+_DEFAULT_OUT = _REPO_ROOT / "scripts" / "lisasrequest" / "durkan_review_flags.csv"
+
+_REVIEW_COLS = [
+    ADDRESS_COL,
+    POSTCODE_COL,
+    FOUND_ADDRESS_COL,
+    FOUND_UPRN_COL,
+    LEXISCORE_COL,
+    SOURCE_COL,
+    "flags",
+]
+
+
+def input_unit(address: str) -> str:
+    """The salient unit number of an input address: the FLAT number if present,
+    else the leading house number ("" if neither). Upper-cased."""
+    upper = address.upper()
+    flat = re.search(r"\bFLAT\s+(\d+[A-Z]?)", upper)
+    if flat:
+        return flat.group(1)
+    lead = re.match(r"\s*(\d+[A-Z]?)\b", upper)
+    return lead.group(1) if lead else ""
+
+
+def address_numbers(address: str) -> set[str]:
+    """All standalone number tokens in an address (e.g. {"3", "20"}). Upper-cased."""
+    return set(re.findall(r"\b\d+[A-Z]?\b", address.upper()))
+
+
+def _score(value: str) -> float:
+    try:
+        return float(value)
+    except (TypeError, ValueError):
+        return 0.0
+
+
+def flag_rows(rows: list[dict[str, str]]) -> list[dict[str, str]]:
+    """Return the flagged subset, each with a ';'-joined ``flags`` field."""
+    uprn_counts = Counter(
+        r.get(FOUND_UPRN_COL, "") for r in rows if r.get(FOUND_UPRN_COL)
+    )
+
+    flagged: list[dict[str, str]] = []
+    for row in rows:
+        uprn = row.get(FOUND_UPRN_COL, "")
+        source = row.get(SOURCE_COL, "")
+        flags: list[str] = []
+
+        if source == "not_found" or not uprn:
+            flags.append("not_found")
+        else:
+            unit = input_unit(row.get(ADDRESS_COL, ""))
+            if unit and unit not in address_numbers(row.get(FOUND_ADDRESS_COL, "")):
+                flags.append("unit_not_in_match")
+            if uprn_counts[uprn] > 1:
+                flags.append("dup_uprn")
+            if _score(row.get(LEXISCORE_COL, "")) < LOW_SCORE:
+                flags.append("low_score")
+
+        if flags:
+            flagged.append({**{c: row.get(c, "") for c in _REVIEW_COLS[:-1]},
+                            "flags": ";".join(flags)})
+
+    # not_found first, then mismatches, then dup/low.
+    order = {"not_found": 0, "unit_not_in_match": 1, "dup_uprn": 2, "low_score": 3}
+    flagged.sort(key=lambda r: order.get(r["flags"].split(";")[0], 9))
+    return flagged
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--in", dest="inp", type=Path, default=_DEFAULT_IN)
+    parser.add_argument("--out", type=Path, default=_DEFAULT_OUT)
+    args = parser.parse_args()
+
+    with args.inp.open(newline="", encoding="utf-8-sig") as fh:
+        rows = [dict(r) for r in csv.DictReader(fh)]
+
+    flagged = flag_rows(rows)
+    with args.out.open("w", newline="", encoding="utf-8") as fh:
+        writer = csv.DictWriter(fh, fieldnames=_REVIEW_COLS, extrasaction="ignore")
+        writer.writeheader()
+        writer.writerows(flagged)
+
+    counts = Counter(f for r in flagged for f in r["flags"].split(";"))
+    print(f"{len(flagged)}/{len(rows)} rows flagged for review -> {args.out}")
+    for name in ("not_found", "unit_not_in_match", "dup_uprn", "low_score"):
+        print(f"  {name}: {counts.get(name, 0)}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/list_properties_by_postcode.py b/scripts/list_properties_by_postcode.py
new file mode 100644
index 000000000..cea357ea2
--- /dev/null
+++ b/scripts/list_properties_by_postcode.py
@@ -0,0 +1,47 @@
+"""Print a dict of postcode → property IDs for a portfolio, sorted by group size.
+
+Edit PORTFOLIO_ID below, then hit Run.
+"""
+
+from __future__ import annotations
+
+# ---------------------------------------------------------------------------
+# CONFIG
+# ---------------------------------------------------------------------------
+PORTFOLIO_ID: int = 796
+# ---------------------------------------------------------------------------
+
+import sys
+from collections import defaultdict
+from pathlib import Path
+
+_REPO_ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(_REPO_ROOT))
+
+from sqlalchemy import text  # noqa: E402
+
+from scripts.e2e_common import ENV_PATH, build_engine, load_env  # noqa: E402
+
+load_env(ENV_PATH)
+engine = build_engine()
+
+with engine.connect() as conn:
+    rows = conn.execute(
+        text("SELECT id, postcode FROM property WHERE portfolio_id = :pid ORDER BY postcode, id"),
+        {"pid": PORTFOLIO_ID},
+    ).fetchall()
+
+by_postcode: dict[str, list[int]] = defaultdict(list)
+for pid, postcode in rows:
+    by_postcode[postcode or "UNKNOWN"].append(int(pid))
+
+sorted_dict = dict(sorted(by_postcode.items(), key=lambda kv: len(kv[1])))
+
+output_path = _REPO_ROOT / "scripts" / f"properties_by_postcode_{PORTFOLIO_ID}.txt"
+
+lines = [f"{postcode!r}: {ids}" for postcode, ids in sorted_dict.items()]
+lines.append(
+    f"\nTotal postcodes: {len(sorted_dict)}, total properties: {sum(len(v) for v in sorted_dict.values())}"
+)
+output_path.write_text("\n".join(lines), encoding="utf-8")
+print(f"Saved to {output_path}")
diff --git a/scripts/north_northamptonshire_properties_by_postcode_812.txt b/scripts/north_northamptonshire_properties_by_postcode_812.txt
new file mode 100644
index 000000000..6aad79623
--- /dev/null
+++ b/scripts/north_northamptonshire_properties_by_postcode_812.txt
@@ -0,0 +1,15 @@
+'NN14 1JZ': [742012]
+'NN15 6TD': [741992]
+'NN14 1JS': [742051, 742052]
+'LE16 8HG': [741987, 741988, 741989]
+'LE16 8PP': [742044, 742045, 742046]
+'NN14 1PY': [742000, 742001, 742002, 742003]
+'LE16 8HF': [741983, 741984, 741985, 741986, 741990, 741991]
+'LE16 8HT': [742057, 742058, 742059, 742060, 742061, 742062]
+'LE16 8LD': [741993, 741994, 741995, 741996, 741997, 741998, 741999]
+'NN14 1JP': [742047, 742048, 742049, 742050, 742053, 742054, 742055, 742056]
+'NN14 1LA': [742013, 742014, 742015, 742016, 742017, 742018, 742019, 742020]
+'NN14 1PT': [742004, 742005, 742006, 742007, 742008, 742009, 742010, 742011]
+'NN14 1EL': [742021, 742022, 742023, 742024, 742025, 742026, 742027, 742028, 742029, 742030, 742031, 742032, 742033, 742034, 742035, 742036, 742037, 742038, 742039, 742040, 742041, 742042, 742043]
+
+Total postcodes: 13, total properties: 80
\ No newline at end of file
diff --git a/scripts/profile_corpus_error.py b/scripts/profile_corpus_error.py
new file mode 100644
index 000000000..92f5b78e6
--- /dev/null
+++ b/scripts/profile_corpus_error.py
@@ -0,0 +1,232 @@
+"""Profile API-path SAP/CO2/PE error over the COMMITTED corpus (no /tmp cache).
+
+WHAT THIS IS FOR
+----------------
+The accuracy thesis: the gov-API response carries the full SAP input set and our
+calculator is deterministic, so EVERY cert should reproduce the lodged
+SAP/CO2/PE. Any divergence is an input-handling bug, not irreducible noise.
+
+This is the per-cert microscope for that loop. It runs the in-repo corpus
+(``backend/epc_api/json_samples/RdSAP-Schema-21.0.1/corpus.jsonl``) through the
+real ``from_api_response`` -> ``cert_to_inputs`` -> ``calculate_sap_from_inputs``
+path, then:
+  1. buckets the signed SAP error by raw-API feature (reusing
+     ``profile_api_error.features``) ranked by wasted accuracy, so a
+     dropped/mis-mapped field surfaces as a biased bucket;
+  2. for the worst over- and under-raters, prints the PE/CO2-vs-cost split so
+     each can be triaged WITHOUT a worksheet:
+       - PE & CO2 both ~match lodged but SAP off  -> COST-side bug
+         (tariff / PV export / standing charge / secondary fuel);
+       - PE/CO2 also off                          -> DEMAND-side bug
+         (fabric / ventilation / gains / heating demand).
+
+USAGE
+-----
+    PYTHONPATH=/workspaces/model python scripts/profile_corpus_error.py
+    PYTHONPATH=/workspaces/model python scripts/profile_corpus_error.py --min-n 15 --worst 40
+"""
+from __future__ import annotations
+
+import json
+import statistics as stats
+import sys
+from collections import defaultdict
+from pathlib import Path
+from typing import Any, Optional
+
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+from domain.sap10_calculator.calculator import calculate_sap_from_inputs
+from domain.sap10_calculator.rdsap.cert_to_inputs import (
+    cert_to_demand_inputs,
+    SAP_10_2_SPEC_PRICES,
+    cert_to_inputs,
+)
+from scripts.profile_api_error import features
+
+_CORPUS = Path("backend/epc_api/json_samples/RdSAP-Schema-21.0.1/corpus.jsonl")
+
+
+class Row:
+    __slots__ = (
+        "cert", "sap_err", "co2_err_t", "pe_err", "lodged_sap",
+        "our_sap", "lodged_pe", "our_pe", "feats",
+    )
+
+    def __init__(
+        self,
+        cert: str,
+        sap_err: float,
+        co2_err_t: Optional[float],
+        pe_err: Optional[float],
+        lodged_sap: float,
+        our_sap: float,
+        lodged_pe: Optional[float],
+        our_pe: float,
+        feats: dict[str, Any],
+    ) -> None:
+        self.cert = cert
+        self.sap_err = sap_err
+        self.co2_err_t = co2_err_t
+        self.pe_err = pe_err
+        self.lodged_sap = lodged_sap
+        self.our_sap = our_sap
+        self.lodged_pe = lodged_pe
+        self.our_pe = our_pe
+        self.feats = feats
+
+
+def _load() -> list[dict[str, Any]]:
+    return [
+        json.loads(line)
+        for line in _CORPUS.read_text().splitlines()
+        if line.strip()
+    ]
+
+
+def _compute(corpus: list[dict[str, Any]]) -> tuple[list[Row], int, int]:
+    rows: list[Row] = []
+    skipped = 0
+    raised = 0
+    for doc in corpus:
+        lodged_sap = doc.get("energy_rating_current")
+        if lodged_sap is None:
+            skipped += 1
+            continue
+        try:
+            epc = EpcPropertyDataMapper.from_api_response(doc)
+            result = calculate_sap_from_inputs(
+                cert_to_inputs(epc, prices=SAP_10_2_SPEC_PRICES)
+            )
+            # SAP/EI rating is the UK-average rating cascade (`result`);
+            # the EPC-displayed CO2/PE use the postcode demand cascade
+            # (SAP 10.2 Appendix U p.124). Use the demand cascade for the
+            # PE/CO2-vs-cost triage so it is not confounded by the climate
+            # difference (UK-average vs local weather).
+            demand = calculate_sap_from_inputs(
+                cert_to_demand_inputs(epc, prices=SAP_10_2_SPEC_PRICES)
+            )
+        except Exception:
+            raised += 1
+            continue
+        cert = str(
+            doc.get("certificate_number")
+            or doc.get("lmk_key")
+            or doc.get("uprn")
+            or len(rows)
+        )
+        lodged_co2_t = doc.get("co2_emissions_current")
+        lodged_pe = doc.get("energy_consumption_current")
+        rows.append(Row(
+            cert=cert,
+            sap_err=result.sap_score_continuous - lodged_sap,
+            co2_err_t=(demand.co2_kg_per_yr / 1000.0 - lodged_co2_t)
+            if lodged_co2_t is not None else None,
+            pe_err=(demand.primary_energy_kwh_per_m2 - lodged_pe)
+            if lodged_pe is not None else None,
+            lodged_sap=lodged_sap,
+            our_sap=result.sap_score_continuous,
+            lodged_pe=lodged_pe,
+            our_pe=demand.primary_energy_kwh_per_m2,
+            feats=features(doc),
+        ))
+    return rows, skipped, raised
+
+
+def _triage(r: Row) -> str:
+    """Cost vs demand label from the PE/CO2 split (~tolerant)."""
+    if r.pe_err is None or r.co2_err_t is None:
+        return "?"
+    pe_ok = abs(r.pe_err) < 5.0           # kWh/m2/yr
+    co2_ok = abs(r.co2_err_t) < 0.10      # t/yr
+    if pe_ok and co2_ok:
+        return "COST"                      # demand reproduces, cost-side off
+    return "DEMAND"
+
+
+def main() -> None:
+    min_n = 12
+    n_worst = 30
+    if "--min-n" in sys.argv:
+        min_n = int(sys.argv[sys.argv.index("--min-n") + 1])
+    if "--worst" in sys.argv:
+        n_worst = int(sys.argv[sys.argv.index("--worst") + 1])
+
+    rows, skipped, raised = _compute(_load())
+    n = len(rows)
+    within = sum(1 for r in rows if abs(r.sap_err) < 0.5) / n * 100
+    print(
+        f"profiled {n} certs ({skipped} no-lodged-SAP, {raised} raised) | "
+        f"within-0.5 = {within:.1f}% | "
+        f"signed {stats.mean(r.sap_err for r in rows):+.3f} | "
+        f"MAE {stats.mean(abs(r.sap_err) for r in rows):.3f}"
+    )
+    out = [r for r in rows if abs(r.sap_err) >= 0.5]
+    cost_n = sum(1 for r in out if _triage(r) == "COST")
+    dem_n = sum(1 for r in out if _triage(r) == "DEMAND")
+    print(
+        f"of {len(out)} outside-0.5: {dem_n} DEMAND-side (PE/CO2 also off), "
+        f"{cost_n} COST-side (PE/CO2 match), {len(out) - cost_n - dem_n} unknown"
+    )
+    print("=" * 104)
+
+    feat_names = list(rows[0].feats.keys())
+    bucket_lines: list[tuple[float, str]] = []
+    for fn in feat_names:
+        groups: dict[str, list[float]] = defaultdict(list)
+        for r in rows:
+            groups[str(r.feats.get(fn))].append(r.sap_err)
+        for val, es in groups.items():
+            cnt = len(es)
+            if cnt < min_n:
+                continue
+            w05 = sum(1 for e in es if abs(e) < 0.5)
+            mabs = stats.mean(abs(e) for e in es)
+            waste = (cnt - w05) * mabs
+            # MEDIAN signed error is the outlier-RESISTANT bias lens. The
+            # `signed` mean is dragged by the fat-tail register anomalies, so a
+            # cohort can show a large mean bias while being symmetric noise
+            # (e.g. electric room heaters: mean -1.09 but median -0.01). Hunt
+            # slices by |median|, not |signed| — only |median| flags a TRUE
+            # one-directional systematic shift worth fixing.
+            bucket_lines.append((waste, (
+                f"  {fn:22s}={val:<20.20s} n={cnt:4d} "
+                f"within0.5={w05 / cnt * 100:4.0f}% "
+                f"signed={stats.mean(es):+6.2f} median={stats.median(es):+6.2f} "
+                f"mean|err|={mabs:5.2f} [waste={waste:6.0f}]"
+            )))
+    print(f"TOP ERROR-CARRYING BUCKETS (n_out x mean|err|; min-n={min_n}):")
+    for _, line in sorted(bucket_lines, key=lambda x: -x[0])[:40]:
+        print(line)
+
+    print("=" * 104)
+    print(f"WORST {n_worst} OVER-RATERS (our SAP too high -> we under-count loss/cost):")
+    _dump_worst(sorted(rows, key=lambda r: -r.sap_err)[:n_worst])
+    print("-" * 104)
+    print(f"WORST {n_worst} UNDER-RATERS (our SAP too low -> we over-count loss/cost):")
+    _dump_worst(sorted(rows, key=lambda r: r.sap_err)[:n_worst])
+
+
+def _dump_worst(rows: list[Row]) -> None:
+    print(
+        f"  {'cert':>16s} {'lodgSAP':>7s} {'ourSAP':>7s} {'dSAP':>6s} "
+        f"{'dPE':>6s} {'dCO2t':>6s} {'split':>6s}  "
+        f"heat/prop/wall/roof/fuel"
+    )
+    for r in rows:
+        f = r.feats
+        sig = (
+            f"{f.get('main_sap_code')}/{f.get('property_type')}/"
+            f"{f.get('wall_construction')}/{f.get('roof_codes')}/"
+            f"{f.get('main_fuel')} pcdb={f.get('has_pcdb_main')} "
+            f"2nd={f.get('has_secondary')} pv={f.get('has_pv')}"
+        )
+        pe = f"{r.pe_err:+6.1f}" if r.pe_err is not None else "     ?"
+        co2 = f"{r.co2_err_t:+6.2f}" if r.co2_err_t is not None else "     ?"
+        print(
+            f"  {r.cert:>16.16s} {r.lodged_sap:7.1f} {r.our_sap:7.2f} "
+            f"{r.sap_err:+6.2f} {pe} {co2} {_triage(r):>6s}  {sig}"
+        )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/properties_by_postcode_796.txt b/scripts/properties_by_postcode_796.txt
new file mode 100644
index 000000000..69db013aa
--- /dev/null
+++ b/scripts/properties_by_postcode_796.txt
@@ -0,0 +1,4052 @@
+'BN10 8EQ': [739489]
+'BN11 2LT': [740998]
+'BN11 2NH': [733234]
+'BN11 4EP': [730259]
+'BN11 4HB': [733255]
+'BN13 2NN': [739497]
+'BN13 2QP': [739481]
+'BN14 7EH': [725823]
+'BN15 0DU': [739485]
+'BN15 0LT': [731504]
+'BN15 0NF': [739509]
+'BN15 9HT': [739500]
+'BN15 9JB': [723564]
+'BN15 9LH': [715324]
+'BN15 9PA': [715063]
+'BN1 5LA': [725286]
+'BN16 3HL': [719864]
+'BN17 6RE': [717496]
+'BN17 7NS': [715550]
+'BN1 7BX': [723873]
+'BN1 7EH': [726123]
+'BN1 7ER': [739508]
+'BN18 0RT': [719161]
+'BN1 8DH': [727964]
+'BN1 8LG': [719523]
+'BN1 9BW': [733567]
+'BN1 9BZ': [733592]
+'BN2 0AE': [715891]
+'BN2 0FB': [715445]
+'BN2 3PE': [733597]
+'BN2 4BE': [728215]
+'BN2 4JS': [731660]
+'BN2 4LL': [715371]
+'BN2 4PL': [716049]
+'BN2 4RT': [710129]
+'BN2 4RW': [725006]
+'BN2 4TJ': [726521]
+'BN2 4TQ': [726467]
+'BN2 6TL': [727827]
+'BN2 8LS': [725067]
+'BN2 9ZN': [721815]
+'BN3 1DL': [741420]
+'BN3 5AE': [729390]
+'BN3 5AG': [726500]
+'BN3 7FN': [717435]
+'BN41 1DQ': [722904]
+'BN41 1SA': [731765]
+'BN41 2TP': [723881]
+'BN42 4HS': [728370]
+'BN43 5LA': [724702]
+'BN43 5ZE': [741057]
+'BN43 6NN': [728476]
+'BN43 6WE': [741142]
+'BN44 3JG': [720812]
+'BN44 3JH': [719419]
+'BN44 3JT': [712902]
+'BN7 2QF': [733723]
+'BR1 2ND': [741004]
+'BR1 2SN': [718709]
+'BR1 3LR': [728414]
+'BR1 3PE': [712401]
+'BR1 3QH': [733236]
+'BR1 3QJ': [726048]
+'BR1 3QW': [711383]
+'BR1 3RG': [715615]
+'BR1 3RW': [728883]
+'BR1 3ST': [712335]
+'BR1 4DE': [723589]
+'BR1 4JZ': [730244]
+'BR1 4NW': [726966]
+'BR1 4PU': [717828]
+'BR1 4PY': [711228]
+'BR1 4QF': [710339]
+'BR1 4QQ': [729946]
+'BR1 4QW': [710693]
+'BR1 4RE': [722824]
+'BR1 4SA': [733315]
+'BR1 4SG': [711136]
+'BR1 4SH': [730586]
+'BR1 5BB': [731579]
+'BR1 5EG': [726592]
+'BR1 5EN': [723121]
+'BR1 5EP': [714805]
+'BR1 5ER': [715406]
+'BR1 5EZ': [719897]
+'BR1 5HD': [724945]
+'BR1 5JE': [720560]
+'BR1 5JL': [719502]
+'BR1 5JU': [716362]
+'BR1 5JZ': [730800]
+'BR1 5LG': [730157]
+'BR1 5LJ': [715519]
+'BR1 5LQ': [716706]
+'BR1 5LR': [710094]
+'BR1 5LZ': [726131]
+'BR1 5NA': [727953]
+'BR1 5NF': [731049]
+'BR1 5NL': [720224]
+'BR1 5NT': [716319]
+'BR1 5PD': [730414]
+'BR1 5PQ': [733200]
+'BR2 0BB': [718138]
+'BR2 0BX': [718110]
+'BR2 0EU': [715408]
+'BR2 0QW': [728596]
+'BR2 7PP': [715575]
+'BR2 8BZ': [725415]
+'BR2 8DJ': [728039]
+'BR2 8EB': [711443]
+'BR2 8ET': [729387]
+'BR2 8EX': [723816]
+'BR2 8JA': [722216]
+'BR2 8JH': [713040]
+'BR2 8JN': [717726]
+'BR2 8NT': [729652]
+'BR2 9NG': [726023]
+'BR2 9PS': [715135]
+'BR2 9QT': [715885]
+'BR3 1JN': [721167]
+'BR3 3RU': [714690]
+'BR3 3TJ': [712415]
+'BR3 4AN': [728165]
+'BR3 4AZ': [711119]
+'BR3 4BE': [711841]
+'BR3 4DS': [712123]
+'BR3 4EJ': [720836]
+'BR3 4NR': [725832]
+'BR3 4RL': [710671]
+'BR3 4SE': [738255]
+'BR3 4TA': [710177]
+'BR3 4TN': [710228]
+'BR3 4TR': [720142]
+'BR5 1RE': [710895]
+'BR5 1RF': [729786]
+'BR5 1RJ': [718689]
+'BR5 1RZ': [726505]
+'BR5 2AA': [727145]
+'BR5 2AE': [709928]
+'BR5 2AP': [716876]
+'BR5 2EH': [726623]
+'BR5 2EU': [712853]
+'BR5 2EX': [731463]
+'BR5 2EY': [731431]
+'BR5 2HJ': [733098]
+'BR5 2HR': [726670]
+'BR5 2JE': [723202]
+'BR5 2JF': [719958]
+'BR5 2JJ': [731114]
+'BR5 2JZ': [720639]
+'BR5 2LE': [730308]
+'BR5 2LP': [721961]
+'BR5 2LU': [729884]
+'BR5 2NQ': [717286]
+'BR5 2NX': [715084]
+'BR5 2NY': [722047]
+'BR5 2PE': [732184]
+'BR5 2PW': [710451]
+'BR5 2QA': [725512]
+'BR5 2QE': [730407]
+'BR5 2QG': [733292]
+'BR5 2QN': [711674]
+'BR5 2QZ': [727060]
+'BR5 2RL': [721863]
+'BR5 2RU': [729041]
+'BR5 2RY': [732492]
+'BR5 2SA': [723988]
+'BR5 2SH': [721671]
+'BR5 2SL': [718060]
+'BR5 2SU': [711654]
+'BR5 2TD': [710482]
+'BR5 2TQ': [710089]
+'BR5 3AH': [710295]
+'BR5 3AZ': [713449]
+'BR5 3BA': [729382]
+'BR5 3BZ': [711663]
+'BR5 3DE': [732559]
+'BR5 3DS': [711129]
+'BR5 3DW': [710412]
+'BR5 3DX': [715320]
+'BR5 3DY': [733321]
+'BR5 3EE': [709934]
+'BR5 3JH': [710809]
+'BR5 3JW': [729134]
+'BR5 3NS': [727170]
+'BR5 3SA': [724109]
+'BR5 3SN': [711050]
+'BR5 3TG': [721649]
+'BR5 4EB': [725155]
+'BR5 4HH': [720474]
+'BR5 4JS': [727495]
+'BR5 4JU': [719874]
+'BR5 4LB': [739510]
+'BR5 4LH': [733176]
+'BR5 4LJ': [711356]
+'BR5 4NF': [731152]
+'BR5 4NZ': [721077]
+'BR6 0JE': [710302]
+'BR6 0RH': [726351]
+'BR6 0RJ': [723648]
+'BR6 0RQ': [710822]
+'BR6 0TP': [711744]
+'BR6 0TS': [711143]
+'BR6 0TX': [710635]
+'BR6 0WD': [721241]
+'BR6 6AX': [718304]
+'BR6 6BJ': [724422]
+'BR6 6BS': [718580]
+'BR6 8PB': [710409]
+'BR6 9DL': [719863]
+'BR6 9JA': [718120]
+'BR6 9JB': [720844]
+'BR6 9SG': [726653]
+'BR6 9SR': [710846]
+'BR6 9TF': [710338]
+'BR7 5BT': [712503]
+'BR7 6DE': [723383]
+'BR7 6EP': [723237]
+'BR7 6EQ': [724792]
+'BR7 6HX': [724367]
+'CR0 0AA': [724523]
+'CR0 0AD': [725853]
+'CR0 0AS': [726517]
+'CR0 0AW': [715316]
+'CR0 0AZ': [728162]
+'CR0 0BL': [721230]
+'CR0 0BW': [715881]
+'CR0 0BY': [717853]
+'CR0 0DA': [718722]
+'CR0 0DD': [714585]
+'CR0 0DQ': [729756]
+'CR0 0DS': [713994]
+'CR0 0DT': [715894]
+'CR0 0DZ': [723142]
+'CR0 0EF': [713948]
+'CR0 0EH': [723474]
+'CR0 0ES': [730876]
+'CR0 0EU': [732153]
+'CR0 0EW': [726326]
+'CR0 0EY': [724801]
+'CR0 0HQ': [730322]
+'CR0 0HU': [721421]
+'CR0 0HW': [711307]
+'CR0 0HY': [722228]
+'CR0 0LA': [731278]
+'CR0 0NY': [726437]
+'CR0 0PB': [714581]
+'CR0 0PR': [721131]
+'CR0 0QB': [723144]
+'CR0 0QF': [731381]
+'CR0 0QJ': [718502]
+'CR0 0QL': [732396]
+'CR0 0QQ': [716597]
+'CR0 0QS': [720517]
+'CR0 0QT': [733111]
+'CR0 0QW': [714327]
+'CR0 0RA': [719647]
+'CR0 0RN': [720625]
+'CR0 0RS': [718934]
+'CR0 0RW': [721697]
+'CR0 0RX': [713495]
+'CR0 0TL': [730121]
+'CR0 0TP': [731491]
+'CR0 0TW': [731163]
+'CR0 0TX': [714546]
+'CR0 0TY': [729685]
+'CR0 1AB': [732024]
+'CR0 1AQ': [721902]
+'CR0 1DS': [721784]
+'CR0 1SR': [722437]
+'CR0 2BJ': [730056]
+'CR0 2DJ': [720236]
+'CR0 2ER': [717359]
+'CR0 2ES': [723654]
+'CR0 2HG': [716082]
+'CR0 2HH': [738299]
+'CR0 2JL': [721399]
+'CR0 2JW': [723744]
+'CR0 2JZ': [720331]
+'CR0 2PJ': [726605]
+'CR0 2QJ': [716441]
+'CR0 2QW': [729924]
+'CR0 2QY': [715687]
+'CR0 2SH': [733067]
+'CR0 2TQ': [726606]
+'CR0 2UA': [738274]
+'CR0 2UT': [738254]
+'CR0 2XT': [716861]
+'CR0 3AL': [731011]
+'CR0 3BD': [719199]
+'CR0 3BS': [715695]
+'CR0 3EQ': [722062]
+'CR0 3EW': [721163]
+'CR0 3EZ': [724915]
+'CR0 3JQ': [715114]
+'CR0 3JT': [720515]
+'CR0 3JY': [730147]
+'CR0 3LS': [725014]
+'CR0 3NW': [728751]
+'CR0 3NY': [728695]
+'CR0 3PR': [731911]
+'CR0 3PS': [726631]
+'CR0 3PY': [738258]
+'CR0 3RB': [720335]
+'CR0 3RT': [721755]
+'CR0 3SA': [732644]
+'CR0 3SJ': [723733]
+'CR0 4DH': [730665]
+'CR0 4DT': [713117]
+'CR0 4DY': [725914]
+'CR0 4DZ': [713887]
+'CR0 4EH': [727451]
+'CR0 4EU': [722979]
+'CR0 4EW': [727120]
+'CR0 4HS': [720368]
+'CR0 4JU': [729363]
+'CR0 4LT': [738250]
+'CR0 4RJ': [728721]
+'CR0 6DX': [715734]
+'CR0 6EJ': [732248]
+'CR0 6JD': [729154]
+'CR0 6NB': [738284]
+'CR0 6NF': [718139]
+'CR0 6QW': [716594]
+'CR0 6RS': [721749]
+'CR0 6TG': [717952]
+'CR0 6UJ': [732575]
+'CR0 7AD': [738293]
+'CR0 7AS': [726140]
+'CR0 7AZ': [732306]
+'CR0 7BA': [724495]
+'CR0 7TD': [728250]
+'CR0 7TJ': [715647]
+'CR0 7TR': [718516]
+'CR0 7TY': [721165]
+'CR0 7YG': [720433]
+'CR0 8JB': [718092]
+'CR0 8JP': [729859]
+'CR0 8NE': [720616]
+'CR0 8NQ': [716486]
+'CR0 9DP': [729913]
+'CR0 9EA': [731941]
+'CR0 9EB': [727157]
+'CR0 9ED': [723381]
+'CR0 9EE': [714672]
+'CR0 9EG': [718058]
+'CR0 9EJ': [724306]
+'CR0 9EU': [717421]
+'CR0 9EX': [731794]
+'CR0 9HB': [732127]
+'CR0 9HF': [717303]
+'CR0 9HG': [720222]
+'CR0 9HQ': [716382]
+'CR0 9JA': [718491]
+'CR0 9JF': [716326]
+'CR0 9LF': [726148]
+'CR0 9LH': [714034]
+'CR0 9LX': [709992]
+'CR0 9LY': [716385]
+'CR2 0BL': [738290]
+'CR2 0NH': [738269]
+'CR2 0PU': [738263]
+'CR2 6BN': [738277]
+'CR2 6EH': [717294]
+'CR2 6HP': [727527]
+'CR2 7HB': [738264]
+'CR2 8HY': [719855]
+'CR2 8LN': [719496]
+'CR5 1BT': [726275]
+'CR5 2EE': [729467]
+'CR5 3BY': [720835]
+'CR5 3FW': [709820]
+'CR5 3FY': [711632]
+'CR7 6AJ': [733146]
+'CR7 6BH': [719519]
+'CR7 6BW': [728345]
+'CR7 7BB': [722127]
+'CR7 7DA': [738257]
+'CR7 7DX': [727121]
+'CR7 7JR': [714091]
+'CR7 7QB': [728608]
+'CR7 8AB': [719904]
+'CR7 8AX': [727316]
+'CR7 8BT': [723291]
+'CR7 8HW': [715358]
+'CR7 8HY': [717066]
+'CR7 8JU': [733286]
+'CR7 8LQ': [722081]
+'CR7 8PZ': [718523]
+'CR7 8QL': [723557]
+'CR7 8QW': [726716]
+'CR7 8SB': [726044]
+'CR8 2PB': [728789]
+'CR8 5NA': [723613]
+'CT1 1ES': [739502]
+'CT1 1LX': [724041]
+'CT2 0LG': [739491]
+'CT2 0PD': [717169]
+'CT21 6LQ': [732413]
+'CT21 6QT': [728787]
+'CT2 8AX': [723357]
+'CT2 8LU': [730142]
+'CT2 8PR': [719682]
+'CT3 4GF': [711747]
+'CT4 7QE': [714563]
+'CT5 1ST': [713123]
+'CT5 3JL': [713035]
+'CT6 7BB': [732385]
+'CT6 7EG': [733396]
+'CT6 7EW': [739506]
+'CT6 7SP': [726862]
+'CT6 7TA': [723321]
+'CT6 8LN': [715581]
+'CT6 8SJ': [739483]
+'DA11 8PJ': [720954]
+'DA12 2LB': [711098]
+'DA12 4HS': [727813]
+'DA12 5JN': [727906]
+'DA12 5JY': [719295]
+'DA12 5JZ': [716562]
+'DA12 5RS': [710861]
+'DA12 5UH': [732402]
+'DA1 2LB': [715248]
+'DA1 2QR': [719899]
+'DA14 5LF': [710092]
+'DA1 4BB': [726825]
+'DA1 4JR': [710298]
+'DA1 4LX': [709989]
+'DA1 4NL': [711065]
+'DA1 4PB': [739487]
+'DA15 8PB': [715372]
+'DA16 1BN': [711672]
+'DA16 1QZ': [729529]
+'DA16 1RD': [710053]
+'DA16 2BT': [715327]
+'DA16 2DA': [732412]
+'DA16 2NQ': [724329]
+'DA16 3AP': [710596]
+'DA16 3HX': [710128]
+'DA16 3JX': [739501]
+'DA16 3NF': [710294]
+'DA17 5DR': [715567]
+'DA17 5HA': [739195]
+'DA17 6JS': [731366]
+'DA2 6HE': [722115]
+'DA5 1PT': [723818]
+'DA7 4NA': [709883]
+'DA7 4PR': [722949]
+'DA7 4UR': [739495]
+'DA7 5JR': [726559]
+'DA7 6SB': [725452]
+'DA7 6SN': [710182]
+'DA7 6ST': [716518]
+'DA7 6SW': [710327]
+'DA8 1BX': [739505]
+'DA8 1DZ': [739490]
+'DA8 1JQ': [710676]
+'DA8 1LQ': [739492]
+'DA8 2EB': [724639]
+'DA8 2HA': [732536]
+'DA8 2JH': [731305]
+'DA8 2NB': [721155]
+'DA8 3RB': [726347]
+'E14 7NZ': [709840]
+'E1 4EA': [727432]
+'E1 4ES': [726443]
+'E1 8DJ': [723360]
+'E2 6NX': [713019]
+'E2 6PY': [722283]
+'E2 6QQ': [721127]
+'GU27 3QU': [722654]
+'GU28 0BW': [721384]
+'GU28 0NY': [713295]
+'GU28 9JP': [713258]
+'GU29 0DT': [718657]
+'GU29 0PB': [712889]
+'GU29 9QR': [713643]
+'GU29 9TD': [711743]
+'GU29 9TQ': [728521]
+'GU31 5LR': [713045]
+'GU31 5NB': [727680]
+'HA9 8TD': [739503]
+'ME10 2SU': [739484]
+'ME10 2TQ': [725706]
+'ME10 3FE': [728218]
+'ME10 4FZ': [713374]
+'ME10 4NA': [727608]
+'ME10 4RB': [717566]
+'ME12 4NH': [716504]
+'ME14 2PR': [726321]
+'ME16 0ZG': [711717]
+'ME19 6RX': [724769]
+'ME20 6NG': [726627]
+'ME2 3AE': [723742]
+'ME2 3JR': [741065]
+'ME3 0EH': [716584]
+'ME3 7QL': [717225]
+'ME3 9LF': [719972]
+'ME4 3SA': [739499]
+'ME4 6HE': [728614]
+'ME4 6LU': [716877]
+'ME5 0HD': [716848]
+'ME5 0HJ': [719490]
+'ME5 0HL': [722279]
+'ME5 0JB': [739494]
+'ME5 7BJ': [710509]
+'ME7 1EH': [723968]
+'ME7 4RN': [732162]
+'ME8 6XT': [716537]
+'ME8 8DH': [732600]
+'ME8 9RX': [726080]
+'ME9 9TU': [739488]
+'MK2 2LR': [739504]
+'N1 8PB': [724206]
+'NN5 6EP': [725883]
+'NN5 6PJ': [720395]
+'NN5 7RN': [716136]
+'PE1 2BE': [724610]
+'PE1 3BG': [713210]
+'PE1 3JW': [724236]
+'PE1 3JY': [729252]
+'PE1 3SL': [732775]
+'PE1 3SW': [727116]
+'PE1 3UL': [720720]
+'PE1 3XB': [729169]
+'PE1 4JH': [709785]
+'PE1 4JX': [726514]
+'PE1 4PT': [721060]
+'PE1 4PY': [720244]
+'PE1 4QE': [722711]
+'PE1 4QQ': [718815]
+'PE19 2UU': [730394]
+'PE19 7GQ': [722008]
+'PE19 8PB': [711256]
+'PE27 3EJ': [723840]
+'PE27 3HP': [725925]
+'PE27 3YG': [716374]
+'PE27 6TX': [721868]
+'PE28 5RN': [724542]
+'PE2 8HR': [734171]
+'PE2 8JG': [709862]
+'PE2 8PE': [714240]
+'PE2 8PG': [727192]
+'PE2 8PN': [725020]
+'PE2 8TL': [721694]
+'PE29 1PW': [722398]
+'PE29 1XD': [721012]
+'PE29 2JU': [716950]
+'PE29 2LS': [719632]
+'PE29 2LU': [718291]
+'PE29 7HQ': [729510]
+'PE2 9HD': [726316]
+'PE2 9PD': [737994]
+'PE3 6DG': [729223]
+'PE3 9EL': [719769]
+'PE4 5AL': [711536]
+'PE4 5AW': [729206]
+'PE4 5AY': [729752]
+'PE4 5AZ': [726874]
+'PE4 5BA': [732941]
+'PE4 5BB': [722769]
+'PE4 5BD': [709935]
+'PE4 5DF': [733442]
+'PE4 6BY': [727319]
+'PE4 6JY': [725922]
+'PE4 7BE': [732237]
+'PE4 7BG': [717997]
+'PE4 7BQ': [729669]
+'PE4 7DX': [729978]
+'PE4 7TB': [714942]
+'PE4 7TZ': [730026]
+'PE4 7XR': [727751]
+'PE4 7XS': [717934]
+'PE4 7ZS': [730837]
+'PO10 8AN': [710806]
+'PO10 8FB': [727424]
+'PO10 8LG': [718739]
+'PO10 8LR': [732210]
+'PO10 8RJ': [727826]
+'PO10 8TG': [717168]
+'PO14 1BU': [730048]
+'PO14 1BX': [719355]
+'PO14 1DB': [714491]
+'PO14 1DD': [713561]
+'PO14 1DQ': [718284]
+'PO14 1HY': [725760]
+'PO14 1JP': [730549]
+'PO14 1JZ': [716492]
+'PO14 1LG': [727350]
+'PO14 1LU': [712844]
+'PO14 1LY': [730515]
+'PO14 3RS': [723852]
+'PO14 4DN': [719457]
+'PO14 4DR': [712984]
+'PO14 4JQ': [724434]
+'PO14 4JR': [722684]
+'PO14 4NL': [728012]
+'PO14 4PY': [718474]
+'PO14 4PZ': [714470]
+'PO14 4QE': [722372]
+'PO14 4QZ': [722501]
+'PO14 4RW': [715022]
+'PO14 4SE': [723280]
+'PO14 4SG': [719773]
+'PO15 6BP': [730925]
+'PO15 6EN': [731826]
+'PO15 6HS': [719138]
+'PO15 6JB': [725359]
+'PO15 6LR': [725646]
+'PO15 6PT': [731816]
+'PO15 6PU': [725951]
+'PO15 6PX': [717672]
+'PO15 6QJ': [727514]
+'PO15 6QQ': [714707]
+'PO15 6QU': [724210]
+'PO15 6SQ': [731457]
+'PO15 6ST': [722146]
+'PO1 5AU': [717660]
+'PO1 5HU': [726885]
+'PO1 5JA': [731071]
+'PO1 5JP': [715401]
+'PO1 5LY': [718222]
+'PO16 0NJ': [712961]
+'PO16 0PR': [714685]
+'PO16 0TH': [714393]
+'PO16 7SW': [713437]
+'PO16 7TJ': [719259]
+'PO16 7UE': [722166]
+'PO16 8BA': [718838]
+'PO16 8EJ': [719813]
+'PO16 8EQ': [727202]
+'PO16 8HQ': [719154]
+'PO16 8PN': [715256]
+'PO16 8PW': [732089]
+'PO16 9EL': [738036]
+'PO16 9HU': [728498]
+'PO16 OLL': [719071]
+'PO18 0AU': [729331]
+'PO18 0DN': [731756]
+'PO18 0GT': [711364]
+'PO18 0PD': [715116]
+'PO18 8BJ': [712801]
+'PO18 8FS': [717084]
+'PO18 8JS': [724904]
+'PO18 8LD': [722982]
+'PO18 9BL': [712980]
+'PO18 9DS': [712918]
+'PO19 1DF': [718529]
+'PO19 3AW': [715431]
+'PO19 3BX': [730788]
+'PO19 3FX': [710187]
+'PO19 3JF': [719645]
+'PO19 3JG': [723734]
+'PO19 5TZ': [732525]
+'PO19 6SD': [729404]
+'PO19 6TH': [729418]
+'PO19 6XA': [713245]
+'PO19 7BZ': [711472]
+'PO19 7EP': [738355]
+'PO19 7HZ': [732421]
+'PO19 7JA': [730261]
+'PO19 7LJ': [726398]
+'PO19 7PJ': [724170]
+'PO19 7PZ': [725315]
+'PO19 7TB': [730622]
+'PO19 8AP': [722092]
+'PO19 8AQ': [716517]
+'PO19 8BD': [714312]
+'PO19 8BJ': [712964]
+'PO19 8BQ': [727436]
+'PO19 8DR': [731711]
+'PO19 8EA': [734239]
+'PO20 0NB': [722044]
+'PO20 0PF': [713520]
+'PO20 2EB': [710626]
+'PO20 2EY': [730662]
+'PO20 2FA': [724388]
+'PO20 2FF': [712864]
+'PO20 2FG': [722206]
+'PO20 2GX': [709929]
+'PO20 2JG': [717512]
+'PO20 2JR': [711211]
+'PO20 2LS': [711179]
+'PO20 2LX': [710773]
+'PO20 6FG': [721404]
+'PO20 8DR': [714476]
+'PO20 8EH': [718797]
+'PO20 8LA': [731788]
+'PO20 8NH': [719831]
+'PO20 8PX': [739512]
+'PO20 9EA': [725177]
+'PO21 2DG': [713856]
+'PO21 2ES': [720901]
+'PO22 8BG': [721446]
+'PO2 7BS': [726731]
+'PO2 7LD': [719473]
+'PO2 7PH': [720918]
+'PO2 7PY': [726125]
+'PO2 7PZ': [725028]
+'PO2 8DL': [715847]
+'PO2 8LD': [727218]
+'PO5 2AB': [718629]
+'RH10 5NJ': [716211]
+'RH10 5NQ': [728096]
+'RH10 8BZ': [739496]
+'RH11 0UG': [714329]
+'RH11 0UL': [725579]
+'RH11 7PS': [711350]
+'RH11 8BG': [716600]
+'RH11 8NR': [731433]
+'RH11 8UR': [729313]
+'RH11 8UZ': [716694]
+'RH11 8XD': [719039]
+'RH11 9JX': [718949]
+'RH11 9LE': [713064]
+'RH11 9TB': [713286]
+'RH11 9TJ': [710150]
+'RH1 1HL': [727867]
+'RH12 5GJ': [724185]
+'RH12 5GL': [713888]
+'RH1 3BY': [730491]
+'RH14 0NE': [725626]
+'RH14 0RJ': [725213]
+'RH15 8DP': [741012]
+'RH15 8UD': [741028]
+'RH1 5LZ': [723086]
+'RH16 3TX': [741029]
+'RH19 1FE': [732763]
+'RH19 3UL': [728159]
+'RH19 3XZ': [720303]
+'RH19 4AJ': [723738]
+'RH19 4QR': [713406]
+'RH20 1AB': [733562]
+'RH20 1PD': [725381]
+'RH20 1PJ': [712882]
+'RH20 3QP': [710389]
+'RH2 8DE': [715694]
+'RH6 8AP': [733009]
+'RH6 8BN': [727943]
+'SE10 0EH': [728900]
+'SE10 0HW': [723950]
+'SE10 0RS': [727392]
+'SE10 9PQ': [724054]
+'SE11 4TQ': [715450]
+'SE12 0BW': [741340]
+'SE12 0NE': [731086]
+'SE12 0PS': [729918]
+'SE12 0TB': [711263]
+'SE12 8PA': [714677]
+'SE12 8PU': [733368]
+'SE12 8QB': [721928]
+'SE12 9AF': [712774]
+'SE12 9BH': [717280]
+'SE12 9DN': [725070]
+'SE12 9DP': [713793]
+'SE12 9QT': [731393]
+'SE12 9RA': [726649]
+'SE12 9SB': [717699]
+'SE12 9SE': [721428]
+'SE13 3DL': [731002]
+'SE13 5AE': [741301]
+'SE13 5AQ': [716521]
+'SE13 5HN': [729803]
+'SE13 5HW': [725945]
+'SE13 5NA': [714743]
+'SE13 5NQ': [731177]
+'SE13 5PZ': [730909]
+'SE13 5RZ': [712934]
+'SE13 5TA': [716894]
+'SE13 6DR': [715834]
+'SE13 6HH': [721440]
+'SE13 6HR': [721392]
+'SE13 6RQ': [732478]
+'SE13 6SB': [720887]
+'SE13 6SE': [719305]
+'SE13 7AN': [718123]
+'SE13 7UL': [731261]
+'SE13 7UU': [713424]
+'SE14 5EL': [727815]
+'SE14 5EQ': [732405]
+'SE14 5FT': [711751]
+'SE14 5LS': [716447]
+'SE14 5NL': [710082]
+'SE14 5QH': [712817]
+'SE14 5QS': [731546]
+'SE14 5QX': [730009]
+'SE14 5RF': [731266]
+'SE14 5TJ': [716368]
+'SE14 5TQ': [732377]
+'SE14 5TW': [713573]
+'SE15 1QB': [720350]
+'SE15 2BL': [722615]
+'SE15 2DY': [725868]
+'SE15 2EA': [728059]
+'SE15 2NJ': [710902]
+'SE15 2NU': [721443]
+'SE15 2NX': [721524]
+'SE15 3BZ': [730177]
+'SE15 3ED': [724720]
+'SE15 3LY': [727866]
+'SE15 3UD': [716956]
+'SE15 3XD': [733160]
+'SE15 4AB': [717719]
+'SE15 4AL': [730340]
+'SE15 4AW': [717710]
+'SE15 4BT': [731435]
+'SE15 4BU': [717860]
+'SE15 4EL': [723592]
+'SE15 4LF': [723033]
+'SE15 4QY': [714015]
+'SE15 5AG': [716248]
+'SE15 5AN': [723913]
+'SE15 5HP': [738317]
+'SE15 5NR': [728835]
+'SE15 5ST': [724648]
+'SE15 5TQ': [729570]
+'SE15 6QU': [713459]
+'SE15 6QZ': [713272]
+'SE15 6RW': [715979]
+'SE1 5DP': [738363]
+'SE16 3FL': [734228]
+'SE16 4AR': [727132]
+'SE16 4BB': [733675]
+'SE16 4DW': [720938]
+'SE16 4LE': [731699]
+'SE16 4RJ': [739480]
+'SE17 1LS': [741367]
+'SE18 1AA': [716305]
+'SE18 1AD': [714734]
+'SE18 1AE': [732378]
+'SE18 1AF': [731181]
+'SE18 1AR': [730117]
+'SE18 1AY': [732555]
+'SE18 1DE': [731803]
+'SE18 1DW': [726196]
+'SE18 1EF': [716867]
+'SE18 1EP': [729511]
+'SE18 1JZ': [722459]
+'SE18 1NT': [728269]
+'SE18 1PX': [731231]
+'SE18 1RQ': [728802]
+'SE18 1RS': [724860]
+'SE18 1TB': [728912]
+'SE18 2DE': [713962]
+'SE18 2EW': [714762]
+'SE18 2JS': [732399]
+'SE18 2JU': [724826]
+'SE18 2NY': [714462]
+'SE18 2PX': [713525]
+'SE18 2QH': [723251]
+'SE18 2QN': [715642]
+'SE18 2QW': [727518]
+'SE18 2TE': [713165]
+'SE18 2TR': [731243]
+'SE18 3AS': [725053]
+'SE18 3DR': [718577]
+'SE18 3EP': [718180]
+'SE18 3ER': [724608]
+'SE18 3LL': [723221]
+'SE18 3LW': [730279]
+'SE18 3PA': [728597]
+'SE18 3PF': [724341]
+'SE18 3PS': [721088]
+'SE18 3PU': [715333]
+'SE18 3QF': [730171]
+'SE18 3QG': [724317]
+'SE18 3SJ': [716391]
+'SE18 3SR': [713008]
+'SE18 3ST': [733463]
+'SE18 3SU': [714741]
+'SE18 4DP': [727564]
+'SE18 4ET': [727477]
+'SE18 5AL': [729789]
+'SE18 5ED': [729366]
+'SE18 5EY': [728672]
+'SE18 5NG': [720608]
+'SE18 5PU': [716464]
+'SE18 5QQ': [713261]
+'SE18 5SG': [710574]
+'SE18 5ST': [730395]
+'SE18 6SD': [729378]
+'SE18 6UB': [723174]
+'SE18 7AG': [715905]
+'SE18 7BE': [727950]
+'SE18 7DE': [732142]
+'SE18 7ES': [731030]
+'SE18 7EX': [718419]
+'SE18 7EY': [717563]
+'SE18 7HT': [718264]
+'SE18 7JA': [725716]
+'SE18 7LD': [716373]
+'SE18 7LN': [715351]
+'SE18 7LQ': [727310]
+'SE18 7QD': [730977]
+'SE18 7RL': [729410]
+'SE18 7RX': [729593]
+'SE18 7SU': [729796]
+'SE19 2UU': [738253]
+'SE19 2XE': [738276]
+'SE19 3AT': [727211]
+'SE19 3PN': [728090]
+'SE19 3PR': [724305]
+'SE19 3PW': [714236]
+'SE20 7BG': [724377]
+'SE20 7LJ': [728603]
+'SE20 8HQ': [718864]
+'SE20 8JU': [710442]
+'SE20 8PL': [710847]
+'SE20 8SH': [711081]
+'SE20 8SJ': [739498]
+'SE20 8SN': [729605]
+'SE2 0JU': [720348]
+'SE2 0LR': [731046]
+'SE2 0NF': [727581]
+'SE2 0NH': [718238]
+'SE2 0QX': [731543]
+'SE2 0RD': [720911]
+'SE22 0DE': [715376]
+'SE22 0DP': [723410]
+'SE22 0ER': [715424]
+'SE22 0HR': [732224]
+'SE22 0JU': [719504]
+'SE22 0RP': [719822]
+'SE22 8PP': [741062]
+'SE22 8PW': [730597]
+'SE22 8QB': [723435]
+'SE22 8QY': [733444]
+'SE22 8RW': [726984]
+'SE22 9EP': [718116]
+'SE22 9HG': [730169]
+'SE22 9HL': [724934]
+'SE22 9JJ': [722239]
+'SE22 9LF': [725545]
+'SE22 9LG': [725967]
+'SE22 9NA': [733057]
+'SE22 9PB': [726535]
+'SE22 9PL': [716322]
+'SE23 1BW': [719444]
+'SE23 1DJ': [714118]
+'SE23 1DU': [729491]
+'SE23 1JN': [732221]
+'SE23 1JS': [741370]
+'SE23 1NL': [718154]
+'SE23 1RY': [733561]
+'SE23 2AH': [730427]
+'SE23 3NJ': [741326]
+'SE25 4HN': [732712]
+'SE25 4JD': [738271]
+'SE25 4JU': [725592]
+'SE25 4LP': [728636]
+'SE25 4LX': [726604]
+'SE25 4NL': [714924]
+'SE25 4RN': [721708]
+'SE25 4SL': [712685]
+'SE25 4UZ': [732163]
+'SE25 4XQ': [733120]
+'SE25 5BG': [713983]
+'SE25 5DP': [730423]
+'SE25 5EU': [718080]
+'SE25 5HS': [722957]
+'SE25 5NG': [711404]
+'SE25 5PG': [724337]
+'SE25 5PY': [730836]
+'SE25 5QE': [730600]
+'SE25 5QT': [723546]
+'SE25 6JE': [718575]
+'SE25 6JQ': [732912]
+'SE25 6JX': [738281]
+'SE25 6JY': [716489]
+'SE25 6LH': [738295]
+'SE25 6NT': [720315]
+'SE25 6QY': [724822]
+'SE25 6TH': [738272]
+'SE25 6UP': [711770]
+'SE25 6US': [718503]
+'SE25 6UX': [719527]
+'SE25 6XQ': [720530]
+'SE26 4HN': [720245]
+'SE26 4LE': [719783]
+'SE26 6JR': [717173]
+'SE28 0DG': [733205]
+'SE28 0EW': [726818]
+'SE28 8AU': [726861]
+'SE28 8DA': [715572]
+'SE28 8DE': [717184]
+'SE28 8HY': [722608]
+'SE28 8HZ': [728229]
+'SE28 8QQ': [739120]
+'SE2 9AU': [731135]
+'SE2 9AZ': [728338]
+'SE2 9BA': [726104]
+'SE2 9BE': [732487]
+'SE2 9BH': [713842]
+'SE2 9DH': [715803]
+'SE2 9DN': [719507]
+'SE2 9ED': [726540]
+'SE2 9EN': [715820]
+'SE2 9JP': [733142]
+'SE2 9JW': [714804]
+'SE2 9LB': [715243]
+'SE2 9LP': [718119]
+'SE2 9LR': [728081]
+'SE2 9LS': [712832]
+'SE2 9PB': [722948]
+'SE2 9PJ': [730237]
+'SE2 9PL': [713818]
+'SE2 9XR': [713219]
+'SE2 9XS': [730763]
+'SE3 0JB': [717939]
+'SE3 7DP': [716393]
+'SE3 7DT': [716304]
+'SE3 7LX': [713876]
+'SE3 8AY': [718158]
+'SE3 8DL': [721437]
+'SE3 8ET': [733047]
+'SE3 8LH': [715080]
+'SE3 8LL': [724951]
+'SE3 8QZ': [725016]
+'SE3 8TS': [725354]
+'SE3 9PP': [718521]
+'SE4 1AL': [714638]
+'SE4 1ER': [726411]
+'SE4 1EU': [729269]
+'SE4 1JS': [729740]
+'SE4 1PB': [732617]
+'SE4 1QL': [728958]
+'SE4 1RZ': [725895]
+'SE4 1SS': [715848]
+'SE4 1SY': [715929]
+'SE4 1TS': [731481]
+'SE4 1YF': [741294]
+'SE4 2AX': [728839]
+'SE4 2DD': [719311]
+'SE4 2DQ': [720285]
+'SE4 2DS': [716303]
+'SE4 2JJ': [728062]
+'SE4 2JT': [728072]
+'SE4 2NH': [720252]
+'SE4 2PP': [714129]
+'SE4 2PS': [714794]
+'SE4 2SE': [717790]
+'SE4 2SP': [728563]
+'SE5 7RZ': [723779]
+'SE5 7TD': [727053]
+'SE5 8DH': [729854]
+'SE5 8NE': [729904]
+'SE5 8NJ': [727084]
+'SE5 8NN': [730178]
+'SE5 9NG': [711249]
+'SE6 1AQ': [723193]
+'SE6 1PF': [715819]
+'SE6 1PZ': [724189]
+'SE6 1QA': [729065]
+'SE6 1SP': [712798]
+'SE6 1SX': [728296]
+'SE6 1TE': [722280]
+'SE6 1XD': [714748]
+'SE6 2BQ': [718494]
+'SE6 2HS': [710844]
+'SE6 3BH': [733366]
+'SE6 3EL': [733279]
+'SE6 3ER': [715158]
+'SE6 3HT': [715627]
+'SE6 3JL': [728569]
+'SE6 3LL': [718088]
+'SE6 3LP': [720113]
+'SE6 3LS': [731073]
+'SE6 3TB': [726455]
+'SE6 3TF': [718130]
+'SE6 3TJ': [721499]
+'SE6 4JJ': [724002]
+'SE6 4TS': [728777]
+'SE6 4TZ': [724331]
+'SE7 7AL': [723899]
+'SE7 7BS': [729309]
+'SE7 7BW': [731211]
+'SE7 7BZ': [727328]
+'SE7 7JD': [728676]
+'SE7 7LB': [727180]
+'SE7 7LL': [714799]
+'SE7 7LW': [716791]
+'SE7 7NP': [721259]
+'SE7 7NR': [717211]
+'SE7 7PB': [718458]
+'SE7 7PP': [721402]
+'SE7 7PT': [725137]
+'SE7 7QW': [718010]
+'SE7 7QZ': [732967]
+'SE7 7RB': [722246]
+'SE7 8AB': [716317]
+'SE7 8AL': [717469]
+'SE7 8EN': [725875]
+'SE7 8EU': [711284]
+'SE7 8HG': [720079]
+'SE7 8RQ': [732292]
+'SE7 8SS': [715963]
+'SE7 8SX': [717268]
+'SE7 8TN': [732202]
+'SE8 3ED': [727939]
+'SE8 4AU': [714543]
+'SE8 4BT': [720233]
+'SE8 4DN': [709841]
+'SE8 4DY': [730353]
+'SE8 4JF': [714823]
+'SE8 4JN': [726092]
+'SE8 5DB': [718105]
+'SE8 5DD': [713850]
+'SE8 5NH': [724750]
+'SE9 1JX': [718741]
+'SE9 1PD': [722987]
+'SE9 1XA': [718122]
+'SE9 2DN': [721878]
+'SE9 2LF': [717567]
+'SE9 2TE': [732831]
+'SE9 3DJ': [725009]
+'SE9 3HE': [726724]
+'SE9 3JH': [733339]
+'SE9 3JJ': [710921]
+'SE9 3QH': [713839]
+'SE9 3TH': [723675]
+'SE9 4AB': [710577]
+'SE9 4AG': [710066]
+'SE9 4AS': [711645]
+'SE9 4AU': [711468]
+'SE9 4BH': [711114]
+'SE9 4BQ': [721269]
+'SE9 4BU': [719643]
+'SE9 4BZ': [732289]
+'SE9 4DA': [717842]
+'SE9 4DX': [710233]
+'SE9 4HE': [727743]
+'SE9 4HF': [741293]
+'SE9 4HL': [724308]
+'SE9 4HN': [710914]
+'SE9 4HP': [720235]
+'SE9 4JX': [710703]
+'SE9 4LB': [720231]
+'SE9 4LD': [717086]
+'SE9 4LN': [719796]
+'SE9 4LP': [723897]
+'SE9 4LZ': [711056]
+'SE9 4NB': [711566]
+'SE9 4NQ': [726187]
+'SE9 4NZ': [723016]
+'SE9 4SX': [721436]
+'SE9 4TE': [726227]
+'SE9 5HZ': [739511]
+'SE9 5RF': [721520]
+'SE9 6AW': [720406]
+'SE9 6BP': [713463]
+'SE9 6BW': [713132]
+'SE9 6DH': [728292]
+'SE9 6JH': [719671]
+'SE9 6LB': [732853]
+'SE9 6LX': [719064]
+'SE9 6QD': [719341]
+'SE9 6QH': [728447]
+'SE9 6RA': [732742]
+'SO14 0AT': [721512]
+'SO14 0AU': [731251]
+'SO14 0AX': [721546]
+'SO14 0BQ': [729003]
+'SO14 0BT': [728010]
+'SO14 0BU': [724850]
+'SO14 0BY': [726066]
+'SO14 0DB': [728082]
+'SO14 0DW': [715876]
+'SO14 0EA': [719514]
+'SO14 0EQ': [716868]
+'SO14 0FB': [726477]
+'SO14 0NA': [725697]
+'SO14 0ND': [740997]
+'SO14 0NH': [721221]
+'SO14 0NS': [717546]
+'SO14 0NW': [733501]
+'SO14 0PU': [721938]
+'SO14 6BB': [714054]
+'SO15 1JR': [716346]
+'SO15 2HQ': [717327]
+'SO15 3DN': [714768]
+'SO15 3FE': [733398]
+'SO15 5DQ': [720253]
+'SO15 8PT': [732303]
+'SO15 8RP': [738256]
+'SO16 5EY': [724830]
+'SO16 8HD': [725659]
+'SO16 8HE': [720133]
+'SO16 8HH': [727289]
+'SO16 9DA': [720933]
+'SO17 2GY': [736209]
+'SO17 2HW': [726965]
+'SO17 2JB': [731448]
+'SO17 2JH': [717433]
+'SO18 1NZ': [721704]
+'SO18 2FH': [718493]
+'SO18 2HF': [723667]
+'SO18 5DY': [722756]
+'SO18 5FW': [725461]
+'SO19 1DD': [726829]
+'SO19 1DJ': [728293]
+'SO19 1EG': [728650]
+'SO19 2FX': [732508]
+'SO19 2HH': [716324]
+'SO19 2HT': [712699]
+'SO19 5LG': [721170]
+'SO19 5LH': [721500]
+'SO19 6DS': [724913]
+'SO19 6FN': [728513]
+'SO19 6FQ': [713409]
+'SO19 6HQ': [728622]
+'SO19 6LN': [714670]
+'SO19 6NZ': [732071]
+'SO19 7LP': [731311]
+'SO19 9BZ': [721004]
+'SO19 9DH': [717630]
+'SO19 9DW': [725099]
+'SO19 9QT': [731398]
+'SO21 1PN': [738353]
+'SO31 6QU': [731682]
+'SO31 6SX': [720467]
+'SO31 6TJ': [732984]
+'SO31 6XB': [715267]
+'SO31 7GD': [724166]
+'SO31 9JR': [721566]
+'SO32 2PX': [712901]
+'SO50 4BW': [738938]
+'SO53 2LF': [723759]
+'SW16 4BB': [717693]
+'SW16 4BH': [713870]
+'SW16 4TJ': [717928]
+'SW16 4TR': [721166]
+'SW17 7PL': [726300]
+'SW20 0JD': [726591]
+'SW2 1AH': [735806]
+'SW4 6QF': [722560]
+'SW4 6QX': [724741]
+'SW9 0BX': [732327]
+'SW9 0DE': [725600]
+'SW9 0RE': [733797]
+'SW9 0TS': [733563]
+'SW9 7JG': [741033]
+'SW9 9ER': [735064]
+'SW9 9JZ': [718931]
+'TN16 2PB': [719668]
+'TN16 3DY': [711346]
+'TN16 3ED': [712562]
+'TN16 3LH': [721732]
+'TN16 3NH': [710331]
+'TN16 3PL': [709916]
+'TN16 3RR': [709984]
+'TN16 3TP': [723906]
+'TN16 3UE': [711532]
+'TN23 3NS': [739507]
+'TN23 5TE': [733357]
+'TN23 5UH': [718721]
+'TN2 3HR': [731657]
+'TN24 9LU': [715879]
+'TN2 5PL': [715711]
+'TN2 5PT': [716278]
+'TN2 5PU': [728825]
+'TN2 5QG': [723959]
+'TN29 0PT': [722961]
+'TN3 9TJ': [722644]
+'TN4 0AA': [713177]
+'BN11 1JH': [711816, 734991]
+'BN11 4SS': [727220, 727229]
+'BN14 0XA': [718861, 727987]
+'BN1 4ZJ': [733730, 734995]
+'BN18 0TW': [719247, 720005]
+'BN2 1TQ': [725231, 729059]
+'BN2 4PQ': [716247, 730875]
+'BN2 5PS': [718543, 719528]
+'BN2 6NH': [724240, 728586]
+'BN2 6WD': [716811, 733151]
+'BN3 1RN': [734868, 736916]
+'BN3 3RA': [733609, 734867]
+'BN3 3TR': [735066, 735829]
+'BN43 5QQ': [711810, 712103]
+'BN43 6YN': [739486, 739493]
+'BR1 3NU': [738280, 738306]
+'BR1 3QF': [731274, 737772]
+'BR1 4QX': [710510, 720220]
+'BR1 4QY': [710694, 723417]
+'BR1 4QZ': [710396, 719553]
+'BR1 4SQ': [710102, 720380]
+'BR1 5EL': [720232, 720243]
+'BR1 5JW': [715869, 717701]
+'BR1 5LF': [716338, 733470]
+'BR1 5PF': [731001, 733123]
+'BR2 8DN': [714046, 730420]
+'BR2 9RX': [715457, 733665]
+'BR3 4PY': [728949, 728961]
+'BR3 4RU': [726533, 726537]
+'BR3 4SF': [718505, 718506]
+'BR5 2HS': [710648, 711077]
+'BR5 2JY': [710192, 711252]
+'BR5 2NH': [710076, 710178]
+'BR5 2PF': [711290, 728320]
+'BR5 2PG': [721097, 721644]
+'BR5 2RN': [730752, 732887]
+'BR5 2RP': [711465, 719624]
+'BR5 2SG': [711095, 711413]
+'BR5 2TE': [721744, 732281]
+'BR5 2TF': [724943, 726845]
+'BR5 3AP': [721009, 725400]
+'BR5 3BH': [716984, 729099]
+'BR5 3BJ': [711096, 711113]
+'BR5 3BS': [711676, 717392]
+'BR5 3EB': [715106, 720091]
+'BR5 4BA': [721092, 722739]
+'BR5 4PD': [723837, 724674]
+'BR6 9UH': [709901, 712028]
+'BR7 6HU': [731419, 733226]
+'BR7 6PY': [713004, 718878]
+'CR0 0BN': [722932, 723478]
+'CR0 0HZ': [728497, 732216]
+'CR0 0NH': [717026, 721542]
+'CR0 0PQ': [719111, 729448]
+'CR0 0QG': [716299, 716344]
+'CR0 0RE': [715339, 715404]
+'CR0 0RF': [720831, 720838]
+'CR0 0RG': [719666, 726260]
+'CR0 0RH': [716069, 725321]
+'CR0 0RL': [717509, 722603]
+'CR0 0RR': [714929, 729051]
+'CR0 0RT': [719405, 723604]
+'CR0 0RU': [717270, 719531]
+'CR0 0SG': [724898, 726348]
+'CR0 0TN': [732342, 732537]
+'CR0 2HN': [738265, 738267]
+'CR0 2PF': [738252, 738312]
+'CR0 2QA': [717155, 731454]
+'CR0 2XR': [718483, 721146]
+'CR0 3JR': [722989, 730649]
+'CR0 3NA': [713902, 717700]
+'CR0 3PL': [710974, 727214]
+'CR0 3RR': [731337, 731573]
+'CR0 4DU': [714954, 729933]
+'CR0 4EB': [720637, 728760]
+'CR0 4EE': [722056, 732732]
+'CR0 4EQ': [718463, 723375]
+'CR0 4LF': [720246, 738279]
+'CR0 6AE': [710123, 715814]
+'CR0 6AH': [718124, 718125]
+'CR0 6DW': [729984, 730090]
+'CR0 6JQ': [721844, 725018]
+'CR0 7AU': [726489, 728381]
+'CR0 7YA': [717614, 730873]
+'CR0 7YB': [721924, 730165]
+'CR0 8LA': [720674, 730297]
+'CR0 8NL': [721217, 730955]
+'CR0 9DB': [721471, 726381]
+'CR0 9DD': [732229, 733193]
+'CR0 9DE': [719458, 723372]
+'CR0 9DG': [728854, 732235]
+'CR0 9DQ': [728745, 730003]
+'CR0 9DS': [716372, 716838]
+'CR0 9DT': [724197, 727382]
+'CR0 9DW': [714665, 733280]
+'CR0 9EQ': [725041, 728906]
+'CR0 9EW': [726868, 728762]
+'CR0 9HJ': [721703, 721967]
+'CR2 6BG': [738261, 738282]
+'CR2 7AD': [738278, 738305]
+'CR2 7DL': [733791, 735819]
+'CR2 7ED': [738270, 738303]
+'CR2 8AE': [716093, 725360]
+'CR2 8HU': [726192, 732080]
+'CR7 7EQ': [738275, 738304]
+'CR7 8AL': [728008, 728474]
+'CR7 8AS': [721754, 726396]
+'CR7 8AT': [714215, 729049]
+'CR7 8HN': [717414, 721248]
+'CR7 8RB': [725121, 725127]
+'CT1 1LU': [711271, 728363]
+'CT1 3SG': [741375, 741378]
+'CT18 7SB': [713371, 714891]
+'CT18 7TL': [722929, 723476]
+'CT20 3QJ': [723068, 723614]
+'CT6 7EQ': [715789, 715825]
+'CT6 7SZ': [713889, 739482]
+'DA11 7DJ': [710495, 710550]
+'DA11 8GD': [710774, 710995]
+'DA12 2JB': [717785, 719190]
+'DA12 2LX': [724649, 725031]
+'DA14 5LB': [717254, 719902]
+'DA15 7DZ': [733642, 734899]
+'DA16 2BP': [715361, 731464]
+'DA9 9HW': [717068, 727462]
+'E1 2LG': [713014, 722576]
+'E1 2NP': [723586, 726150]
+'E1 2PA': [730051, 730401]
+'E14 6DX': [721275, 721803]
+'E1W 3QQ': [722809, 732058]
+'E2 0BF': [720309, 720928]
+'E2 6GD': [738297, 738314]
+'E2 6GF': [719245, 721069]
+'E3 2JR': [715467, 715479]
+'GU27 3HR': [722442, 727355]
+'GU28 0JQ': [712968, 718844]
+'GU28 0PL': [722355, 725185]
+'GU28 0RD': [719134, 725652]
+'GU28 9DB': [712816, 718673]
+'GU28 9JF': [713120, 718988]
+'GU29 0BD': [712908, 725287]
+'GU29 0HP': [729261, 730736]
+'GU29 0QF': [712871, 718732]
+'GU29 9HZ': [723468, 723944]
+'GU29 9QS': [718968, 729319]
+'GU30 7JR': [714220, 732706]
+'GU30 7JT': [712866, 718723]
+'GU31 5HT': [718985, 722692]
+'GU31 5JT': [713072, 722643]
+'HA1 4GL': [739218, 739318]
+'ME10 3DU': [712684, 712690]
+'ME10 4GJ': [709829, 710780]
+'ME14 1JG': [741484, 741520]
+'ME15 6RG': [709793, 710399]
+'ME15 8JQ': [716854, 716871]
+'ME17 1GR': [710041, 710160]
+'ME2 1BE': [717316, 717329]
+'ME2 2HG': [726372, 726376]
+'ME3 0EF': [711742, 728475]
+'ME4 5LT': [713267, 718587]
+'ME5 7JR': [723713, 724154]
+'ME7 5XN': [723412, 723413]
+'ME9 8TQ': [726936, 728710]
+'MK10 9SY': [713141, 719006]
+'N1 7FP': [718250, 719233]
+'N1 8NT': [723841, 724066]
+'N7 8BH': [710420, 731776]
+'NW10 8SF': [714270, 722473]
+'PE1 2BL': [730295, 731260]
+'PE1 2LB': [732496, 733310]
+'PE1 4JB': [721235, 731120]
+'PE19 7GR': [730052, 731335]
+'PE27 3FL': [720817, 726519]
+'PE27 3FN': [715829, 731088]
+'PE27 3HG': [714494, 716727]
+'PE28 4ET': [716561, 717455]
+'PE4 5BY': [728510, 729588]
+'PE4 5DA': [713611, 731908]
+'PE4 6HZ': [725052, 726487]
+'PE4 6JR': [732194, 732349]
+'PE4 6JU': [721281, 728449]
+'PE4 6JZ': [732243, 733154]
+'PE4 6NB': [720490, 720786]
+'PE4 6NR': [715910, 716311]
+'PE4 7BB': [730409, 733169]
+'PE4 7DG': [724173, 726566]
+'PE4 7EH': [709918, 713891]
+'PE4 7EQ': [730118, 730962]
+'PE4 7XX': [714224, 714941]
+'PO10 8LE': [731522, 732266]
+'PO10 8LX': [716630, 720734]
+'PO10 8RD': [719149, 738349]
+'PO14 1DH': [726100, 727825]
+'PO14 1LR': [720917, 722370]
+'PO14 2HH': [714282, 723258]
+'PO14 3HG': [718542, 719487]
+'PO14 4AW': [719079, 722788]
+'PO14 4QP': [719753, 721861]
+'PO15 6HF': [718904, 724244]
+'PO15 6NJ': [717541, 722661]
+'PO15 6NQ': [713648, 732937]
+'PO15 6QD': [714480, 721383]
+'PO15 6QF': [731291, 732473]
+'PO15 6QP': [729872, 730059]
+'PO15 6SP': [728379, 729575]
+'PO1 5QG': [722901, 723447]
+'PO16 0SZ': [714666, 723671]
+'PO16 7TL': [713743, 729456]
+'PO16 8AX': [719094, 722798]
+'PO16 8PL': [714273, 736322]
+'PO18 0EW': [733631, 734891]
+'PO18 0TH': [718387, 721609]
+'PO18 8BL': [715382, 715413]
+'PO18 8BW': [730638, 732792]
+'PO18 8JT': [714212, 732696]
+'PO18 8LA': [719227, 720615]
+'PO18 8LE': [730533, 731694]
+'PO18 8QQ': [730740, 731895]
+'PO18 8QU': [722347, 725174]
+'PO18 9JW': [713077, 718940]
+'PO19 3AQ': [730161, 731520]
+'PO19 3LH': [732408, 732512]
+'PO19 5UA': [716381, 717664]
+'PO19 6TP': [736477, 736600]
+'PO19 7BT': [709816, 710440]
+'PO19 7GT': [730440, 730450]
+'PO19 7HT': [726181, 726506]
+'PO19 7HU': [720794, 721917]
+'PO19 7HY': [715253, 715465]
+'PO19 7LT': [728154, 728274]
+'PO19 7YL': [728314, 728747]
+'PO19 8FU': [709823, 710450]
+'PO19 8JG': [715831, 715849]
+'PO19 8JH': [729858, 729954]
+'PO19 8SX': [729408, 732027]
+'PO20 0NA': [737691, 737723]
+'PO20 0NY': [714547, 729469]
+'PO20 1JX': [725377, 727457]
+'PO20 1PW': [727381, 729127]
+'PO20 2DH': [712977, 722540]
+'PO20 2EZ': [718725, 722418]
+'PO20 2HG': [717909, 724623]
+'PO20 2JN': [711510, 711620]
+'PO20 2JS': [710742, 710967]
+'PO20 7HA': [731124, 731370]
+'PO21 2TX': [711574, 731616]
+'PO9 5DF': [730516, 732678]
+'RH10 6GG': [710175, 710224]
+'RH10 6GJ': [711028, 711239]
+'RH11 0TS': [725708, 727794]
+'RH11 0TW': [732621, 732627]
+'RH11 7SE': [715841, 715868]
+'RH12 5YG': [729590, 730075]
+'RH14 0SX': [715176, 716693]
+'RH20 1DG': [713215, 725588]
+'RH6 9HX': [710090, 714910]
+'SE10 0DA': [722285, 725136]
+'SE10 0DF': [721225, 726698]
+'SE10 0EA': [741368, 741384]
+'SE10 0EG': [725886, 729816]
+'SE10 0JL': [728056, 728064]
+'SE10 0NW': [714896, 716919]
+'SE10 8JZ': [726991, 728729]
+'SE10 9AE': [715531, 716479]
+'SE10 9AH': [728697, 728909]
+'SE11 4SJ': [719912, 719922]
+'SE12 8QJ': [728948, 728960]
+'SE12 8RS': [723900, 723901]
+'SE12 8RU': [723161, 723163]
+'SE12 9RY': [724873, 726171]
+'SE13 5HS': [718176, 718182]
+'SE13 5RT': [723471, 723681]
+'SE13 6DE': [726531, 726536]
+'SE13 6DQ': [721173, 721176]
+'SE13 6HN': [729900, 731353]
+'SE13 6HW': [716795, 716798]
+'SE13 6HX': [715397, 715398]
+'SE13 6QZ': [710569, 712711]
+'SE13 6TB': [717318, 717325]
+'SE13 6UA': [710512, 710513]
+'SE13 6UB': [718549, 718560]
+'SE13 7JE': [721810, 721980]
+'SE13 7JH': [716270, 716417]
+'SE13 7TJ': [729641, 729847]
+'SE13 7TL': [729545, 729603]
+'SE13 7TP': [714648, 714695]
+'SE13 7TS': [717741, 717750]
+'SE13 7UA': [732482, 732484]
+'SE14 5LX': [718526, 718527]
+'SE14 5NH': [709923, 713878]
+'SE14 5NX': [710083, 715469]
+'SE14 5QD': [722995, 729548]
+'SE14 5QE': [724621, 727131]
+'SE14 5QL': [725188, 727213]
+'SE14 5QR': [724764, 726562]
+'SE14 5QZ': [721848, 725428]
+'SE14 5SG': [714595, 715884]
+'SE14 5TR': [719221, 726532]
+'SE14 6NU': [717747, 717759]
+'SE14 6NZ': [713339, 714119]
+'SE14 6RS': [713942, 714007]
+'SE14 6RU': [713835, 713837]
+'SE15 1PT': [720210, 720239]
+'SE15 1QD': [716050, 719270]
+'SE15 2HD': [732325, 732326]
+'SE15 3BS': [714753, 714755]
+'SE15 3EF': [720968, 721180]
+'SE15 3UQ': [726957, 726961]
+'SE15 4AR': [731094, 731099]
+'SE15 4DD': [727201, 727204]
+'SE15 4DZ': [731408, 733297]
+'SE15 4EA': [731469, 731471]
+'SE15 4ED': [719929, 723433]
+'SE15 4EF': [722281, 722293]
+'SE15 4EN': [731299, 731530]
+'SE15 4HS': [731603, 741377]
+'SE15 4HY': [721445, 721455]
+'SE15 4JB': [728837, 728841]
+'SE15 4JD': [730174, 730182]
+'SE15 4LE': [717136, 732168]
+'SE15 4PU': [731098, 741369]
+'SE15 4PY': [716390, 716394]
+'SE15 5TF': [721713, 721721]
+'SE15 6UR': [714456, 730814]
+'SE16 7PH': [712851, 718707]
+'SE16 7PN': [712792, 718654]
+'SE18 1HJ': [717322, 717331]
+'SE18 1HL': [732444, 732479]
+'SE18 1ND': [732603, 732606]
+'SE18 1QB': [724093, 729794]
+'SE18 2QX': [723379, 727183]
+'SE18 2UL': [718090, 718094]
+'SE18 3AA': [719916, 719927]
+'SE18 3AP': [727600, 730807]
+'SE18 3HB': [711421, 729987]
+'SE18 3NY': [718551, 734331]
+'SE18 3QD': [719540, 719541]
+'SE18 3SY': [713780, 714754]
+'SE18 3TN': [710865, 723690]
+'SE18 7BJ': [717450, 726428]
+'SE18 7LP': [721781, 724784]
+'SE18 7NH': [722962, 723507]
+'SE18 7QG': [726374, 726377]
+'SE18 7QX': [720382, 720571]
+'SE18 7RW': [723359, 726339]
+'SE19 1HA': [714115, 714125]
+'SE19 2AJ': [717323, 717332]
+'SE19 2LQ': [724722, 724729]
+'SE20 7NA': [714490, 732018]
+'SE20 7XQ': [738262, 738301]
+'SE20 8EF': [717728, 717730]
+'SE20 8HE': [721985, 721993]
+'SE20 8HS': [710097, 714286]
+'SE20 8JF': [715995, 722925]
+'SE20 8ND': [724116, 724125]
+'SE20 8NU': [714633, 714654]
+'SE20 8RQ': [714702, 714704]
+'SE20 8SW': [713454, 731746]
+'SE21 8HB': [724118, 724127]
+'SE22 0AX': [710889, 724119]
+'SE22 0DG': [718146, 718148]
+'SE22 0DN': [721160, 721161]
+'SE22 0ES': [718534, 718535]
+'SE22 0HP': [728401, 728407]
+'SE22 0JS': [735041, 741328]
+'SE22 0LN': [731608, 731617]
+'SE22 0QJ': [715811, 715816]
+'SE22 0QU': [714075, 714594]
+'SE22 0QY': [715925, 715931]
+'SE22 8EA': [718164, 741321]
+'SE22 8PS': [728836, 728840]
+'SE22 8PY': [722266, 722269]
+'SE22 9AB': [727930, 727934]
+'SE22 9AQ': [718169, 718177]
+'SE22 9HB': [728180, 728181]
+'SE22 9JH': [721433, 721434]
+'SE22 9LH': [720248, 741327]
+'SE22 9LQ': [714830, 714846]
+'SE23 1DZ': [718552, 718564]
+'SE23 2AE': [724339, 724344]
+'SE23 2HR': [726047, 726050]
+'SE23 2PW': [724728, 724740]
+'SE23 2QR': [710007, 714454]
+'SE23 3XP': [728955, 728964]
+'SE25 4EJ': [726687, 726696]
+'SE25 4TD': [738286, 738308]
+'SE25 5DW': [724343, 724350]
+'SE25 5RE': [728865, 729631]
+'SE25 6HY': [716300, 716345]
+'SE26 4PD': [714842, 733493]
+'SE26 5HT': [719489, 719491]
+'SE26 5HU': [733266, 733269]
+'SE26 6JD': [741361, 741362]
+'SE28 0DP': [716325, 739126]
+'SE28 0DQ': [709875, 732811]
+'SE28 0EN': [710531, 718056]
+'SE28 0PA': [738602, 738617]
+'SE28 8AX': [728207, 732186]
+'SE28 8AY': [726840, 732280]
+'SE28 8DD': [722839, 727729]
+'SE28 8LH': [713352, 731642]
+'SE2 9BJ': [713250, 722815]
+'SE2 9DZ': [732276, 732323]
+'SE2 9EL': [714758, 732177]
+'SE2 9EU': [723698, 724138]
+'SE2 9JY': [724761, 725712]
+'SE2 9LN': [724459, 733291]
+'SE2 9QX': [730028, 730969]
+'SE2 9QY': [710253, 726095]
+'SE2 9QZ': [713851, 713990]
+'SE2 9XL': [718519, 718537]
+'SE3 0TP': [716232, 720792]
+'SE3 7DU': [731090, 733261]
+'SE3 7EF': [717686, 717687]
+'SE3 7LU': [730176, 730181]
+'SE3 8AP': [710958, 722407]
+'SE4 1BU': [731167, 731478]
+'SE4 1DE': [722359, 726049]
+'SE4 1DH': [717720, 718093]
+'SE4 1DX': [733290, 733353]
+'SE4 1TY': [715913, 716366]
+'SE4 1XZ': [732526, 733404]
+'SE4 1YN': [710006, 714839]
+'SE4 2AJ': [720247, 720255]
+'SE4 2BS': [727206, 727223]
+'SE4 2DG': [733130, 733132]
+'SE4 2DR': [720840, 720841]
+'SE4 2ED': [724727, 724739]
+'SE4 2EJ': [721989, 721994]
+'SE4 2JH': [731787, 732620]
+'SE4 2ND': [726830, 726834]
+'SE4 2PX': [720589, 731655]
+'SE4 2PY': [722340, 726223]
+'SE5 0RR': [719886, 719887]
+'SE5 8LY': [728506, 728511]
+'SE5 8NQ': [731017, 731019]
+'SE5 8NY': [720564, 720578]
+'SE5 8QF': [721710, 721719]
+'SE6 1DQ': [720568, 720575]
+'SE6 1RE': [717703, 717705]
+'SE6 2AB': [729138, 729139]
+'SE6 2AT': [709999, 716840]
+'SE6 2BU': [721716, 721723]
+'SE6 2DH': [733425, 733443]
+'SE6 2EX': [719438, 720162]
+'SE6 2EY': [715718, 719820]
+'SE6 2HN': [715571, 717440]
+'SE6 2LN': [714111, 714122]
+'SE6 4NF': [728723, 728725]
+'SE6 4NN': [728054, 728061]
+'SE7 7LG': [718085, 718515]
+'SE7 7NT': [728928, 731348]
+'SE7 7PF': [728055, 728063]
+'SE7 7PG': [723442, 723922]
+'SE7 7PJ': [710901, 724349]
+'SE7 7PY': [718614, 718823]
+'SE7 7QR': [724703, 725086]
+'SE7 8BH': [732562, 732564]
+'SE7 8EP': [711152, 711153]
+'SE8 4DZ': [714949, 715545]
+'SE8 4EB': [713919, 713921]
+'SE8 5PT': [716008, 716965]
+'SE9 1LB': [716720, 727651]
+'SE9 1LD': [716484, 718243]
+'SE9 3QW': [711544, 731171]
+'SE9 4AN': [711670, 716962]
+'SE9 4AP': [732121, 733276]
+'SE9 4BN': [710247, 722401]
+'SE9 4JF': [721825, 724228]
+'SE9 4JY': [720076, 729226]
+'SE9 4LA': [720543, 720558]
+'SE9 4LR': [721706, 721972]
+'SE9 4LU': [710079, 717658]
+'SE9 4LX': [714039, 731581]
+'SE9 4NA': [710819, 726166]
+'SE9 4ND': [711375, 732081]
+'SE9 6RF': [710906, 724787]
+'SE9 6TS': [715830, 717276]
+'SM7 2QZ': [722664, 727559]
+'SO14 0AQ': [738291, 738310]
+'SO14 0BN': [734822, 734825]
+'SO14 0DG': [736687, 736688]
+'SO14 0DL': [715338, 715775]
+'SO14 0DN': [715298, 715342]
+'SO14 0DQ': [731048, 731201]
+'SO14 0DT': [734223, 734224]
+'SO14 0DX': [716873, 719905]
+'SO14 0EL': [718510, 722149]
+'SO14 0ER': [713789, 730991]
+'SO14 0NT': [710555, 721875]
+'SO14 0PH': [725994, 726325]
+'SO14 3GN': [731235, 731294]
+'SO15 3EU': [712693, 724527]
+'SO15 3JT': [722240, 722245]
+'SO17 2HU': [714158, 715499]
+'SO18 5DU': [730027, 730216]
+'SO18 5GT': [724786, 725732]
+'SO19 0QZ': [710143, 715586]
+'SO19 2PH': [713163, 718584]
+'SO19 6EL': [719293, 724804]
+'SO19 7LR': [722275, 722289]
+'SO19 8AX': [716796, 716819]
+'SO19 9BR': [712749, 712750]
+'SO19 9BU': [722299, 722302]
+'SO19 9FP': [733264, 738294]
+'SO19 9GE': [728541, 728756]
+'SO21 3AJ': [725266, 727354]
+'SO31 8DU': [718966, 725486]
+'SO31 8HX': [713060, 718923]
+'SW19 8SX': [736428, 737315]
+'SW9 0EF': [727853, 728247]
+'SW9 0SW': [733763, 735030]
+'SW9 6AT': [718107, 718108]
+'SW9 9EB': [713992, 733206]
+'TN2 3DD': [726029, 729688]
+'TN24 8UW': [729764, 729863]
+'TN4 9LG': [728966, 728969]
+'BN1 4LA': [716190, 716680, 717149]
+'BN1 6RA': [711768, 734847, 735633]
+'BN17 7SD': [710358, 710502, 710561]
+'BN17 7SH': [709787, 710733, 711171]
+'BN18 0BP': [712993, 722556, 727467]
+'BN18 0NH': [719084, 719485, 725601]
+'BN1 8QR': [741094, 741096, 741097]
+'BN2 1EF': [728489, 728613, 728708]
+'BN2 5HT': [714556, 722856, 733078]
+'BN3 3FA': [712536, 733569, 734831]
+'BN44 3TD': [722953, 726256, 726580]
+'BN6 9GF': [710986, 711347, 711607]
+'BN6 9YH': [711200, 711491, 711708]
+'BN6 9ZD': [709791, 710736, 711174]
+'BR1 2DD': [729696, 729700, 729704]
+'BR1 3PU': [719914, 719925, 719935]
+'BR1 3QE': [711449, 728938, 731356]
+'BR1 5NS': [721699, 721702, 723125]
+'BR2 6EH': [722595, 725418, 727500]
+'BR2 9PL': [728495, 728930, 729684]
+'BR2 9PP': [732369, 732474, 732557]
+'BR2 9RR': [730098, 730269, 730946]
+'BR3 1QS': [733181, 733186, 733188]
+'BR5 2JR': [709904, 710932, 715244]
+'BR5 2RS': [721847, 723565, 726135]
+'BR5 2SJ': [711021, 711045, 721933]
+'BR5 2TG': [714192, 715518, 720600]
+'BR5 3DT': [717138, 722678, 727573]
+'BR5 3TQ': [715693, 716214, 732973]
+'BR5 4AQ': [728822, 729592, 729797]
+'BR6 7EB': [714447, 718003, 719406]
+'BR7 5AY': [714434, 715164, 732936]
+'CR0 0AN': [715776, 716379, 732346]
+'CR0 0DR': [719722, 726293, 730696]
+'CR0 0QR': [710641, 720117, 721057]
+'CR0 0QZ': [738344, 738345, 738346]
+'CR0 2XY': [714833, 714848, 719463]
+'CR0 3ED': [716943, 719220, 719979]
+'CR0 3JW': [726648, 728266, 730250]
+'CR0 7AY': [721027, 721582, 723304]
+'CR0 7QR': [716804, 716807, 716808]
+'CR0 7YF': [714940, 715540, 731719]
+'CR0 9EF': [715889, 731576, 733358]
+'CR0 9EP': [710887, 713634, 724661]
+'CR0 9ER': [731221, 733119, 733248]
+'CR2 6JE': [729897, 729905, 738288]
+'CR2 8HS': [718029, 721049, 724486]
+'CR7 7RL': [710829, 721987, 723182]
+'CT19 6PN': [715059, 721306, 721562]
+'CT2 8NS': [713313, 719158, 722875]
+'CT2 8QF': [713155, 719022, 722730]
+'CT2 8QG': [713033, 718901, 722600]
+'CT6 7SD': [714612, 731341, 732209]
+'DA11 0SA': [741037, 741038, 741039]
+'DA11 8FY': [710771, 711210, 711499]
+'DA11 8FZ': [710456, 710782, 711004]
+'DA1 1QD': [712037, 720502, 720796]
+'DA12 2JH': [731440, 731496, 732133]
+'DA12 2JX': [722451, 727364, 730587]
+'DA1 5GB': [721492, 721746, 722029]
+'DA1 5GE': [738388, 738698, 738768]
+'DA1 5HH': [711265, 711279, 711292]
+'DA16 3ND': [726086, 729530, 731126]
+'DA17 5BG': [710033, 711604, 713586]
+'E1 1LR': [713076, 718939, 722648]
+'E1 4BS': [720547, 720551, 720555]
+'E1 5FF': [726237, 726561, 726850]
+'E2 0QB': [721413, 721944, 723105]
+'GU27 3PE': [728366, 729664, 729869]
+'GU28 0HS': [725245, 733846, 738096]
+'GU28 9DH': [714193, 714908, 716932]
+'GU29 9EN': [735723, 736833, 737234]
+'GU31 5BF': [709808, 710432, 710757]
+'GU31 5JS': [714391, 715123, 732889]
+'GU31 5NG': [713021, 722585, 725411]
+'ME10 3EQ': [710563, 710616, 710646]
+'ME10 3FR': [710811, 710852, 710884]
+'ME10 4FS': [709891, 711214, 711501]
+'ME10 4GS': [712822, 722379, 727292]
+'ME10 4LY': [713318, 722879, 727769]
+'ME15 9DG': [724724, 724732, 726488]
+'ME3 7NX': [712992, 718870, 722555]
+'ME5 0EZ': [718728, 722939, 723486]
+'ME5 0HB': [718055, 719455, 720178]
+'ME5 8FW': [710753, 712960, 718835]
+'ME7 4LE': [722960, 723505, 723966]
+'MK10 9RP': [714773, 715791, 715827]
+'MK10 9ST': [713010, 722570, 727480]
+'NN3 2BG': [730543, 731702, 732701]
+'NW10 8EU': [724035, 724846, 725787]
+'NW10 8NZ': [727549, 730762, 732903]
+'PE1 2BJ': [709917, 713796, 731079]
+'PE1 2ED': [711034, 726065, 726394]
+'PE27 3HR': [710489, 727811, 732128]
+'PE28 4WJ': [713160, 719025, 722736]
+'PE4 5AU': [727540, 729283, 730753]
+'PE4 6NQ': [731089, 731234, 733178]
+'PE4 7BJ': [732467, 732517, 733360]
+'PE4 7DR': [716591, 720700, 724630]
+'PE4 7EL': [717670, 718115, 718128]
+'PE4 7EN': [713494, 718800, 723525]
+'PE6 7EU': [710318, 710388, 719839]
+'PE7 3WF': [726061, 726712, 727796]
+'PO10 8PS': [713756, 727734, 733069]
+'PO14 1BZ': [719476, 720531, 721419]
+'PO14 1JY': [722416, 725246, 729072]
+'PO14 1LP': [713404, 730530, 732690]
+'PO15 7LU': [728552, 728764, 729531]
+'PO18 0SF': [727730, 738417, 738435]
+'PO18 8DG': [713465, 714985, 731758]
+'PO18 8FR': [709796, 710423, 710744]
+'PO18 8TJ': [716087, 725350, 727428]
+'PO18 8TQ': [713273, 719126, 725643]
+'PO19 3FE': [710031, 710152, 710206]
+'PO19 3HL': [734522, 737943, 738176]
+'PO19 3LQ': [731276, 731388, 732150]
+'PO19 6SR': [734353, 734908, 737204]
+'PO19 6XL': [730987, 731271, 731384]
+'PO19 6XP': [728360, 729557, 729765]
+'PO19 6XR': [710238, 716801, 717296]
+'PO19 7LX': [715948, 717783, 719598]
+'PO19 7XL': [731466, 731590, 732217]
+'PO19 8AL': [731505, 732143, 732199]
+'PO19 8BX': [722043, 723227, 723730]
+'PO20 0NU': [716629, 717105, 718359]
+'PO20 0NX': [721033, 721588, 726626]
+'PO20 0SG': [713901, 713964, 714033]
+'PO20 7NL': [718748, 725265, 727353]
+'PO20 8PA': [717097, 717951, 719351]
+'PO21 2EH': [733573, 734835, 736244]
+'RH14 0EL': [709786, 712085, 712207]
+'RH14 0PQ': [719052, 725567, 727649]
+'RH14 0SP': [715665, 730771, 731931]
+'RH16 1DZ': [738296, 738328, 738329]
+'RH19 2TA': [713263, 719123, 722829]
+'RH20 1FP': [712971, 718848, 722532]
+'RH6 8LP': [710728, 714216, 732700]
+'SE10 9EY': [710400, 741323, 741324]
+'SE12 0EF': [725101, 725102, 725103]
+'SE12 8NR': [731529, 731533, 732139]
+'SE12 8NU': [713873, 732481, 732485]
+'SE12 9TH': [719563, 719571, 720254]
+'SE13 5RN': [717328, 717333, 717336]
+'SE13 6TH': [721429, 721430, 721962]
+'SE13 7DH': [713474, 714990, 725299]
+'SE14 5LB': [713958, 713981, 715449]
+'SE14 5LE': [726538, 728950, 728957]
+'SE14 5NP': [715453, 732611, 732619]
+'SE14 5NS': [721181, 721183, 728185]
+'SE14 5PP': [727237, 727295, 730465]
+'SE14 5QQ': [715977, 721209, 728526]
+'SE14 5TU': [716428, 731096, 731100]
+'SE14 6NR': [720851, 720868, 723923]
+'SE14 6NT': [713854, 714641, 730267]
+'SE14 6SL': [721983, 721995, 724918]
+'SE15 2JD': [723679, 723688, 723693]
+'SE15 3HZ': [717729, 717731, 717732]
+'SE15 3PX': [714130, 716265, 729452]
+'SE15 3UB': [714218, 731602, 731613]
+'SE15 4NR': [726154, 726475, 726783]
+'SE15 4PT': [715853, 715899, 715901]
+'SE15 5GB': [713041, 722609, 727509]
+'SE15 5UQ': [728107, 730175, 730183]
+'SE15 6NH': [732165, 732167, 741051]
+'SE16 4DZ': [733894, 737904, 738145]
+'SE18 2QL': [714645, 714701, 714703]
+'SE18 3EZ': [720862, 732616, 732625]
+'SE18 3PG': [721172, 721179, 721185]
+'SE18 3PP': [713874, 713875, 713877]
+'SE18 3QJ': [712524, 726650, 729878]
+'SE18 4EW': [716875, 717679, 718157]
+'SE18 6UF': [714147, 715918, 715932]
+'SE18 7JP': [721157, 721159, 721164]
+'SE18 7NB': [729879, 730066, 730251]
+'SE19 1BS': [731593, 731596, 731598]
+'SE19 2HJ': [731599, 733480, 733490]
+'SE19 3AY': [725193, 727205, 727222]
+'SE20 7LX': [725112, 727200, 727203]
+'SE20 7SW': [713307, 718588, 718594]
+'SE20 7TT': [714815, 714817, 714818]
+'SE20 8DD': [710370, 718171, 718187]
+'SE20 8HD': [718566, 718572, 718573]
+'SE20 8NF': [712061, 733570, 735621]
+'SE2 0HY': [713425, 714944, 716966]
+'SE22 8QA': [728507, 728512, 733599]
+'SE22 9HD': [711296, 724124, 728635]
+'SE23 2JG': [718585, 718599, 725130]
+'SE23 2ST': [714128, 715030, 715451]
+'SE23 3LX': [741381, 741382, 741383]
+'SE25 5BQ': [716316, 716327, 716329]
+'SE25 5EE': [713283, 719133, 722851]
+'SE25 5PQ': [714116, 714126, 730441]
+'SE25 5PZ': [717645, 727747, 732092]
+'SE25 5QA': [723909, 723916, 723920]
+'SE25 6NS': [731556, 738283, 738348]
+'SE25 6RQ': [730170, 730331, 732271]
+'SE26 4PJ': [728952, 728962, 728968]
+'SE26 6NR': [717317, 717740, 717753]
+'SE2 9BX': [719906, 720211, 720223]
+'SE2 9LX': [713926, 714058, 714637]
+'SE3 0UG': [722428, 725258, 727341]
+'SE3 7DX': [710074, 715365, 715394]
+'SE3 8PZ': [729988, 729989, 729990]
+'SE3 9RA': [721169, 721177, 721184]
+'SE4 1NY': [720864, 720871, 720877]
+'SE4 1QE': [730426, 733265, 733268]
+'SE4 1UA': [717312, 717681, 717682]
+'SE4 1UG': [724117, 724126, 732612]
+'SE4 1XY': [716797, 716818, 716820]
+'SE4 2EQ': [728400, 728403, 728630]
+'SE4 2NF': [732427, 732604, 732608]
+'SE4 2NX': [721943, 721990, 741386]
+'SE4 2PB': [714120, 724532, 732614]
+'SE5 8LG': [741336, 741338, 741544]
+'SE6 1XR': [715294, 715305, 715798]
+'SE6 2UF': [714048, 714050, 714052]
+'SE6 4UL': [714822, 714838, 714852]
+'SE7 7AB': [732607, 732610, 733184]
+'SE7 7JE': [719265, 719266, 727227]
+'SE7 7NX': [715914, 715915, 715916]
+'SE8 3GD': [714098, 714584, 714718]
+'SE8 4DX': [728629, 728633, 729509]
+'SE8 4EJ': [709921, 713848, 732242]
+'SE8 5AJ': [716909, 725699, 730448]
+'SE8 5BA': [713725, 714517, 733036]
+'SE8 5LY': [726015, 726342, 726663]
+'SE9 1JU': [725702, 726704, 726968]
+'SE9 1LE': [722390, 730535, 732693]
+'SE9 1SW': [726953, 727080, 727198]
+'SE9 4RZ': [719920, 719933, 719939]
+'SE9 6NH': [716017, 729086, 732723]
+'SE9 6NW': [713277, 722845, 727736]
+'SE9 6TR': [714775, 714811, 715329]
+'SE9 6TT': [717301, 717669, 717697]
+'SO14 0AZ': [734089, 734095, 738233]
+'SO14 0BX': [710267, 715146, 717982]
+'SO14 0DH': [726725, 726989, 727810]
+'SO14 0DP': [733469, 733971, 733972]
+'SO14 0DS': [717683, 734321, 734322]
+'SO14 0EJ': [723320, 724660, 728011]
+'SO14 0EW': [711247, 718313, 719700]
+'SO14 0LN': [729732, 736548, 736549]
+'SO14 6HH': [728203, 728429, 728505]
+'SO16 5FS': [727933, 727936, 727937]
+'SO16 9LW': [714653, 714655, 714656]
+'SO17 2FT': [737454, 737455, 738287]
+'SO19 9LS': [713442, 714961, 715458]
+'SO31 8HY': [713302, 719147, 722866]
+'SO32 2NW': [732056, 733917, 738165]
+'SW4 6FA': [739196, 739198, 739200]
+'SW8 1AB': [714090, 714606, 714664]
+'SW9 0PB': [716726, 730853, 733008]
+'SW9 9DE': [717078, 729755, 731102]
+'SW9 9JP': [716047, 717874, 719268]
+'SW9 9JR': [714263, 720886, 722465]
+'TN1 2EB': [716392, 716395, 716397]
+'TN2 5TB': [721452, 721456, 721460]
+'TN4 9NA': [728724, 728727, 728730]
+'BN11 4HP': [721927, 723370, 723428, 723436]
+'BN1 4AB': [725722, 725911, 726074, 726245]
+'BN18 0BR': [719014, 725530, 729354, 731979]
+'BN3 5EX': [713084, 725469, 727551, 729299]
+'BN41 1HT': [733736, 735003, 735783, 736404]
+'BN43 6NS': [741068, 741108, 741131, 741156]
+'BR3 5LD': [722274, 722288, 727207, 727224]
+'BR5 2FF': [710851, 710883, 710905, 710927]
+'BR5 4AR': [710620, 720849, 721156, 721162]
+'BR5 4RA': [717596, 725568, 729393, 732996]
+'CR0 0QN': [717690, 717711, 718538, 719882]
+'CR0 0RQ': [713290, 714557, 715272, 718486]
+'CR0 1HG': [733792, 735057, 735820, 736435]
+'CR0 2XN': [710823, 723178, 723183, 723187]
+'CR0 4DS': [717611, 725594, 732036, 733024]
+'CR0 4RG': [736631, 736632, 736633, 736664]
+'CR0 8LP': [729038, 732441, 732530, 733101]
+'CR0 8LR': [713029, 717947, 729243, 731875]
+'CR0 9DU': [726416, 726587, 729737, 731438]
+'CR0 9ES': [713821, 713905, 714720, 715322]
+'CR2 7AY': [716949, 717832, 719229, 719986]
+'CR7 7DJ': [714226, 715542, 730559, 732714]
+'CT1 1ZJ': [722936, 723483, 723954, 724386]
+'DA11 7BB': [728136, 728368, 728600, 728800]
+'DA11 8FF': [715102, 716139, 727510, 730729]
+'DA12 1HS': [713782, 713814, 713858, 733460]
+'DA1 2RD': [738361, 738463, 738554, 738613]
+'DA1 5HS': [710087, 710132, 710186, 710242]
+'DA2 6AZ': [718868, 732252, 733209, 733429]
+'DA7 6HX': [712837, 718691, 722392, 725218]
+'DA8 2PF': [718740, 722430, 725259, 729093]
+'DA9 9HN': [729754, 732504, 733242, 733317]
+'DA9 9UU': [715747, 716269, 716763, 717227]
+'E1 0AY': [726667, 726941, 727179, 728031]
+'E1 2NH': [726622, 728468, 728590, 730399]
+'E1 4ET': [717661, 717675, 717688, 717708]
+'E1 5JE': [714539, 722834, 729462, 730907]
+'E1W 1NA': [722750, 727635, 730831, 732986]
+'E1W 1NH': [712939, 718801, 722492, 725322]
+'E1W 1NT': [712996, 718873, 722559, 725390]
+'E2 0AZ': [715074, 715621, 718876, 732840]
+'E2 6DQ': [718729, 725250, 729077, 731723]
+'E2 6LN': [725899, 726062, 726234, 726392]
+'E2 6LP': [724604, 726270, 726878, 728226]
+'E2 9RE': [719007, 725525, 729349, 731975]
+'GU27 3QX': [725950, 726110, 726283, 726441]
+'GU27 3TG': [733612, 734871, 735655, 736275]
+'GU27 3TJ': [733590, 734852, 735638, 736258]
+'GU27 3TL': [733811, 735083, 735842, 736447]
+'GU27 3TQ': [733618, 734877, 735661, 736281]
+'GU28 0HX': [722282, 722294, 725524, 731973]
+'GU29 0DB': [712935, 722487, 725318, 729148]
+'GU29 9BS': [735720, 736830, 737228, 737592]
+'GU29 9FP': [741393, 741423, 741447, 741468]
+'GU29 9QY': [719017, 729357, 731982, 732966]
+'GU31 5QN': [713274, 722841, 727731, 732082]
+'HA0 4UJ': [738430, 738443, 738449, 738476]
+'HA1 4GU': [739110, 739186, 739189, 739203]
+'ME10 3FN': [710252, 710344, 710488, 710545]
+'ME10 3PD': [709885, 710039, 710157, 710268]
+'ME10 4ES': [717857, 719252, 721251, 721778]
+'ME10 4FN': [712858, 718714, 722409, 725236]
+'ME10 4FY': [713159, 719024, 722735, 725542]
+'ME13 8FE': [731494, 732131, 732247, 732345]
+'ME1 3AT': [710496, 718370, 719755, 720102]
+'ME14 2XJ': [712784, 718646, 722341, 725168]
+'ME15 8JE': [710328, 716837, 717293, 717306]
+'ME15 8WX': [710447, 710770, 710993, 711209]
+'ME16 8FP': [712789, 718652, 722346, 725173]
+'ME2 3QD': [709827, 711001, 719023, 722733]
+'ME3 7BN': [713007, 718881, 722567, 725399]
+'ME5 0EP': [728714, 728931, 729686, 729891]
+'ME5 7NR': [726684, 726690, 726694, 726697]
+'ME5 8FH': [713085, 718946, 722656, 725470]
+'MK10 9RR': [727072, 728164, 728392, 736946]
+'MK10 9RX': [715498, 719186, 719948, 720583]
+'MK10 9SG': [712793, 722350, 727267, 730495]
+'N7 9EY': [715145, 715666, 716179, 717133]
+'NN3 2HH': [711638, 711677, 711678, 711680]
+'PE1 2BN': [714800, 718141, 718508, 718518]
+'PE1 2EU': [716790, 716812, 716832, 716851]
+'PE1 5YJ': [714412, 727560, 730768, 732911]
+'PE28 4WL': [713221, 719081, 722790, 725595]
+'PE4 5BZ': [711534, 714697, 731084, 731288]
+'PE4 6BN': [727343, 728543, 729092, 730571]
+'PE4 6NH': [718473, 721137, 722840, 726193]
+'PO10 8FF': [722325, 725150, 733624, 734883]
+'PO10 8FR': [712745, 712746, 712747, 712748]
+'PO10 8JR': [725999, 736568, 736626, 736682]
+'PO15 5EB': [713828, 713913, 713973, 714042]
+'PO15 6LA': [713480, 714997, 716058, 731777]
+'PO15 6QN': [721565, 721830, 723286, 723549]
+'PO15 6SH': [713866, 713939, 714746, 715430]
+'PO18 8JY': [726979, 727801, 728084, 729720]
+'PO19 3AD': [716718, 719807, 723346, 725068]
+'PO19 3AN': [728024, 728487, 728921, 730256]
+'PO19 3ED': [716803, 716844, 717256, 717271]
+'PO19 3FF': [709833, 710461, 710789, 711012]
+'PO19 3LF': [712978, 722541, 727449, 729202]
+'PO19 3LW': [720124, 720758, 724044, 724466]
+'PO19 6SJ': [738001, 738023, 738043, 738051]
+'PO19 6SL': [733949, 733960, 738237, 738246]
+'PO19 6UX': [712803, 722356, 727273, 731670]
+'PO19 7AZ': [719004, 722714, 725521, 727604]
+'PO19 7JH': [719768, 721055, 724261, 735511]
+'PO19 8BA': [714965, 716030, 718749, 731740]
+'PO19 8BS': [723513, 724409, 728559, 730125]
+'PO19 8BY': [734775, 735169, 735290, 735399]
+'PO19 8FT': [709832, 710458, 710786, 711006]
+'PO20 0AE': [711366, 711514, 711625, 711719]
+'PO20 0TD': [713208, 722780, 725583, 727672]
+'PO20 1BD': [713254, 722818, 725629, 727713]
+'PO20 2AG': [734688, 734691, 734693, 734695]
+'PO20 2DJ': [712862, 718718, 725241, 727326]
+'PO20 2JU': [709817, 710441, 710764, 710987]
+'PO20 2NL': [710034, 710153, 710553, 710609]
+'PO20 7RD': [715205, 715710, 732010, 732998]
+'PO5 3QU': [728111, 728341, 728570, 728778]
+'RH12 5GG': [728758, 728834, 729524, 729727]
+'RH12 5YW': [720781, 721905, 722181, 724880]
+'RH20 3LS': [710043, 710162, 710271, 710355]
+'RH2 8AX': [741063, 741104, 741127, 741152]
+'SE10 0AA': [709811, 722588, 725414, 729238]
+'SE10 0AQ': [718224, 719616, 722026, 723680]
+'SE10 0EF': [726970, 727789, 728073, 728736]
+'SE10 9AQ': [713514, 717039, 717464, 718309]
+'SE10 9PJ': [728892, 730046, 730392, 730425]
+'SE12 8NP': [719915, 719926, 741360, 741532]
+'SE12 9PZ': [709799, 722498, 725330, 727408]
+'SE13 5LW': [741402, 741435, 741456, 741478]
+'SE13 6QF': [714093, 714731, 714733, 714763]
+'SE13 6RD': [726373, 726375, 733485, 733496]
+'SE13 7AW': [710181, 715435, 715436, 716371]
+'SE13 7LH': [721517, 726574, 727960, 729726]
+'SE14 5NQ': [726539, 726682, 726691, 726693]
+'SE14 5SA': [724345, 724351, 724353, 724354]
+'SE14 6DB': [716685, 718992, 719784, 732944]
+'SE14 6NY': [731016, 731021, 732328, 732329]
+'SE14 6RT': [715886, 716367, 741302, 741303]
+'SE14 6TW': [716429, 718597, 730464, 731605]
+'SE15 5NN': [731595, 731597, 732223, 732227]
+'SE15 6RP': [712973, 718851, 722534, 725365]
+'SE16 4BE': [735755, 736375, 736862, 737262]
+'SE18 1QD': [718586, 718593, 718600, 718604]
+'SE18 3EW': [714850, 725114, 725116, 729901]
+'SE19 1NZ': [714560, 715763, 732099, 733083]
+'SE19 2UH': [715464, 715477, 715482, 715485]
+'SE20 7HG': [718166, 718183, 719564, 719577]
+'SE20 7JH': [710237, 716843, 716852, 716878]
+'SE23 2QS': [741296, 741529, 741534, 741536]
+'SE25 6QT': [733582, 734844, 738268, 738289]
+'SE26 5HZ': [714008, 714009, 733298, 733299]
+'SE26 5PW': [731239, 731241, 731242, 733260]
+'SE26 5QQ': [720861, 720869, 730447, 730454]
+'SE2 9QL': [715690, 718407, 721896, 729353]
+'SE4 1NT': [719292, 730335, 730341, 730343]
+'SE4 1YD': [729810, 731168, 731172, 731175]
+'SE4 1YR': [731297, 731301, 731528, 731532]
+'SE4 2NL': [728939, 728941, 730094, 730097]
+'SE5 8NZ': [717335, 741299, 741376, 741537]
+'SE6 2EU': [714025, 716406, 716874, 717295]
+'SE6 2NZ': [710183, 716389, 716396, 716409]
+'SE6 4XB': [710900, 724334, 724520, 724521]
+'SE8 3EE': [719086, 725602, 729420, 732040]
+'SE8 5AX': [728035, 728163, 728283, 728391]
+'SE9 1LG': [722613, 727149, 727515, 730732]
+'SE9 1PB': [717742, 720984, 721174, 728879]
+'SE9 1SP': [727197, 727917, 727924, 728051]
+'SE9 6RB': [714975, 717866, 719261, 729110]
+'SE9 6RE': [720340, 720953, 721526, 722061]
+'SE9 6RQ': [714442, 715679, 721072, 721621]
+'SE9 6UG': [721432, 721707, 721973, 722256]
+'SO14 0DR': [714023, 733453, 738240, 738241]
+'SO14 0EF': [716656, 731924, 735209, 735210]
+'SO14 0EH': [720256, 738260, 738316, 738321]
+'SO14 0LR': [741389, 741419, 741443, 741530]
+'SO14 3GB': [716011, 716502, 716970, 717404]
+'SO15 3BN': [724725, 724733, 724736, 724738]
+'SO15 3DR': [721231, 721763, 722933, 723479]
+'SO15 3FR': [733585, 734846, 735632, 736253]
+'SO17 2GH': [724494, 724528, 724890, 724920]
+'SO32 3AS': [710745, 710969, 711182, 711330]
+'SW2 5AP': [741406, 741440, 741462, 741482]
+'SW2 5RH': [731489, 732126, 732241, 732341]
+'SW2 5UG': [720209, 720221, 720227, 720234]
+'SW4 6TH': [719129, 725648, 729471, 732086]
+'SW9 0AR': [733785, 733808, 735047, 735080]
+'SW9 0RH': [735059, 735061, 735821, 735823]
+'SW9 6AR': [718504, 733773, 735035, 735810]
+'SW9 6AS': [719136, 725655, 727746, 730917]
+'SW9 9DQ': [722575, 723794, 728057, 728065]
+'SW9 9DY': [715489, 716505, 732661, 733484]
+'TN2 3JN': [732540, 733110, 733207, 733283]
+'BN1 3RB': [733367, 733369, 733411, 733414, 733415]
+'BN17 5BA': [712933, 718795, 722485, 725316, 727395]
+'BN18 0RW': [713319, 719162, 722880, 725679, 727770]
+'BN18 0RZ': [714573, 715286, 727771, 730937, 733095]
+'BN2 8GH': [710138, 710698, 710808, 710832, 710849]
+'BN41 1PL': [727004, 727828, 728108, 728336, 728565]
+'BR1 3PZ': [714828, 714844, 714855, 725128, 738273]
+'BR1 5JG': [718145, 718147, 718149, 718150, 718151]
+'BR3 5JD': [710888, 723689, 724129, 724132, 724134]
+'BR6 6FL': [712952, 718824, 722510, 725341, 727420]
+'BR7 6FB': [711627, 711721, 711763, 712059, 712184]
+'CR0 9ET': [715419, 715843, 715908, 716384, 716834]
+'CR2 7EN': [738259, 738300, 738315, 738320, 738325]
+'CT1 1AF': [711010, 713214, 719075, 722785, 727678]
+'CT20 1JZ': [711515, 713211, 722782, 727676, 733018]
+'CT20 1NQ': [713276, 722844, 727735, 730911, 733070]
+'CT4 5BN': [720476, 721089, 721635, 721899, 723611]
+'CT5 1SN': [710135, 727311, 729052, 730544, 731703]
+'CT5 1SQ': [711789, 712082, 712205, 712304, 712399]
+'DA12 1NJ': [741264, 741267, 741270, 741273, 741276]
+'DA12 4DD': [722554, 725387, 727466, 729214, 730681]
+'DA1 5GD': [722434, 725263, 727345, 729096, 730574]
+'DA1 5GN': [709839, 710729, 712849, 718705, 719110]
+'DA1 5NT': [711321, 725225, 727312, 730545, 731704]
+'DA9 9FG': [714498, 716731, 727670, 730860, 733015]
+'DA9 9SY': [711686, 712800, 713376, 714898, 725182]
+'E1 0JW': [715225, 716245, 717204, 718046, 719446]
+'E1 8BS': [726276, 726433, 726596, 726748, 726883]
+'E1W 1NY': [713070, 722641, 725453, 727539, 729282]
+'E2 0BQ': [713002, 713559, 727473, 730690, 732843]
+'E2 6NG': [716277, 717642, 719861, 720196, 725654]
+'GU27 3AJ': [722675, 725485, 727571, 733699, 734963]
+'GU28 0ED': [713198, 715714, 717192, 725574, 732019]
+'GU28 0QX': [727709, 729449, 730896, 732064, 733052]
+'GU29 9EQ': [714324, 716106, 716588, 717481, 717920]
+'GU29 9ER': [714339, 715078, 727475, 730693, 731855]
+'GU29 9ES': [735771, 736392, 737283, 737633, 737919]
+'ME10 4FQ': [709798, 710425, 710746, 710971, 711183]
+'ME10 4NX': [714495, 722774, 727666, 730856, 733013]
+'ME12 2GF': [714353, 722589, 727496, 730712, 732858]
+'ME14 1JH': [741398, 741429, 741452, 741493, 741509]
+'ME17 1GU': [710726, 711164, 711466, 711581, 711692]
+'ME20 7HS': [716538, 719669, 720346, 722067, 723246]
+'ME2 1BG': [713153, 717749, 719020, 722728, 725536]
+'ME2 2GL': [712921, 722471, 727387, 730611, 732765]
+'ME2 4BJ': [713262, 719122, 722828, 725637, 727720]
+'NN3 2BW': [710801, 711026, 711237, 711822, 712113]
+'NW10 8GD': [713189, 722764, 727652, 730846, 732999]
+'NW10 8LR': [712852, 718708, 722405, 725232, 727318]
+'NW10 8RF': [726876, 727115, 727972, 728222, 728444]
+'NW10 8SH': [712923, 716283, 727388, 730613, 732767]
+'PE1 2BD': [715020, 726431, 727212, 729165, 730442]
+'PE1 2EG': [714010, 714011, 714012, 732449, 732480]
+'PE1 5NG': [710232, 716402, 716793, 716816, 716835]
+'PE4 7BA': [718402, 721076, 721363, 721624, 722164]
+'PE4 7EJ': [710229, 715857, 716823, 716831, 716850]
+'PE6 7WH': [713161, 719026, 722737, 725543, 727623]
+'PO10 8FJ': [710765, 710989, 711204, 711805, 712097]
+'PO10 8HQ': [713252, 719113, 722816, 725627, 727711]
+'PO10 8TY': [712860, 718716, 722412, 725240, 727324]
+'PO14 1NL': [713054, 718919, 722621, 725438, 727522]
+'PO1 5QU': [712990, 722552, 727464, 730679, 732834]
+'PO16 7GN': [712983, 718862, 722547, 725378, 727458]
+'PO18 0BY': [714532, 719118, 722820, 730900, 733056]
+'PO18 0EH': [717418, 720009, 721253, 722952, 723239]
+'PO18 0SN': [722716, 725523, 727606, 738362, 738464]
+'PO18 8LB': [718378, 719766, 720446, 720749, 721053]
+'PO18 8RS': [713058, 714376, 718922, 722626, 730742]
+'PO18 8SN': [712834, 713407, 715533, 715991, 718688]
+'PO19 3AL': [714696, 714749, 715300, 715344, 732263]
+'PO19 3AT': [715664, 716665, 718384, 724657, 726913]
+'PO19 3LN': [713519, 719698, 720685, 720990, 721294]
+'PO19 3LY': [713028, 714357, 716617, 718896, 725419]
+'PO19 3NT': [715127, 716164, 718941, 725464, 729292]
+'PO19 6SS': [735598, 735925, 736013, 736229, 736507]
+'PO19 6TE': [714510, 715226, 716249, 716740, 717207]
+'PO19 6UU': [714901, 715965, 717804, 720281, 720909]
+'PO19 6XB': [713243, 719843, 721931, 722811, 725619]
+'PO19 7QH': [715156, 718979, 722686, 725495, 731949]
+'PO19 8BT': [730968, 731256, 731374, 733108, 733204]
+'PO19 8TF': [741399, 741430, 741453, 741474, 741494]
+'PO20 0FL': [710259, 710751, 710975, 711188, 711336]
+'PO20 0RE': [713138, 719002, 722712, 725519, 727602]
+'PO20 0SH': [713785, 732546, 733213, 733289, 733352]
+'PO20 1AB': [713110, 718974, 722683, 725490, 727576]
+'PO20 1PL': [712967, 718843, 722526, 727440, 729190]
+'PO20 1QG': [713154, 719021, 722729, 725537, 727618]
+'PO20 2JB': [720921, 721211, 721493, 721748, 722919]
+'PO20 7JT': [713600, 722623, 727524, 729264, 730738]
+'PO20 8PE': [714345, 720712, 721839, 727485, 732848]
+'PO2 8LW': [716859, 716880, 717258, 717273, 717289]
+'PO3 5XG': [713011, 722572, 727482, 730699, 732847]
+'PO7 5AW': [716473, 717383, 718231, 719623, 720294]
+'RH12 5YF': [726513, 726814, 728032, 728493, 728619]
+'RH1 2AX': [711587, 713452, 718755, 725273, 729106]
+'RH14 0DH': [714242, 718743, 722433, 725262, 729095]
+'RH14 0JT': [713662, 716692, 717572, 730806, 732956]
+'RH14 0QT': [712861, 718717, 722413, 736303, 736799]
+'RH15 8NP': [741078, 741121, 741146, 741178, 741206]
+'RH16 4GL': [732403, 732507, 732586, 733163, 733246]
+'RH20 1NP': [712883, 718742, 722432, 725261, 729348]
+'RH20 1PS': [713244, 719105, 722812, 725620, 729441]
+'RH20 4JX': [713216, 719076, 722786, 725589, 727679]
+'RH2 9EX': [722066, 723245, 723747, 724194, 724590]
+'SE10 0AD': [717864, 720645, 721260, 721785, 723502]
+'SE10 0AH': [711411, 728832, 729715, 729985, 732333]
+'SE10 0AL': [712814, 718670, 722367, 725195, 727284]
+'SE10 9FN': [713102, 714420, 722673, 727570, 732920]
+'SE10 9FS': [723503, 724191, 724399, 735987, 736041]
+'SE10 9PH': [717799, 721480, 725180, 729012, 731664]
+'SE11 4TU': [710672, 741329, 741335, 741337, 741339]
+'SE14 5BZ': [712947, 718814, 722503, 725336, 727412]
+'SE14 5LA': [726833, 728732, 728776, 730337, 730339]
+'SE14 5TP': [723904, 723910, 724563, 729991, 730093]
+'SE15 4AN': [716514, 717754, 718550, 718563, 719654]
+'SE15 6LZ': [712989, 722551, 727463, 730678, 732833]
+'SE15 6QY': [714290, 715587, 718806, 725326, 729159]
+'SE18 2QG': [741401, 741434, 741455, 741477, 741496]
+'SE18 4HF': [710035, 713592, 714367, 715640, 732870]
+'SE18 7PZ': [710235, 716358, 716863, 717677, 717707]
+'SE18 7SX': [733777, 735040, 735813, 736429, 736907]
+'SE19 3SW': [711391, 729604, 729607, 729609, 729611]
+'SE20 8DS': [741371, 741372, 741373, 741374, 741387]
+'SE20 8SS': [712965, 718841, 722524, 725358, 727437]
+'SE23 1JZ': [728632, 728634, 729805, 729807, 741297]
+'SE23 1QY': [711060, 711061, 711062, 711063, 726052]
+'SE23 2UD': [716419, 716423, 727215, 727221, 727230]
+'SE25 4TJ': [722203, 723092, 723368, 723637, 723868]
+'SE26 4AQ': [719881, 719888, 719894, 719900, 719907]
+'SE26 4PF': [716895, 717575, 717746, 718583, 720770]
+'SE26 5JF': [718578, 718590, 724569, 726683, 726689]
+'SE28 0BF': [710933, 724144, 724540, 725881, 726220]
+'SE28 8DF': [713305, 716287, 722868, 726828, 733087]
+'SE3 7TG': [711679, 732624, 732629, 732630, 732631]
+'SE4 1YB': [719206, 724921, 724923, 724925, 724926]
+'SE4 2DT': [716828, 717261, 717262, 733334, 733336]
+'SE4 2NJ': [718558, 718569, 728940, 728942, 728944]
+'SE5 7RR': [714214, 714928, 715535, 715994, 716488]
+'SE6 2ET': [716792, 716814, 717264, 717671, 718104]
+'SE6 4HU': [741404, 741437, 741459, 741480, 741498]
+'SE8 4JL': [716621, 721579, 722121, 727505, 741433]
+'SE8 5BD': [728282, 728929, 729683, 729889, 730076]
+'SE8 5LZ': [718758, 722450, 725276, 727363, 729109]
+'SE9 4JD': [711145, 711176, 711588, 724974, 728551]
+'SE9 6NN': [718073, 719474, 720194, 720820, 727898]
+'SE9 6SR': [718121, 719488, 719526, 719554, 719878]
+'SE9 6UE': [723898, 724112, 724326, 724332, 724513]
+'SO14 0AP': [713872, 714072, 714074, 738251, 738298]
+'SO14 0ES': [729870, 730405, 731220, 731453, 732589]
+'SO14 0PA': [741170, 741171, 741172, 741173, 741174]
+'SO15 0HT': [741060, 741102, 741125, 741150, 741182]
+'SO15 1JN': [710961, 713431, 718733, 729081, 731728]
+'SO15 5AX': [713539, 715054, 716102, 717060, 717918]
+'SO16 6TA': [715978, 716467, 716937, 717380, 717815]
+'SO17 2HP': [712697, 738266, 738302, 738322, 738326]
+'SO17 3SE': [728719, 728720, 728722, 728830, 728831]
+'SO18 4UF': [712891, 718750, 722443, 725267, 727356]
+'SO19 5LW': [713130, 718996, 722704, 725509, 727593]
+'SO23 7GN': [709784, 710413, 710727, 710955, 711166]
+'SO31 7ER': [725878, 726219, 726371, 726379, 726530]
+'SO31 7FL': [720842, 720845, 720846, 720847, 720848]
+'SW4 6RT': [713065, 718926, 727530, 729271, 731898]
+'TN11 0BF': [710472, 713271, 715258, 717230, 722838]
+'TN4 0BE': [720008, 724584, 724969, 725918, 726253]
+'TN4 9US': [717891, 719283, 720032, 720668, 721277]
+'BN17 7SJ': [711807, 712099, 712221, 712319, 712417, 712500]
+'BN18 0BZ': [714302, 718826, 725344, 729176, 730646, 732802]
+'BN2 5LL': [713197, 719060, 722770, 725573, 727661, 729400]
+'BN2 5RS': [733722, 734988, 735768, 736389, 736875, 737280]
+'BN2 9NE': [717348, 717781, 718201, 719189, 719596, 719951]
+'BN2 9WP': [710984, 713053, 718918, 722620, 727521, 729262]
+'BN3 1WB': [718764, 722461, 725283, 727372, 729116, 730595]
+'BN41 1AR': [735356, 735412, 735460, 735504, 735547, 735591]
+'BN41 1GQ': [711520, 713746, 714535, 715251, 732072, 733058]
+'BR2 0LN': [719560, 719576, 719580, 719582, 722276, 722290]
+'BR2 0NU': [710473, 713275, 722842, 725644, 727732, 729468]
+'BR3 4PL': [710009, 714820, 714836, 714857, 714859, 714860]
+'BR5 2FB': [711769, 712065, 712127, 712154, 712189, 712288]
+'BR5 3QE': [740999, 741015, 741025, 741030, 741034, 741040]
+'BR5 3SL': [712910, 714984, 717002, 720018, 720652, 729120]
+'CR0 0SL': [712909, 718769, 722463, 725289, 727375, 729119]
+'CR0 8JL': [729824, 729898, 729902, 729906, 731188, 731545]
+'CT5 1SH': [714987, 716051, 717006, 717877, 719271, 720021]
+'DA11 8FD': [738371, 738387, 738461, 738611, 738697, 738741]
+'DA12 2JA': [710622, 712772, 720271, 722330, 727255, 730481]
+'DA1 2EP': [720863, 720870, 720876, 720879, 720881, 720883]
+'DA1 2FE': [711190, 713521, 729182, 730654, 731820, 732809]
+'DA14 6NU': [713115, 718983, 722690, 725498, 727582, 729327]
+'DA1 5EF': [709915, 709922, 712679, 712680, 712681, 738229]
+'DA1 5JX': [713605, 714380, 729270, 730745, 731897, 732879]
+'DA1 5WR': [710401, 710717, 710945, 711154, 711313, 711455]
+'DA17 5LL': [719599, 720270, 720900, 721468, 722010, 723198]
+'DA8 2PT': [710597, 710619, 720552, 720559, 720839, 720843]
+'E1 1BF': [714382, 719515, 722632, 727531, 730746, 732880]
+'E1 2LA': [719795, 720472, 721084, 721631, 722174, 723333]
+'E1 2LP': [724433, 725758, 733759, 735024, 735802, 736421]
+'E1 2ND': [716936, 731110, 731247, 731361, 732233, 732439]
+'E14 7PD': [709792, 710419, 710738, 710965, 713757, 732084]
+'E1 5BF': [716624, 717511, 718354, 719737, 720415, 721025]
+'E1 5LD': [722583, 725409, 727492, 729234, 730708, 731865]
+'E1W 1NS': [713316, 719160, 722877, 725678, 729494, 730935]
+'E1W 2PT': [713259, 714536, 722825, 727718, 730903, 733059]
+'E2 0BW': [713247, 713735, 716261, 717219, 727705, 730893]
+'E2 6GT': [714726, 714772, 714809, 715326, 715360, 715392]
+'E2 6LH': [713269, 714541, 722836, 727726, 729464, 733065]
+'E2 9BA': [713144, 715461, 716205, 717163, 719011, 720141]
+'GU27 3SX': [716768, 717234, 717639, 718072, 734200, 734406]
+'GU27 3TA': [713097, 718959, 722668, 725479, 727563, 729310]
+'GU27 3TB': [713090, 718951, 722660, 725472, 727557, 729303]
+'GU28 0BT': [716570, 717037, 719300, 719691, 720045, 731813]
+'GU28 0EY': [715757, 716279, 717237, 717644, 718480, 720822]
+'GU28 9AB': [733681, 734943, 736350, 736842, 737242, 737883]
+'GU28 9JA': [716691, 717571, 718401, 719790, 722163, 723327]
+'GU29 9AH': [725293, 727380, 729124, 733713, 734979, 735761]
+'GU29 9ET': [712805, 714186, 714903, 718661, 729019, 731672]
+'GU29 9SF': [713745, 714534, 722822, 723380, 727716, 732070]
+'GU29 9TE': [713131, 725510, 727594, 729338, 730801, 737636]
+'HA1 4GX': [739112, 739118, 739161, 739188, 739193, 739211]
+'ME10 3FD': [711085, 711101, 711120, 711146, 711253, 711269]
+'ME10 4FU': [710405, 710949, 712811, 722364, 727280, 730509]
+'ME10 4FW': [709813, 710437, 710762, 710981, 711201, 711344]
+'ME10 4FX': [709780, 710406, 710723, 710950, 711161, 711317]
+'ME10 4GB': [709834, 710462, 710790, 711013, 711227, 711368]
+'ME10 4GE': [712955, 718830, 722514, 725346, 727425, 729178]
+'ME10 4GF': [709794, 710421, 710743, 710968, 711181, 711329]
+'ME10 4NQ': [709846, 710117, 710222, 710800, 711236, 711523]
+'ME10 4QQ': [711821, 712112, 712235, 712333, 712430, 712516]
+'ME10 4RN': [711740, 711748, 732499, 732580, 733153, 733311]
+'ME12 2GA': [722100, 723277, 723781, 724225, 724624, 724998]
+'ME12 2GE': [738369, 738385, 738402, 738422, 738440, 738739]
+'ME13 8FG': [713736, 715240, 719107, 725623, 729444, 732062]
+'ME1 3WR': [711823, 712114, 712236, 712334, 712431, 712517]
+'ME14 5DG': [741308, 741310, 741312, 741319, 741320, 741322]
+'ME15 8JF': [733747, 735013, 735793, 736413, 736897, 737303]
+'ME15 8JG': [712322, 733710, 734975, 735758, 736865, 737266]
+'ME15 8WN': [709880, 710032, 710436, 710980, 711342, 711603]
+'ME15 8WU': [710418, 710737, 710964, 711175, 711327, 738359]
+'ME16 8AU': [741066, 741106, 741129, 741154, 741186, 741212]
+'ME16 8LL': [711787, 712081, 712204, 712303, 712396, 712483]
+'ME16 9FE': [711766, 712062, 712187, 712286, 712381, 712464]
+'ME19 4TH': [709779, 709940, 710721, 711159, 711459, 711685]
+'ME20 7GU': [709948, 710096, 710739, 711177, 711474, 711697]
+'ME2 2BN': [709776, 710718, 710946, 711155, 718634, 728992]
+'ME3 9EJ': [715201, 715707, 719805, 720154, 720485, 720783]
+'ME9 8WN': [711880, 711934, 711975, 712407, 712556, 712656]
+'MK10 9SQ': [715940, 716900, 717774, 723924, 724355, 724742]
+'MK10 9SX': [733671, 734932, 735721, 736339, 736831, 737229]
+'N1 7DG': [713673, 714460, 730818, 731985, 732971, 737270]
+'N7 8AX': [713802, 713883, 714017, 714083, 714599, 733375]
+'N7 8JB': [713069, 714388, 725451, 729279, 731907, 732886]
+'NN3 6RQ': [719980, 720298, 720610, 720925, 726236, 726560]
+'NW10 2TS': [712005, 712021, 734773, 735101, 735166, 735225]
+'NW10 8LF': [712754, 718613, 722311, 730463, 731628, 738605]
+'NW6 7YL': [738913, 738953, 738994, 739017, 739046, 739070]
+'NW6 7YN': [738791, 738912, 738993, 739016, 739045, 739069]
+'PE28 4WT': [710411, 711320, 712819, 722374, 725200, 727288]
+'PE2 8LR': [710670, 721431, 721435, 721439, 721696, 721701]
+'PO10 8AS': [712449, 712458, 737099, 737366, 737408, 737446]
+'PO10 8HW': [713583, 714360, 715099, 725425, 730723, 731880]
+'PO15 6JQ': [713297, 719144, 722862, 725665, 727757, 729484]
+'PO1 5BN': [713428, 714947, 718730, 725251, 729078, 731724]
+'PO1 5BW': [728091, 728322, 728544, 728759, 729525, 729728]
+'PO18 0EP': [713140, 719005, 722715, 725522, 727605, 729347]
+'PO18 0FL': [733648, 734909, 735694, 736314, 736806, 737206]
+'PO18 8QR': [717183, 719046, 725560, 729385, 732003, 732991]
+'PO18 8QS': [713585, 714362, 716135, 725427, 729249, 731882]
+'PO19 3AA': [721909, 723623, 726805, 727058, 727885, 729581]
+'PO19 3AP': [714613, 731230, 731345, 731584, 732417, 732596]
+'PO19 3DB': [731286, 731521, 732157, 732265, 732366, 732469]
+'PO19 3FG': [709821, 710445, 710769, 710991, 711208, 711351]
+'PO19 3JQ': [715010, 718799, 727400, 729151, 730627, 731795]
+'PO19 3LD': [717367, 717802, 718215, 720279, 725184, 731666]
+'PO19 3LE': [713907, 713968, 714037, 733324, 733394, 733468]
+'PO19 3NQ': [727373, 730596, 734012, 734260, 734473, 738103]
+'PO19 6UL': [712352, 736073, 736145, 736214, 736490, 736609]
+'PO19 6XD': [725621, 727704, 729442, 733733, 734998, 735780]
+'PO19 6XJ': [717713, 717723, 718131, 718156, 718497, 718522]
+'PO20 0BF': [710390, 710506, 711022, 711233, 711371, 711518]
+'PO20 0SF': [734133, 736808, 738864, 738890, 738897, 738991]
+'PO20 0SQ': [717436, 717878, 718285, 721533, 730604, 731766]
+'PO20 1AS': [714319, 715198, 717056, 717477, 718323, 719426]
+'PO20 1AU': [713104, 722676, 727572, 730776, 731940, 732921]
+'PO20 2AU': [738793, 738914, 738954, 738996, 739018, 739047]
+'PO20 2HU': [713862, 713998, 715321, 715356, 715390, 715418]
+'PO20 2JQ': [709974, 710050, 710168, 711223, 711363, 711512]
+'PO20 7ET': [713927, 732297, 732450, 732498, 733152, 733202]
+'PO20 7EZ': [713421, 727325, 729068, 730556, 731717, 732709]
+'PO20 7FA': [710647, 710689, 710709, 710821, 711016, 711230]
+'PO20 8PB': [716686, 717565, 717998, 725507, 730798, 732948]
+'PO21 5BN': [713171, 730827, 731994, 732980, 735763, 736871]
+'RH12 5YH': [710046, 714461, 716703, 722727, 729361, 731986]
+'RH14 0AW': [713096, 718958, 722667, 725478, 727562, 729308]
+'RH14 0TT': [718893, 722591, 727498, 730714, 731871, 732860]
+'RH16 4LD': [713659, 715174, 721362, 721889, 723056, 731969]
+'RH19 3RT': [727942, 728071, 728189, 728303, 728413, 728520]
+'SE10 9EN': [713759, 715264, 716770, 718479, 722848, 727740]
+'SE10 9LB': [712472, 733607, 733828, 734111, 735069, 736439]
+'SE13 5RL': [728179, 728182, 728183, 728184, 728406, 728408]
+'SE1 3GH': [735486, 735530, 735574, 737132, 737333, 737357]
+'SE14 5BT': [710072, 714673, 714721, 714769, 714807, 715323]
+'SE14 5FH': [709828, 710455, 710779, 711002, 711220, 711360]
+'SE14 5LU': [715334, 715347, 717277, 717283, 717704, 717706]
+'SE14 5NT': [721285, 721459, 726053, 726142, 726215, 728067]
+'SE14 5NW': [741045, 741046, 741047, 741048, 741049, 741050]
+'SE14 6EN': [717792, 719195, 719957, 720590, 721201, 721735]
+'SE14 6PA': [713405, 714921, 715990, 718687, 725215, 730532]
+'SE14 6QL': [729538, 730971, 731375, 731497, 732134, 732347]
+'SE1 4JU': [741059, 741101, 741124, 741149, 741181, 741209]
+'SE15 2BG': [714619, 714621, 714623, 714625, 714627, 714629]
+'SE15 2HY': [711572, 711651, 732225, 732605, 732609, 733185]
+'SE15 3DA': [717743, 717757, 729698, 729701, 731354, 731355]
+'SE15 5JB': [713619, 715130, 718944, 725467, 729296, 731922]
+'SE15 5NY': [711047, 711079, 725872, 725874, 726212, 726216]
+'SE1 5BN': [741163, 741287, 741288, 741289, 741290, 741291]
+'SE16 3SS': [711825, 712238, 733775, 735037, 735038, 736425]
+'SE16 7PP': [712842, 718695, 722396, 725222, 727309, 729048]
+'SE17 2LN': [741061, 741103, 741126, 741151, 741183, 741210]
+'SE18 2PF': [711377, 713292, 719141, 722859, 725661, 727754]
+'SE18 3QH': [714049, 714051, 714682, 714683, 715425, 732428]
+'SE18 3SQ': [741407, 741441, 741463, 741483, 741500, 741512]
+'SE18 4LP': [712338, 737321, 741079, 741118, 741184, 741460]
+'SE18 5HT': [712116, 733782, 737317, 741458, 741479, 741497]
+'SE19 2JB': [710185, 716412, 716420, 716425, 719566, 719572]
+'SE20 7HB': [711343, 713037, 718905, 722605, 725429, 727506]
+'SE20 7UQ': [710714, 722264, 722270, 722271, 725117, 725119]
+'SE20 8AU': [733180, 733183, 733187, 733189, 733190, 733191]
+'SE20 8BZ': [733479, 733489, 733497, 733800, 735065, 736437]
+'SE20 8HW': [741309, 741311, 741313, 741314, 741315, 741316]
+'SE20 8TJ': [710567, 720214, 720215, 720216, 720217, 720218]
+'SE23 2UR': [713338, 716427, 716893, 717768, 718726, 732715]
+'SE25 6XH': [723687, 724529, 724533, 724534, 733600, 738354]
+'SE26 4PB': [714841, 715472, 718165, 718175, 718765, 718766]
+'SE26 4QG': [715552, 715927, 718562, 724336, 724346, 724730]
+'SE26 5RX': [728332, 728560, 729535, 730290, 730970, 731131]
+'SE3 8EQ': [713062, 718924, 722629, 725442, 727529, 729267]
+'SE4 1TF': [713836, 713838, 714073, 714076, 714077, 733322]
+'SE5 7RY': [715800, 715840, 715867, 715893, 716298, 716321]
+'SE5 8QJ': [741353, 741354, 741355, 741356, 741357, 741358]
+'SE6 1RQ': [733564, 734826, 735616, 736237, 736742, 737155]
+'SE7 7AA': [733813, 735084, 735844, 741169, 741224, 741501]
+'SE7 8ET': [711285, 728508, 731097, 731101, 733259, 733263]
+'SE8 3LG': [739236, 739237, 739238, 739334, 739335, 739336]
+'SE9 1JY': [729507, 731106, 731244, 731477, 732112, 733341]
+'SE9 1LP': [714238, 718265, 719652, 720324, 723234, 732728]
+'SE9 6ST': [719893, 720213, 720229, 720238, 720548, 721158]
+'SO14 0LT': [712533, 733106, 736547, 737501, 737968, 737969]
+'SO14 1AX': [733783, 735053, 735828, 736442, 736918, 737329]
+'SO15 5EG': [733589, 734851, 735637, 736257, 736759, 737165]
+'SO16 9GL': [717394, 717738, 717751, 717763, 717765, 717767]
+'SO18 1BX': [733615, 734874, 735658, 736278, 736774, 737178]
+'SO31 7LA': [713231, 719093, 722797, 725608, 727693, 729428]
+'SO31 8HU': [716131, 717094, 717948, 719347, 720203, 720718]
+'SW4 6QT': [712773, 718635, 725156, 728993, 730482, 732650]
+'SW8 2PD': [735613, 735615, 736739, 736741, 737518, 737520]
+'SW9 0AB': [713046, 725123, 726051, 733762, 733799, 735028]
+'SW9 0SN': [714861, 733764, 733769, 735031, 735033, 735808]
+'SW9 9HD': [712928, 713485, 714276, 715001, 731784, 732773]
+'SW9 9HL': [733806, 735077, 735838, 736444, 736919, 737327]
+'TN16 1FD': [711802, 712094, 712216, 712314, 712412, 712495]
+'TN37 7FY': [733758, 735023, 735801, 736420, 736902, 737309]
+'BN10 8FA': [711437, 711448, 711540, 711547, 711556, 711562, 711571]
+'BN17 5BH': [723427, 723432, 723439, 723903, 723912, 724338, 724347]
+'BN17 5QS': [710787, 713194, 719057, 727657, 729396, 730850, 732014]
+'BN2 1HN': [712708, 720943, 721516, 738292, 738311, 738318, 738323]
+'BN6 9YL': [709890, 710211, 710309, 711213, 711354, 711500, 711616]
+'CR0 2FG': [733621, 734880, 735665, 736285, 736778, 737182, 737547]
+'CT1 3BE': [741076, 741116, 741141, 741166, 741197, 741222, 741239]
+'CT20 2RA': [741392, 741422, 741446, 741467, 741488, 741505, 741516]
+'CT20 9GP': [741018, 741019, 741020, 741021, 741022, 741023, 741024]
+'CT5 1SS': [717483, 718328, 719712, 722545, 727454, 730674, 732827]
+'DA12 2JQ': [741266, 741269, 741272, 741275, 741278, 741280, 741282]
+'DA8 2PQ': [711415, 729542, 729742, 730127, 730293, 730975, 731134]
+'E1 0DS': [712946, 718812, 722502, 725334, 727411, 729166, 730637]
+'E1 2NW': [723481, 723727, 724175, 724574, 724771, 724959, 725720]
+'E1 5JQ': [713810, 714713, 714764, 714801, 715315, 715355, 715387]
+'E1W 1NU': [713227, 719089, 722794, 725606, 727690, 729423, 730879]
+'E1W 3ER': [727081, 727195, 727196, 727199, 727908, 727916, 727922]
+'E2 6NQ': [714161, 718627, 719594, 720268, 720584, 720897, 731641]
+'E2 7AJ': [717959, 719363, 724453, 724840, 726776, 728130, 729266]
+'E2 7DB': [729890, 730419, 731087, 731350, 731589, 732215, 732319]
+'GU27 3JL': [716028, 716983, 717417, 718270, 719253, 720332, 721252]
+'GU28 0LN': [733680, 734942, 735731, 736349, 736841, 737241, 737882]
+'GU28 0LW': [733701, 734965, 735749, 736368, 736856, 737257, 737901]
+'GU29 0DN': [713456, 714977, 715563, 722453, 730589, 731749, 732744]
+'HA1 4WN': [739111, 739117, 739122, 739124, 739187, 739190, 739213]
+'ME10 3FA': [709954, 710100, 710200, 710299, 710379, 710522, 710580]
+'ME10 4EH': [717522, 718364, 719367, 719748, 720099, 720427, 721037]
+'ME13 8FF': [717698, 717717, 718086, 718103, 718117, 718136, 718153]
+'ME1 3YL': [709905, 709980, 710057, 710113, 711519, 711633, 711726]
+'ME15 6NG': [709825, 710453, 710776, 710998, 711217, 711358, 711506]
+'ME4 6BX': [710794, 711019, 711725, 727703, 729440, 730890, 732059]
+'MK10 9SR': [712765, 714873, 715946, 719595, 720269, 720898, 722324]
+'N7 8BB': [712896, 714250, 715559, 729103, 730584, 731744, 732737]
+'N7 9EE': [714960, 719249, 720634, 723498, 723964, 725260, 729094]
+'NW10 8GF': [712855, 714219, 715536, 722406, 727320, 730552, 732704]
+'NW10 8RQ': [713809, 732581, 733156, 733239, 733312, 733383, 733455]
+'PE28 4WH': [711198, 713030, 718897, 722596, 725420, 729244, 730718]
+'PE2 8HF': [710882, 720935, 722938, 723485, 724389, 724774, 725723]
+'PE4 7EW': [711401, 713893, 713929, 713991, 714640, 728874, 729541]
+'PO10 8BQ': [713296, 719143, 725664, 736890, 737297, 737642, 737932]
+'PO10 8FP': [709892, 710996, 711215, 711355, 711502, 711617, 711713]
+'PO10 8LZ': [713601, 716148, 718921, 721857, 723576, 725441, 731896]
+'PO10 8SY': [716025, 716980, 717856, 719250, 720007, 720635, 721249]
+'PO15 7NN': [728540, 728657, 728755, 728860, 729724, 729934, 730115]
+'PO15 7NZ': [714394, 725457, 727545, 729288, 730756, 731916, 732892]
+'PO18 0BS': [721920, 724892, 726183, 726507, 726810, 729411, 732030]
+'PO18 8FP': [710202, 710262, 710301, 710493, 710523, 710549, 710581]
+'PO18 8HJ': [713612, 716156, 717964, 727537, 729280, 730751, 731909]
+'PO18 9LP': [712958, 713522, 714308, 717044, 718312, 719304, 722520]
+'PO19 3AS': [737347, 737673, 737704, 737733, 737763, 737789, 737962]
+'PO19 3FD': [709902, 709978, 710055, 712511, 712575, 712623, 712671]
+'PO19 6FH': [713831, 713914, 713975, 714045, 714106, 733402, 733475]
+'PO19 6SZ': [737478, 737509, 737720, 737749, 737780, 737974, 737999]
+'PO19 6UT': [721742, 722019, 722912, 723938, 724368, 724754, 725889]
+'PO19 6UZ': [716254, 719098, 727698, 729433, 730883, 732048, 733040]
+'PO19 6XH': [719501, 719518, 719535, 719547, 719558, 719890, 719910]
+'PO19 7NA': [713840, 732435, 733134, 733270, 733301, 733370, 733417]
+'PO19 8AZ': [713464, 714983, 716044, 717001, 725288, 729118, 731757]
+'PO19 8BP': [714995, 717885, 718781, 719277, 720659, 721796, 729135]
+'PO19 8BZ': [716007, 716964, 717844, 721234, 725244, 729071, 731720]
+'PO20 0BQ': [709877, 710758, 710977, 711193, 711338, 711486, 711703]
+'PO20 0NP': [726184, 727889, 728155, 728816, 736715, 737038, 737085]
+'PO20 2DL': [713538, 714321, 717059, 719318, 725372, 727448, 731838]
+'PO20 8DS': [727555, 729301, 731926, 733691, 734954, 735741, 736361]
+'PO20 8PD': [718396, 721070, 724668, 725049, 725988, 726640, 726920]
+'PO22 9FA': [713005, 718879, 722565, 725397, 727474, 729220, 730692]
+'PO3 6AA': [719475, 719858, 720195, 720528, 720821, 721142, 721683]
+'PO6 1QR': [722009, 723197, 723703, 724143, 724539, 724931, 725880]
+'RH11 8RT': [712845, 718699, 722399, 725227, 727313, 729054, 730546]
+'RH13 0BG': [711819, 712110, 712232, 712329, 712428, 712513, 712577]
+'SE10 9LE': [736079, 736117, 736150, 736183, 736218, 736494, 736613]
+'SE14 6DY': [715081, 716120, 717081, 717936, 725401, 729224, 741295]
+'SE15 2DW': [710890, 711452, 724123, 730446, 730453, 730457, 741334]
+'SE15 2JE': [711573, 731614, 731621, 731623, 733494, 733498, 733500]
+'SE15 6EY': [713595, 715108, 716145, 718914, 725434, 729258, 731890]
+'SE15 6RA': [713127, 714440, 718993, 722700, 727589, 730796, 732945]
+'SE16 3ET': [712859, 722410, 725238, 727322, 729067, 730554, 731715]
+'SE16 3SL': [712102, 730248, 730410, 731078, 731225, 731456, 733707]
+'SE16 4QJ': [721262, 721528, 721787, 722064, 722959, 723242, 723504]
+'SE19 2RQ': [710179, 716328, 716330, 716331, 716332, 716333, 716334]
+'SE20 7BW': [715475, 715481, 715920, 715933, 731607, 731615, 731622]
+'SE20 7UL': [711660, 711667, 732374, 732375, 732376, 732463, 732483]
+'SE27 0NT': [741379, 741400, 741431, 741454, 741475, 741495, 741510]
+'SE28 0BU': [726643, 726923, 727162, 728013, 728260, 728477, 728698]
+'SE3 7SD': [710010, 714827, 714854, 714858, 728959, 728967, 728970]
+'SE4 1PE': [710240, 716885, 716892, 723440, 723905, 723914, 723918]
+'SE4 1TE': [728306, 728405, 728409, 728410, 731536, 732563, 732565]
+'SE4 2BA': [721712, 722262, 722268, 723426, 723431, 730092, 730096]
+'SE4 2LT': [733719, 734984, 735765, 736384, 736873, 737275, 737626]
+'SE8 3AF': [712766, 713354, 714875, 718630, 728988, 731644, 732643]
+'SE8 3AQ': [720362, 723257, 724205, 725938, 726879, 727119, 728227]
+'SE9 1EL': [713931, 713947, 732373, 732561, 733109, 733131, 733282]
+'SE9 1LF': [716142, 720088, 720728, 721852, 725777, 726464, 728127]
+'SE9 1LH': [721593, 723811, 725032, 726629, 726907, 728002, 728254]
+'SE9 1LL': [714088, 714604, 715313, 715352, 715385, 732579, 733452]
+'SE9 1SL': [709851, 710286, 720853, 722902, 725149, 728987, 735150]
+'SO14 0BW': [714416, 717547, 719770, 720451, 721607, 722147, 723821]
+'SO14 0LP': [728437, 728549, 729839, 737014, 737015, 737149, 737151]
+'SO19 8SR': [741084, 741088, 741091, 741093, 741095, 741240, 741262]
+'SO31 8HS': [712786, 718649, 722343, 725170, 727262, 729004, 730490]
+'SW4 6QR': [714907, 718667, 725192, 729025, 730510, 731725, 732673]
+'SW9 6BA': [715808, 715812, 733765, 733766, 733767, 733770, 735807]
+'TN16 3NQ': [741073, 741112, 741136, 741160, 741192, 741217, 741234]
+'TN25 5EH': [712776, 712995, 718637, 718872, 722333, 722558, 725159]
+'BN15 9NY': [713552, 715068, 716115, 717072, 718869, 725388, 729215, 731848]
+'BN18 0SZ': [713678, 715190, 719030, 725547, 727626, 729368, 730822, 731989]
+'BN2 1WH': [713122, 718989, 722696, 725503, 727586, 729332, 730792, 731957]
+'BN2 9WQ': [710463, 713234, 722801, 725611, 727696, 729431, 730882, 732045]
+'BN3 7RJ': [711752, 711753, 711754, 711755, 711756, 711757, 711758, 711759]
+'BN3 8BU': [713811, 713855, 713894, 713932, 713960, 713993, 714026, 714060]
+'BN41 2XY': [740249, 740503, 740670, 740788, 740842, 740882, 740920, 740948]
+'BN43 6EU': [713137, 713664, 719001, 722709, 725518, 727599, 729345, 731972]
+'BN5 9SX': [713238, 719099, 722804, 725614, 727699, 729434, 730884, 732049]
+'BN6 9GG': [709805, 709955, 710101, 710201, 710754, 711191, 711482, 711701]
+'BN6 9XZ': [711123, 711546, 711554, 711561, 711570, 711648, 711656, 711662]
+'BR1 3AD': [711746, 711984, 733335, 733337, 733338, 733409, 733412, 733413]
+'BR1 3BF': [722947, 723235, 723495, 723737, 724183, 724395, 724583, 724780]
+'BR1 4AA': [711180, 713471, 718774, 722468, 725295, 729126, 731764, 732758]
+'BR5 4GX': [713282, 719132, 722850, 725651, 727742, 729473, 730914, 732088]
+'CR0 2FF': [738785, 738946, 738995, 739009, 739038, 739061, 739083, 739094]
+'CR2 6LA': [710086, 715466, 715478, 715483, 715486, 715487, 715488, 741300]
+'CR2 7AL': [730456, 730458, 733809, 735081, 735840, 736446, 736921, 737330]
+'CR5 3NU': [710062, 713754, 716274, 717231, 718070, 719472, 720191, 720816]
+'CT5 1TG': [709850, 710011, 710131, 710241, 710335, 710479, 711312, 711575]
+'CT5 1TJ': [709847, 710474, 710802, 711027, 711238, 711376, 711524, 711639]
+'DA1 1UN': [709809, 710435, 710759, 710978, 711339, 711487, 711600, 727468]
+'DA1 2BF': [741070, 741109, 741133, 741157, 741189, 741214, 741231, 741247]
+'DA14 5BZ': [741390, 741439, 741444, 741465, 741486, 741503, 741514, 741522]
+'DA14 6NS': [729272, 733685, 734947, 735735, 736354, 736845, 737602, 737887]
+'DA2 6LS': [714298, 715592, 718302, 720369, 720977, 722506, 727415, 732795]
+'DA2 6PL': [719317, 719708, 720060, 720387, 720695, 720998, 721303, 721557]
+'DA6 8BL': [711156, 711314, 711456, 712775, 718636, 722332, 725158, 731649]
+'DA6 8BQ': [741391, 741421, 741445, 741466, 741487, 741504, 741515, 741523]
+'DA8 2PW': [710231, 716833, 716866, 717251, 717265, 717279, 717291, 717304]
+'DA9 9FJ': [720068, 720704, 721311, 721833, 723006, 723552, 724011, 724439]
+'E1 2NR': [713232, 719095, 722799, 725609, 727694, 729429, 730880, 732043]
+'E1 5ED': [713253, 714530, 715743, 716758, 722817, 727712, 730898, 733054]
+'E1 5EL': [721410, 721935, 723099, 723646, 724094, 724900, 725830, 726516]
+'E2 6PU': [715302, 715345, 715375, 715410, 715433, 715780, 715805, 715846]
+'E2 7AZ': [713472, 714988, 715459, 716541, 725296, 730605, 731767, 732759]
+'GU27 3SR': [733636, 734894, 735681, 736300, 736795, 737194, 737559, 737842]
+'GU28 0HT': [733640, 733843, 734125, 734896, 736798, 737562, 737845, 738094]
+'GU28 0HU': [713647, 714433, 715673, 717559, 717994, 730790, 731956, 734967]
+'GU28 0NR': [715031, 717038, 718829, 719692, 731814, 732805, 734787, 735114]
+'GU29 0AA': [712850, 713415, 718706, 722404, 727317, 729060, 730550, 731710]
+'GU29 0DW': [712794, 714178, 714893, 729008, 731661, 732659, 736291, 736785]
+'GU29 0JX': [713542, 715057, 722544, 727453, 729205, 730673, 731840, 732825]
+'GU29 9EJ': [720301, 720612, 721220, 724565, 724763, 725901, 726064, 726238]
+'GU33 7QW': [713023, 713575, 715632, 718890, 725413, 729237, 731868, 732857]
+'GU6 7FW': [709988, 710119, 710223, 710595, 710634, 710669, 711525, 711730]
+'HA0 2NW': [738379, 738390, 738396, 738415, 738662, 738700, 738718, 738743]
+'ME10 4FL': [711804, 712096, 712218, 712316, 712414, 712497, 712563, 712612]
+'ME10 4GY': [713317, 714572, 715771, 716787, 722878, 727768, 730936, 733094]
+'ME1 1FH': [712317, 733698, 734962, 735747, 736854, 737256, 737613, 737900]
+'ME12 1HS': [712807, 718663, 722361, 725189, 727277, 729023, 730505, 731675]
+'ME15 7JJ': [728325, 728547, 728761, 729527, 729731, 729936, 730119, 730284]
+'ME15 7JP': [711298, 711396, 728213, 728435, 728863, 729837, 730019, 730210]
+'ME16 9FJ': [709878, 709958, 710029, 711194, 711340, 711488, 711601, 711705]
+'ME17 1GT': [709849, 709911, 710064, 710368, 710477, 711046, 711078, 711642]
+'ME3 0BJ': [712976, 718855, 722538, 724723, 724731, 725002, 725111, 725369]
+'MK10 9SZ': [733634, 734893, 734973, 735680, 736298, 736793, 737193, 737264]
+'N7 9JJ': [713895, 714027, 732501, 733158, 733240, 733313, 733384, 733456]
+'NN9 6JR': [723606, 723685, 723832, 723907, 724059, 724122, 724272, 724342]
+'NW10 8GG': [713417, 714935, 716002, 716957, 718711, 725234, 729062, 731712]
+'NW10 8HG': [722974, 723519, 723683, 723977, 726421, 726737, 727000, 727822]
+'NW10 8HJ': [713679, 715191, 716218, 717174, 719031, 719417, 729369, 731990]
+'NW10 8QB': [713176, 713686, 719042, 722753, 725556, 727637, 729379, 731999]
+'PE1 2BG': [710048, 710085, 710166, 710287, 716415, 716422, 717175, 717320]
+'PE29 3YW': [733575, 733816, 735625, 736246, 736749, 737525, 737807, 738058]
+'PE4 7DU': [715263, 715754, 723110, 723391, 724100, 724710, 725836, 741342]
+'PE7 3YB': [713394, 714915, 716472, 721494, 722032, 722378, 724559, 725203]
+'PE7 8GZ': [732418, 732518, 732597, 733172, 733254, 733328, 733399, 733472]
+'PO10 8NX': [720423, 721034, 722131, 723309, 724253, 726309, 728592, 729959]
+'PO10 8TB': [718430, 719812, 720489, 721103, 721651, 722187, 723349, 723857]
+'PO15 5TF': [710650, 720188, 720814, 721941, 723104, 724312, 724701, 725085]
+'PO15 5TQ': [710660, 711503, 713147, 722172, 722720, 723331, 727612, 732962]
+'PO15 6NG': [710642, 719781, 721617, 724051, 724859, 725047, 725801, 726319]
+'PO16 7DG': [733740, 735007, 735786, 736407, 736889, 737296, 737641, 737931]
+'PO18 0BU': [717607, 720500, 721115, 722197, 722783, 723864, 727176, 730864]
+'PO18 0GW': [712903, 718760, 722454, 725278, 736805, 737205, 737569, 737852]
+'PO18 0SQ': [726768, 736007, 736053, 736085, 736124, 738966, 739001, 739004]
+'PO18 0SW': [718803, 722494, 725324, 727403, 729155, 730630, 731798, 732784]
+'PO18 8BH': [713778, 729926, 730109, 732334, 732440, 733274, 733343, 733420]
+'PO18 9EP': [713098, 713632, 716668, 718960, 727566, 729314, 731933, 732916]
+'PO19 3LL': [721061, 722152, 724265, 726638, 726917, 729666, 731222, 731577]
+'PO19 3LP': [717199, 719077, 725590, 727682, 733912, 734062, 737921, 738162]
+'PO19 3NG': [724400, 728097, 734715, 735108, 735232, 736181, 736460, 736587]
+'PO19 3NS': [713078, 714398, 715656, 716650, 722651, 727546, 730758, 732897]
+'PO19 3RN': [712781, 713365, 714171, 714885, 725163, 730486, 731653, 732654]
+'PO19 6SB': [715717, 722773, 723355, 723862, 724689, 725074, 727665, 733012]
+'PO19 6TA': [733687, 734950, 735737, 736357, 736847, 737246, 737605, 737890]
+'PO19 6TU': [733742, 733924, 735009, 736409, 736892, 737299, 737644, 737934]
+'PO19 7ES': [714427, 716679, 717147, 718981, 722689, 730785, 731951, 732931]
+'PO19 8BL': [715041, 718840, 719309, 721300, 721821, 725357, 729187, 731825]
+'PO20 7EY': [713483, 718788, 722477, 725307, 729143, 730618, 731781, 732772]
+'PO20 9BP': [713242, 719104, 722808, 736401, 736882, 737290, 737637, 737925]
+'PO21 3JX': [741395, 741426, 741449, 741471, 741490, 741507, 741518, 741525]
+'PO21 5BP': [718237, 730525, 734001, 734465, 734642, 735677, 736790, 738089]
+'PO3 5XF': [713303, 713768, 715276, 716286, 719150, 725669, 729486, 732101]
+'PO5 1LP': [714688, 714700, 714738, 714783, 715292, 715340, 715369, 715405]
+'RH12 5YE': [711076, 723094, 723640, 723871, 724090, 724698, 725828, 726018]
+'RH12 5YN': [709972, 715705, 716225, 716715, 718025, 718423, 727641, 729383]
+'RH14 0LZ': [723876, 734517, 735927, 735980, 736202, 736480, 736509, 736543]
+'RH14 0TJ': [733628, 733996, 734345, 734887, 735672, 736292, 737836, 738084]
+'RH15 0GH': [710913, 724091, 724897, 726815, 727069, 727894, 728158, 728389]
+'RH16 1EB': [738313, 738319, 738324, 738327, 738331, 738332, 738333, 738334]
+'RH20 1PP': [713512, 714301, 715027, 715595, 716079, 722512, 725343, 730645]
+'RH20 3GW': [710371, 710514, 710570, 710621, 710653, 710695, 710831, 710866]
+'SE10 9AL': [712867, 713423, 714943, 718724, 719995, 721236, 722417, 729073]
+'SE10 9ES': [711737, 727082, 727088, 728402, 728404, 731406, 731409, 733133]
+'SE13 5QZ': [717755, 717762, 717766, 724340, 724348, 724352, 731604, 731611]
+'SE13 7SY': [716889, 717734, 717756, 731600, 731612, 732622, 733006, 733482]
+'SE15 2DR': [716534, 717431, 739736, 739795, 739826, 739854, 739880, 739890]
+'SE15 2JQ': [721981, 721991, 723175, 723180, 723185, 723188, 723695, 741332]
+'SE15 2TX': [733807, 735078, 735839, 736445, 736920, 737328, 737664, 737954]
+'SE15 3XB': [740102, 740107, 740110, 740112, 740114, 740115, 740142, 740143]
+'SE15 5QH': [714446, 715683, 716690, 717570, 718400, 719789, 720465, 732955]
+'SE16 4AE': [727052, 727166, 727878, 728017, 728145, 728265, 728380, 728481]
+'SE16 4AG': [713791, 713824, 713867, 713909, 713940, 713970, 714001, 714038]
+'SE17 2QW': [741064, 741105, 741128, 741153, 741185, 741211, 741228, 741245]
+'SE18 2PN': [709913, 713853, 713930, 714739, 714785, 732454, 733347, 733426]
+'SE18 5AG': [727629, 732978, 733667, 734928, 735715, 736335, 736825, 737224]
+'SE18 6EH': [712778, 716910, 717353, 717787, 718205, 718639, 722335, 725161]
+'SE18 6FG': [712838, 718692, 722393, 725219, 727305, 729045, 730537, 731697]
+'SE23 1SE': [710443, 713074, 722647, 725456, 727544, 729287, 730755, 731915]
+'SE25 5AD': [733668, 734929, 735716, 736336, 736826, 737225, 737589, 737871]
+'SE25 6ND': [711784, 734885, 735669, 736288, 736781, 737185, 737550, 737832]
+'SE26 4AT': [713099, 718961, 722669, 725480, 727567, 729315, 730773, 731934]
+'SE26 4NY': [714821, 714837, 720856, 721442, 721453, 722373, 733481, 733491]
+'SE26 5RZ': [714271, 715574, 716547, 717441, 720355, 720965, 730614, 732768]
+'SE26 6UN': [733617, 734876, 735660, 736280, 737179, 737544, 737827, 738076]
+'SE27 0DT': [741002, 741005, 741007, 741009, 741010, 741011, 741013, 741014]
+'SE28 0BX': [728910, 729671, 729875, 730062, 730408, 731077, 732409, 732514]
+'SE3 8AH': [709807, 718856, 722539, 725370, 727447, 729200, 730671, 731837]
+'SE4 1JD': [741292, 741305, 741307, 741317, 741318, 741325, 741331, 741349]
+'SE4 1XX': [715378, 715379, 715783, 715784, 715810, 715815, 716351, 716352]
+'SE4 2EY': [718442, 721662, 722198, 723361, 724296, 724692, 725077, 726010]
+'SE7 7EG': [741077, 741117, 741143, 741167, 741198, 741223, 741241, 741254]
+'SE8 4QH': [711280, 711568, 723803, 725027, 728128, 728793, 731144, 731534]
+'SE8 5NA': [713266, 719124, 722832, 725639, 727723, 729461, 730906, 732076]
+'SE8 5PS': [712771, 713358, 718633, 722329, 725154, 727254, 730480, 732648]
+'SE8 5QZ': [741000, 741016, 741026, 741031, 741035, 741041, 741043, 741052]
+'SE9 1EW': [718820, 720043, 720677, 721811, 722984, 724807, 726107, 729172]
+'SE9 1LA': [711149, 728016, 728264, 728701, 729674, 730249, 730411, 731281]
+'SE9 1LN': [726986, 727808, 728542, 728757, 730283, 731122, 732125, 732240]
+'SE9 1LR': [713143, 715686, 721080, 721627, 722169, 727609, 730810, 732959]
+'SE9 6NJ': [713684, 715701, 718020, 719040, 721375, 722751, 725554, 729376]
+'SE9 6NL': [724709, 726356, 726673, 731010, 731164, 731293, 731402, 732370]
+'SE9 6UF': [724516, 724519, 724721, 724912, 724914, 725106, 725108, 725864]
+'SO14 3GA': [713168, 719032, 722743, 725548, 727628, 729370, 730824, 731991]
+'SO14 6SG': [710935, 721529, 722065, 723244, 723746, 724193, 724589, 725927]
+'SO14 6SJ': [720857, 720866, 720873, 720878, 720880, 720882, 720884, 720885]
+'SO15 2SN': [713039, 718907, 722607, 725430, 727508, 729251, 730727, 731884]
+'SO15 3NA': [741388, 741418, 741442, 741464, 741485, 741502, 741513, 741521]
+'SO16 9EY': [720328, 720562, 720570, 720577, 720636, 720858, 720867, 720874]
+'SO17 2HA': [735611, 735612, 735936, 735937, 736102, 736103, 738248, 738249]
+'SO23 7PX': [712677, 738199, 738205, 738215, 738221, 738225, 738232, 738239]
+'SO31 7JT': [730808, 731974, 733708, 734972, 735756, 736376, 736863, 737263]
+'SO31 8HT': [713300, 714561, 715767, 716780, 722865, 727759, 730927, 733085]
+'SO31 8HZ': [713298, 715765, 716284, 716782, 717243, 719148, 722810, 725666]
+'SO31 8LD': [709898, 711007, 711365, 715207, 718429, 719054, 719811, 732011]
+'SW16 5PX': [739574, 739593, 739622, 739639, 740152, 740173, 740208, 740238]
+'SW4 6QQ': [712892, 713445, 714247, 714966, 718751, 725268, 730581, 732734]
+'SW4 6RL': [738796, 738917, 738957, 738999, 739021, 739050, 739073, 739091]
+'SW4 6RR': [713121, 714435, 715674, 716683, 725502, 729330, 730791, 732938]
+'SW9 9EX': [713608, 714386, 722636, 725447, 729276, 730749, 731904, 732884]
+'SW9 9HE': [713003, 713560, 714338, 715077, 722564, 725396, 730691, 731854]
+'TN23 3GQ': [710149, 717073, 733871, 734150, 734934, 736340, 737232, 737875]
+'BN13 3FX': [710700, 710834, 710869, 711771, 712066, 712190, 712289, 712383, 712467]
+'BN1 4ZL': [733627, 734886, 735671, 736290, 736784, 737186, 737553, 737835, 738083]
+'BN16 1TJ': [712924, 718785, 722474, 725304, 727389, 729140, 730616, 731778, 732770]
+'BN17 5BZ': [711042, 724870, 725057, 725995, 726168, 726327, 726490, 726651, 726797]
+'BN18 0GH': [712890, 717248, 718084, 718747, 719484, 720208, 722441, 727352, 730580]
+'BN2 3BN': [733739, 735006, 735785, 736017, 736095, 736164, 736204, 736231, 736406]
+'BN3 2TE': [712541, 733602, 733826, 734861, 735648, 736267, 736768, 737821, 738072]
+'BN5 9QE': [713017, 718887, 722579, 725407, 727488, 729232, 730704, 731862, 732851]
+'CR0 1XW': [711780, 712074, 712198, 712296, 712390, 712475, 712544, 712594, 712640]
+'CR2 6DT': [725122, 725129, 725131, 733712, 734978, 735760, 736380, 736867, 737269]
+'CR3 5EG': [741074, 741114, 741138, 741162, 741194, 741219, 741236, 741251, 741263]
+'CR5 3FZ': [709830, 709971, 710110, 710215, 710313, 710781, 711221, 711508, 711716]
+'DA11 8FL': [721138, 721679, 722220, 723385, 723882, 724313, 724704, 725087, 726022]
+'DA12 2JG': [711291, 728668, 728770, 728871, 729536, 736977, 736997, 737024, 737046]
+'DA14 6NQ': [711873, 733633, 733839, 734122, 735679, 736791, 737192, 737557, 738090]
+'DA2 6GY': [710587, 710645, 710686, 720776, 721094, 721640, 722178, 723070, 723339]
+'DA8 1AS': [733910, 734190, 734287, 734396, 734510, 737632, 737918, 738160, 741412]
+'DA9 9FL': [711408, 711555, 728890, 729651, 730042, 730232, 730388, 731062, 731212]
+'E1 0DT': [717583, 718016, 718413, 719028, 720478, 721091, 721638, 723069, 732975]
+'E1 1LT': [714080, 714597, 714659, 714706, 714756, 714795, 715310, 715349, 715412]
+'E1 1PS': [713389, 718672, 722369, 725197, 727286, 729030, 730514, 731681, 732677]
+'E1 5JD': [714306, 715036, 715599, 717468, 719697, 720049, 722518, 727429, 731818]
+'E2 6QU': [713093, 715140, 716175, 716663, 717544, 717978, 718382, 718954, 729305]
+'E2 7AL': [712951, 713509, 715594, 718821, 727419, 729173, 730643, 731810, 732799]
+'GU27 3HT': [723593, 724663, 724853, 725793, 726156, 726317, 726478, 726785, 726916]
+'GU28 0EA': [712897, 734906, 735691, 736312, 736803, 737202, 737567, 737850, 738100]
+'GU28 0EJ': [740246, 740500, 740667, 740785, 740839, 740879, 740917, 740945, 740975]
+'GU28 0LA': [715755, 716771, 717236, 729474, 730915, 733925, 734071, 734201, 738174]
+'GU28 0QZ': [719289, 733657, 734918, 735703, 736325, 736816, 737215, 737579, 737861]
+'GU28 0SA': [713638, 715153, 716186, 717143, 718973, 725489, 729322, 731946, 732927]
+'GU29 9SE': [733700, 733891, 734047, 734172, 734964, 735748, 736855, 737614, 738141]
+'GU29 9TJ': [733729, 733915, 734994, 735775, 736396, 736879, 737287, 737923, 738164]
+'GU30 7NW': [713719, 714511, 719087, 725603, 727688, 729421, 730877, 732041, 733031]
+'GU31 5LB': [715169, 716197, 717156, 717564, 720131, 722702, 727591, 731963, 732947]
+'ME10 4EL': [726975, 727797, 728079, 728310, 728528, 728743, 729515, 729717, 729927]
+'ME10 4GA': [710654, 710697, 711794, 712087, 713395, 718679, 725204, 729034, 731685]
+'ME10 4GD': [709848, 710476, 710804, 711029, 711241, 711378, 711527, 711640, 711731]
+'ME13 7UW': [712768, 718631, 722326, 725151, 727252, 728989, 730477, 731646, 732645]
+'ME13 8JX': [710936, 711069, 724599, 724797, 725742, 725934, 726422, 726589, 726738]
+'ME14 2EP': [712836, 718690, 722391, 725217, 727304, 729044, 730536, 731696, 732694]
+'ME15 6NX': [709869, 710021, 710144, 710255, 710345, 710491, 711332, 711593, 725332]
+'ME15 7LZ': [713018, 714347, 715629, 716611, 717500, 722580, 727489, 730705, 732852]
+'ME15 7QR': [713151, 719019, 722725, 725534, 727617, 729359, 730817, 731984, 732969]
+'ME15 7RW': [709812, 711199, 718900, 722599, 725423, 729246, 730721, 731878, 732865]
+'ME15 7SZ': [709888, 711613, 715159, 716189, 717148, 717990, 718982, 725497, 729326]
+'ME15 7TP': [711224, 713185, 719050, 722761, 725564, 729391, 730842, 732007, 732993]
+'ME15 7TX': [711165, 712843, 718696, 722397, 725223, 729050, 730542, 731701, 732699]
+'ME16 8JB': [710407, 710715, 711785, 712079, 712202, 712301, 712394, 712481, 712549]
+'ME20 7GW': [711798, 712090, 712212, 712310, 712408, 712491, 712557, 712607, 712657]
+'ME20 7HW': [711765, 712185, 712285, 712537, 734839, 736751, 737312, 737809, 738059]
+'ME2 2GT': [710785, 713188, 719051, 725566, 727648, 729392, 730844, 732009, 732995]
+'ME9 8WP': [717411, 718266, 719655, 721776, 722950, 723496, 723962, 724781, 725730]
+'MK10 9RZ': [738335, 738336, 738337, 738338, 738339, 738340, 738341, 738342, 738343]
+'MK10 9SA': [733724, 734989, 735769, 736390, 736876, 737281, 737630, 737917, 738158]
+'N1 7DF': [732264, 732365, 732468, 732551, 733125, 733220, 733294, 733361, 733437]
+'NN3 2BP': [711764, 712060, 712284, 712380, 712463, 712588, 712634, 735619, 737521]
+'NW10 8BJ': [718836, 722522, 725353, 729184, 731822, 739113, 739119, 739123, 739125]
+'NW10 8ET': [715429, 715778, 715801, 715842, 715895, 716301, 716323, 716347, 716401]
+'NW10 8PN': [718574, 718589, 718595, 718601, 718605, 722272, 722286, 722296, 722301]
+'PE2 8HA': [728814, 729582, 729787, 729972, 730162, 730326, 731003, 731156, 731285]
+'PO10 8PD': [712874, 716014, 720940, 721513, 723232, 724181, 724580, 727333, 730562]
+'PO1 1BS': [713100, 718962, 722670, 725481, 727568, 729316, 730774, 731935, 732917]
+'PO15 5DP': [713615, 714395, 715125, 716161, 716648, 717118, 725459, 731917, 732893]
+'PO15 7FS': [713807, 713892, 713956, 714024, 729840, 730021, 730212, 730372, 733454]
+'PO18 8QX': [718477, 730910, 734293, 734521, 734613, 735377, 735426, 735476, 735517]
+'PO18 8TL': [712865, 714225, 715541, 718255, 720317, 722415, 727329, 730558, 732713]
+'PO19 1QN': [733919, 734516, 734609, 735001, 735782, 736403, 736886, 737928, 738168]
+'PO19 3AE': [713186, 717594, 718426, 719808, 722762, 723347, 723854, 727646, 732994]
+'PO19 3ND': [734072, 734407, 734523, 735789, 736893, 737300, 737646, 737935, 738177]
+'PO19 3PT': [712831, 718686, 722388, 725214, 727303, 729042, 730531, 731693, 732691]
+'PO19 6SP': [733647, 734778, 735172, 735401, 735580, 735693, 735907, 735997, 736077]
+'PO19 8AG': [713569, 714348, 715088, 715630, 716612, 717088, 722581, 727490, 730706]
+'PO19 8DB': [717025, 717452, 717896, 718298, 719288, 719683, 720037, 720365, 720671]
+'PO20 2EP': [709837, 710465, 710793, 711017, 711231, 711369, 711517, 711630, 711724]
+'PO20 2ER': [712941, 718805, 722496, 725325, 727405, 729158, 730632, 731801, 732786]
+'PO20 8QJ': [713052, 713599, 714373, 716628, 720733, 721586, 722129, 723030, 725437]
+'RH11 0SL': [709979, 715235, 715739, 716255, 717622, 718057, 718457, 719456, 721406]
+'RH12 5YQ': [731159, 731587, 732317, 732472, 732519, 732554, 733126, 733175, 733222]
+'RH1 2AT': [711003, 713170, 719034, 722745, 727630, 729372, 730826, 731993, 732979]
+'RH14 9SB': [711694, 712872, 713430, 722421, 725252, 727332, 729080, 730560, 731727]
+'RH14 9XL': [709910, 709987, 710063, 710118, 710618, 710652, 710667, 710712, 710824]
+'RH6 8LR': [712839, 714926, 716485, 717391, 717830, 727307, 729046, 730539, 732697]
+'SE10 8TZ': [741075, 741115, 741139, 741164, 741195, 741220, 741237, 741252, 741261]
+'SE10 9AG': [712854, 716493, 717838, 718251, 720310, 723222, 724171, 724571, 730551]
+'SE12 0HH': [731166, 731170, 731174, 731298, 731300, 731302, 731405, 731410, 731413]
+'SE1 3QP': [711833, 712076, 712477, 712546, 712596, 735664, 736284, 736777, 738079]
+'SE14 5EH': [723584, 733788, 735051, 735817, 736433, 736911, 737320, 737658, 737949]
+'SE14 5FR': [709867, 709949, 710020, 710740, 710966, 711178, 711328, 711475, 711589]
+'SE14 5JR': [719889, 719896, 719909, 733586, 734848, 735634, 736254, 736756, 737163]
+'SE14 5QY': [718249, 726718, 728533, 733786, 735049, 735815, 736432, 736910, 737319]
+'SE15 2NY': [715924, 715930, 724735, 724737, 725118, 733488, 733495, 733499, 741345]
+'SE15 3JN': [719917, 719930, 719936, 720566, 720573, 723908, 723915, 723919, 723921]
+'SE16 4BA': [733646, 734907, 735692, 736313, 736804, 737203, 737568, 737851, 738101]
+'SE16 4QW': [741071, 741110, 741134, 741158, 741190, 741215, 741232, 741248, 741258]
+'SE18 6SQ': [713306, 719152, 722869, 725671, 727761, 729488, 730929, 732103, 733088]
+'SE19 3SX': [710716, 714826, 714843, 722298, 727210, 727232, 734824, 735025, 735803]
+'SE20 7LH': [717745, 720251, 720257, 720565, 720572, 721358, 721616, 723434, 728058]
+'SE20 8TL': [713055, 718920, 722622, 725439, 727523, 729263, 730737, 731893, 732875]
+'SE22 8PN': [710084, 715474, 716638, 721715, 721722, 722292, 723810, 725113, 725115]
+'SE25 6PN': [733595, 734856, 735642, 736261, 736762, 737168, 737534, 737815, 738065]
+'SE26 5EL': [711390, 728838, 728842, 730179, 731018, 731020, 731169, 731173, 731176]
+'SE4 1PD': [721449, 721458, 721984, 721997, 721998, 726210, 726214, 730444, 730451]
+'SE4 1TD': [711107, 711301, 726686, 726695, 727085, 727089, 728726, 732222, 732226]
+'SE5 0RW': [710713, 723119, 723127, 723141, 723158, 723169, 723406, 723411, 723414]
+'SE8 4BP': [713505, 715021, 718813, 725335, 729167, 729945, 730129, 730296, 731807]
+'SE8 5BU': [709838, 711232, 719103, 722807, 725616, 729438, 730886, 732053, 733043]
+'SE9 1JS': [714173, 715956, 717358, 717793, 718209, 720903, 721474, 725169, 730489]
+'SE9 1JT': [723201, 724545, 724936, 725885, 726224, 727941, 729815, 729994, 731029]
+'SO14 0AW': [715024, 729171, 741175, 741176, 741200, 741201, 741202, 741203, 741204]
+'SO14 0EY': [730656, 733577, 734838, 735627, 736248, 736750, 737311, 737526, 737808]
+'SO14 1LQ': [741072, 741111, 741135, 741159, 741191, 741216, 741233, 741249, 741259]
+'SO14 5BD': [710582, 716606, 717080, 717495, 717935, 718341, 719337, 719724, 720074]
+'SO17 2NA': [719391, 720119, 720754, 721351, 721876, 723044, 723590, 724040, 724463]
+'SO31 6HA': [713294, 719142, 722861, 725663, 727756, 729483, 730924, 732098, 733082]
+'SO32 2NG': [709889, 709967, 710448, 710772, 710994, 711212, 711353, 711615, 711712]
+'SW4 7RA': [715903, 715912, 716306, 716313, 716355, 716377, 716404, 716799, 716821]
+'SW9 9EY': [712987, 713546, 714330, 715064, 718866, 725383, 727461, 729210, 730676]
+'SW9 9HH': [713083, 713620, 714404, 715134, 718945, 722655, 727550, 729298, 732904]
+'TN23 3FD': [711612, 713640, 715155, 716187, 717145, 717988, 718977, 725493, 729324]
+'TN24 8NE': [713337, 719180, 722895, 725694, 727784, 729502, 730945, 732108, 733096]
+'TN4 9DF': [723993, 724120, 724128, 724130, 724131, 724133, 724135, 724136, 724137]
+'BN13 3FP': [709836, 709977, 710218, 710317, 710387, 710591, 710791, 711229, 711516, 711723]
+'BN17 7EE': [713031, 713580, 718898, 722597, 725421, 727501, 729245, 730719, 731876, 732863]
+'BN1 9GS': [712225, 733715, 733902, 734981, 736382, 736870, 737273, 737623, 737911, 738152]
+'BN2 4ET': [710662, 710687, 721377, 722180, 723073, 723342, 723618, 723849, 724071, 724283]
+'BN41 1LU': [710460, 710788, 711011, 713217, 713711, 727681, 729413, 730867, 732032, 733021]
+'BR3 1BH': [713528, 714314, 715043, 715602, 716092, 727439, 729189, 730661, 731827, 732814]
+'BR7 6AH': [739515, 739536, 739753, 739914, 740007, 740075, 740119, 740149, 740176, 740204]
+'CR0 2DR': [738815, 738841, 738858, 738865, 738872, 738930, 738933, 738935, 738939, 738959]
+'CT18 7TZ': [710962, 712884, 713441, 718744, 722436, 727346, 729097, 730575, 731737, 732730]
+'DA1 5HJ': [709919, 709924, 709926, 709931, 709938, 709991, 709994, 709997, 711749, 711750]
+'DA2 7WN': [713800, 713882, 713950, 714016, 714082, 714598, 732571, 733140, 733228, 733306]
+'DA8 3SP': [712505, 712568, 733900, 737909, 738150, 741396, 741427, 741450, 741472, 741491]
+'E1 0DZ': [712878, 713436, 717408, 718262, 719243, 719650, 720001, 727338, 730567, 731732]
+'E1 2BF': [713173, 713683, 719037, 722748, 725552, 727633, 729374, 730830, 731996, 732983]
+'E2 0BJ': [713000, 713556, 714335, 715073, 717076, 717932, 718875, 725393, 730687, 732839]
+'E2 6LZ': [712998, 716599, 717075, 719719, 720071, 720396, 723008, 729217, 730684, 731851]
+'GU21 6DE': [721940, 722218, 723103, 723382, 723649, 723880, 724095, 724310, 724501, 724700]
+'GU28 9BL': [713105, 715149, 717137, 718385, 718967, 720121, 720453, 722677, 730777, 732922]
+'GU29 9BQ': [716519, 716981, 718268, 719251, 719657, 721250, 722435, 723499, 723965, 724187]
+'GU29 9BU': [715250, 716268, 716762, 719468, 719850, 720522, 720811, 721937, 722215, 723101]
+'GU31 5JB': [712940, 714288, 715012, 718804, 722495, 727404, 729156, 730631, 731799, 732785]
+'GU31 5JP': [717114, 718371, 719373, 719757, 720104, 720436, 721044, 721595, 721865, 722137]
+'GU32 1AP': [713225, 713718, 719085, 727687, 732039, 733030, 735774, 736395, 737286, 737635]
+'ME10 3FS': [709857, 709942, 710014, 710337, 710372, 710481, 710515, 710542, 710573, 711688]
+'ME1 3XQ': [709818, 709963, 710105, 710208, 710306, 710381, 710766, 711206, 711497, 711709]
+'ME20 7GE': [710830, 720262, 720581, 720891, 721190, 721462, 722000, 722897, 723444, 723699]
+'ME3 7HS': [711495, 713086, 714405, 716657, 716886, 718582, 722657, 725125, 727552, 732905]
+'ME5 0SR': [710424, 710970, 712938, 713496, 722491, 727401, 729152, 730628, 731796, 732782]
+'ME7 4AW': [713591, 727513, 733683, 734944, 735733, 736351, 737243, 737600, 737884, 738130]
+'N1 7AY': [728301, 728518, 728734, 729506, 729709, 729915, 730101, 730273, 730951, 731105]
+'N1 7GB': [713285, 713761, 714551, 719135, 725653, 727745, 729476, 730916, 732091, 733074]
+'NN3 2BE': [739520, 739542, 739759, 739920, 740013, 740081, 740124, 740155, 740182, 740211]
+'NN3 6RL': [709930, 714094, 728682, 728887, 729648, 729853, 730040, 730229, 730387, 731060]
+'NW10 8PJ': [722988, 723531, 723772, 723996, 724218, 724423, 724615, 724809, 724990, 725753]
+'NW10 8PT': [716160, 717117, 717969, 718937, 719376, 720744, 721344, 723037, 725458, 729289]
+'NW10 8RN': [714243, 715555, 716520, 717415, 718269, 720329, 722438, 727347, 730576, 732731]
+'PE1 5LX': [710005, 739570, 739619, 739638, 739913, 740074, 740116, 740148, 740172, 740203]
+'PE2 9FE': [726997, 727818, 728103, 728330, 737071, 737114, 737339, 737381, 737424, 737459]
+'PE3 9YB': [711537, 711551, 728548, 730371, 730963, 731125, 731436, 731490, 731557, 732244]
+'PO10 8BG': [709772, 709773, 709774, 710281, 710475, 711450, 711451, 711453, 711454, 724910]
+'PO10 8FN': [709795, 710422, 711842, 712208, 712306, 712403, 712487, 712553, 712603, 712651]
+'PO10 8HH': [719684, 720974, 721541, 722082, 723259, 723762, 724984, 725940, 726594, 730634]
+'PO18 0EQ': [713571, 717090, 717502, 733677, 734035, 734154, 734372, 734491, 735728, 736346]
+'PO18 0JH': [714257, 716531, 716998, 717428, 717869, 725281, 727370, 729114, 730592, 732748]
+'PO18 8QT': [712847, 713411, 714932, 715999, 717835, 718701, 722402, 734644, 735287, 735397]
+'PO19 1AU': [710402, 712769, 713356, 722327, 725152, 727253, 728990, 730478, 731647, 732646]
+'PO19 3LG': [712999, 715072, 719333, 719720, 720073, 720398, 721007, 722562, 725391, 730685]
+'PO19 3LJ': [713382, 715515, 715967, 716927, 717370, 717806, 719205, 720284, 722021, 722913]
+'PO19 6XS': [715237, 716751, 719840, 720179, 720513, 732052, 733731, 734996, 735777, 736399]
+'PO19 7LP': [733899, 734053, 734181, 734282, 734390, 734503, 734597, 736868, 737271, 738149]
+'PO19 8AY': [725964, 726296, 727140, 727991, 729653, 729855, 730043, 730390, 731064, 732198]
+'PO19 8BG': [714406, 715460, 716170, 716659, 717125, 717974, 718948, 722658, 727554, 730765]
+'PO19 8GX': [733845, 734007, 734127, 734898, 735686, 736305, 736801, 737564, 737846, 738095]
+'PO20 2AP': [713288, 717647, 718482, 719865, 720533, 721145, 721686, 722229, 722854, 723394]
+'PO20 2EJ': [710554, 710610, 710639, 710682, 710813, 710853, 710930, 711039, 711072, 711118]
+'PO20 2EU': [711817, 711857, 712108, 712231, 712328, 712427, 712512, 712576, 712624, 712672]
+'PO20 8PY': [714289, 715585, 716558, 720364, 723760, 724207, 724983, 726271, 729157, 731800]
+'PO5 2AU': [712848, 713412, 718702, 722403, 725229, 727315, 729056, 730548, 731707, 732703]
+'PO6 4RU': [713695, 715204, 716228, 717187, 719431, 720156, 721387, 727650, 730845, 732997]
+'RH10 1AQ': [737057, 737084, 737102, 737126, 737143, 737349, 737369, 737392, 737411, 737434]
+'RH11 7HS': [711494, 713080, 713618, 718943, 722653, 725466, 727547, 729295, 731921, 732900]
+'RH14 0QB': [713625, 717129, 734165, 734277, 734378, 734797, 735249, 735361, 735418, 735877]
+'RH16 4GF': [714222, 716495, 717399, 718253, 719641, 720312, 722411, 727323, 730555, 732708]
+'RH20 1JQ': [713479, 714272, 714996, 716057, 716548, 718784, 729137, 730615, 731775, 732769]
+'RH6 7DB': [711385, 711539, 728683, 728889, 729650, 729753, 730136, 730231, 731139, 731569]
+'SE10 0LG': [733601, 733825, 734860, 735647, 736266, 736767, 737172, 737661, 737820, 738071]
+'SE10 9AN': [713823, 713908, 713969, 731076, 731224, 731339, 732206, 732311, 732592, 733251]
+'SE10 9PP': [713822, 713906, 713967, 714101, 732407, 732590, 733166, 733249, 733393, 733467]
+'SE14 5AF': [733814, 734099, 734832, 735620, 736241, 736745, 737157, 737522, 737805, 738056]
+'SE14 5FS': [712688, 712694, 712700, 712704, 712709, 712714, 712721, 712725, 712729, 712733]
+'SE14 5JE': [715623, 716604, 717493, 720401, 721010, 722568, 727478, 730695, 732845, 741298]
+'SE14 6QE': [715934, 717313, 717324, 720850, 726208, 726213, 728175, 728176, 728177, 728178]
+'SE1 4SG': [741067, 741082, 741107, 741130, 741155, 741187, 741213, 741229, 741246, 741256]
+'SE15 2AD': [713507, 714297, 715023, 715591, 716075, 716564, 717032, 717457, 717902, 718301]
+'SE15 2PX': [712064, 712188, 712466, 712635, 733583, 733819, 736251, 736754, 737530, 737812]
+'SE16 3EX': [715437, 715772, 715785, 715796, 715818, 715836, 715855, 715864, 715874, 715888]
+'SE16 4AH': [713535, 716582, 717055, 718853, 719707, 720059, 721556, 721826, 722536, 732821]
+'SE18 1RJ': [711144, 711251, 711268, 725912, 726246, 726569, 726858, 728430, 728655, 728858]
+'SE18 6EQ': [709852, 711682, 712787, 718650, 722344, 725171, 727263, 729005, 730492, 731658]
+'SE23 3DR': [710470, 713268, 713751, 714540, 722835, 725641, 727725, 729463, 732078, 733064]
+'SE25 6DA': [733664, 733865, 734925, 735712, 736332, 736822, 737221, 737586, 737868, 738118]
+'SE3 8AQ': [710494, 713537, 715053, 716101, 717058, 717917, 718857, 725371, 729201, 731836]
+'SE4 2NU': [715462, 716414, 716421, 717319, 717330, 725538, 727219, 727619, 728953, 731618]
+'SE6 2DX': [709932, 713827, 713912, 714675, 714723, 731081, 731343, 732415, 732595, 733327]
+'SE8 5AZ': [738330, 741531, 741533, 741535, 741538, 741539, 741540, 741541, 741542, 741543]
+'SE9 3QU': [712911, 713466, 718771, 722464, 725290, 727377, 729122, 730599, 731759, 732754]
+'SO14 0JJ': [740245, 740274, 740499, 740666, 740784, 740838, 740878, 740916, 740944, 740974]
+'SO21 1FD': [713184, 713693, 719049, 722760, 725563, 727645, 729389, 730841, 732006, 732992]
+'SO23 7GL': [709782, 710410, 710725, 710953, 711463, 711580, 711837, 712397, 712484, 712645]
+'SO32 2GT': [709814, 709881, 709962, 710036, 710154, 710438, 710763, 710982, 711202, 711345]
+'SW4 6TJ': [713169, 713680, 714469, 715192, 719033, 722744, 725549, 729371, 730825, 731992]
+'SW8 1AN': [714252, 714972, 715560, 716036, 716529, 716992, 718754, 727360, 729105, 732739]
+'SW9 0PP': [727209, 727226, 727231, 735070, 735072, 735074, 735833, 735834, 735835, 736440]
+'SW9 9HA': [712797, 713375, 714180, 714894, 718656, 722352, 725178, 727269, 729010, 730497]
+'TN37 7GF': [711824, 711898, 712115, 712237, 733932, 736419, 736901, 737308, 737942, 738184]
+'BN13 3TE': [709788, 709865, 709946, 710416, 710734, 710963, 711172, 711325, 711471, 711586, 711695]
+'BN1 4AY': [711681, 713369, 714888, 718645, 722339, 725167, 727261, 729002, 733626, 737552, 737834]
+'BN17 6UA': [713206, 713706, 714499, 715217, 719069, 722778, 725581, 727671, 729406, 730861, 732025]
+'BN17 7EN': [713112, 713641, 714424, 718978, 722685, 725494, 727578, 729325, 730782, 731948, 732929]
+'BN2 9ND': [713657, 714443, 715172, 715680, 722706, 725514, 727596, 729341, 730803, 731967, 732952]
+'BN3 5GA': [733502, 733508, 733511, 733514, 733523, 733529, 733540, 733545, 733550, 733554, 733558]
+'BN41 1HS': [733630, 733836, 733998, 734889, 735674, 736294, 736787, 737188, 737555, 737838, 738086]
+'CR2 7EB': [733610, 733611, 734869, 734870, 735653, 735654, 736273, 736274, 738285, 738307, 738309]
+'CT5 1TN': [709810, 709959, 710121, 710225, 710326, 710395, 710537, 710760, 711195, 711489, 711706]
+'DA11 7ND': [713379, 714184, 714900, 715964, 716458, 716925, 727272, 729017, 730501, 731669, 732665]
+'DA11 9EH': [727152, 728001, 728253, 728470, 728690, 728899, 729660, 729864, 730050, 730238, 730400]
+'E1 0LT': [713378, 714899, 715962, 716924, 717803, 718161, 719203, 719559, 719964, 729016, 731668]
+'E2 6QX': [712969, 713530, 715047, 716576, 717048, 718318, 718846, 720691, 722529, 730664, 732816]
+'E2 7AG': [713088, 717124, 717539, 719767, 720114, 720447, 721872, 723318, 723587, 729300, 731925]
+'E2 9RL': [712780, 713364, 714170, 714884, 715507, 716445, 718642, 719193, 722336, 728999, 732653]
+'GU29 9EX': [719422, 733718, 733904, 734055, 734184, 734284, 734392, 734505, 734599, 737625, 738154]
+'ME12 2GD': [713103, 716181, 716672, 717548, 717983, 718965, 722674, 725484, 729318, 738425, 738661]
+'ME14 2XH': [713022, 713574, 714351, 718889, 722586, 725412, 727494, 729236, 730710, 731867, 732856]
+'ME16 8JN': [741083, 741087, 741090, 741113, 741137, 741161, 741193, 741218, 741235, 741250, 741260]
+'ME6 5GW': [709882, 711492, 713066, 714384, 718929, 722634, 725444, 727533, 729273, 731901, 732882]
+'N1 7DY': [714913, 715523, 715976, 716466, 716935, 717379, 717814, 718227, 719212, 719619, 719971]
+'N7 9EU': [711334, 713506, 717031, 717901, 718816, 719296, 720040, 721283, 721809, 723990, 725337]
+'NW6 7RB': [738787, 738811, 738836, 738855, 738907, 738948, 738988, 739011, 739040, 739063, 739084]
+'PE1 5YU': [713470, 714265, 730603, 731763, 732757, 733652, 734913, 735698, 736318, 736811, 737210]
+'PE29 3NL': [710954, 711464, 711690, 712820, 713393, 714198, 718677, 722376, 727290, 729032, 731683]
+'PO10 8LY': [713057, 714375, 716631, 717518, 718360, 721035, 721589, 722625, 727526, 728689, 730741]
+'PO10 8TW': [712887, 714244, 727349, 730578, 733850, 734131, 734352, 734713, 734904, 736310, 737201]
+'PO10 8UP': [714262, 716045, 716539, 717003, 718770, 719267, 720019, 727376, 729121, 730598, 732753]
+'PO18 0BZ': [712904, 713458, 714256, 714979, 718762, 722457, 725280, 727368, 729113, 731751, 732746]
+'PO18 0DR': [715050, 716097, 717053, 717476, 717916, 718322, 719316, 719706, 720058, 725366, 729197]
+'PO18 0EJ': [713705, 715216, 718041, 719440, 719824, 720165, 721112, 722777, 725580, 726338, 730859]
+'PO18 0HR': [716258, 716753, 717216, 717627, 718460, 719842, 720803, 725618, 729439, 730889, 732057]
+'PO18 8JZ': [712806, 714187, 722358, 727275, 729020, 730503, 732667, 734463, 734639, 734770, 735161]
+'PO19 3NN': [713113, 713642, 714425, 715157, 718980, 722687, 725496, 727579, 730783, 731950, 732930]
+'PO19 6SU': [733877, 734155, 734727, 734940, 735119, 735242, 735357, 735461, 736347, 737239, 737880]
+'PO19 7LQ': [740255, 740283, 740310, 740510, 740677, 740795, 740849, 740889, 740926, 740955, 740984]
+'PO19 7NP': [720679, 720981, 721288, 721812, 722089, 722986, 723267, 723530, 723769, 723994, 724215]
+'PO19 8BH': [713235, 713727, 714519, 715231, 715736, 717620, 718053, 719097, 722802, 732046, 733038]
+'PO19 8DS': [720308, 735339, 735441, 735490, 735579, 735854, 735904, 735947, 735994, 736033, 736075]
+'PO19 8EN': [733676, 733876, 734034, 734939, 735727, 736345, 736838, 737238, 737597, 737879, 738126]
+'PO20 0LU': [713383, 715968, 716929, 717808, 719208, 723460, 725705, 726386, 727791, 728307, 728739]
+'PO20 7EX': [714999, 716060, 718789, 719280, 720028, 720662, 722972, 723517, 723975, 725308, 731782]
+'PO22 7UF': [711576, 713359, 714165, 714878, 715949, 716440, 716908, 717350, 717784, 718202, 732649]
+'PO3 5XQ': [713565, 715083, 716122, 717083, 717938, 718883, 719339, 720077, 725403, 729227, 731858]
+'PO7 6FA': [709894, 709969, 710777, 710999, 711218, 711811, 712104, 712504, 712567, 712617, 712665]
+'RH10 1AJ': [738790, 738801, 738814, 738911, 738952, 738992, 739014, 739044, 739067, 739088, 739098]
+'RH15 0GG': [712586, 712628, 712631, 733331, 733403, 733476, 737976, 738024, 738052, 738203, 738214]
+'RH16 4TU': [711543, 726118, 726448, 726756, 727017, 727843, 728117, 728579, 728785, 730980, 731264]
+'RH20 1HX': [715026, 716567, 717034, 717460, 719298, 720678, 720980, 721287, 725340, 730644, 732800]
+'SE10 8TX': [740261, 740289, 740316, 740516, 740683, 740801, 740855, 740895, 740932, 740961, 740990]
+'SE12 9PY': [713109, 713637, 716185, 716676, 717142, 717552, 718972, 722682, 730780, 731945, 732926]
+'SE14 6QD': [728060, 728066, 731238, 731240, 731468, 731470, 731472, 733262, 733267, 733408, 733410]
+'SE15 5TD': [716634, 717523, 718365, 719749, 720428, 721038, 721591, 722133, 723311, 723809, 724255]
+'SE15 6RT': [710796, 711020, 713248, 714527, 715241, 719108, 727706, 729445, 730894, 733049, 741380]
+'SE16 3PB': [741265, 741268, 741271, 741274, 741277, 741279, 741281, 741283, 741284, 741285, 741286]
+'SE18 2PE': [709775, 713349, 714155, 718623, 722320, 725147, 727246, 728983, 730473, 731637, 732638]
+'SE19 3PL': [711535, 723181, 723186, 723189, 723190, 723191, 723192, 731022, 731023, 731024, 731025]
+'SE20 8DL': [710126, 715807, 715852, 715854, 715872, 715873, 715898, 715900, 715902, 741432, 741476]
+'SE23 1JB': [721963, 721964, 721965, 721966, 721968, 721969, 721970, 721971, 721975, 721977, 722243]
+'SE26 5SB': [713852, 714578, 714639, 714689, 714784, 715293, 730375, 731052, 731559, 732191, 735079]
+'SE28 0GX': [726162, 726482, 726791, 727047, 727873, 728806, 729571, 729776, 729968, 730152, 730318]
+'SE6 2BB': [712830, 713403, 714208, 718685, 722387, 725212, 727302, 729040, 730529, 731692, 732689]
+'SE9 1JZ': [711738, 713776, 713843, 714013, 714079, 714658, 714705, 715309, 715348, 715381, 732278]
+'SE9 1LJ': [711040, 715117, 715648, 716151, 720738, 723578, 725445, 727033, 727859, 729274, 731902]
+'SE9 6RD': [716039, 716996, 718277, 718761, 719664, 720014, 720342, 720648, 722063, 722455, 727366]
+'SE9 6RH': [710449, 719400, 720764, 723054, 724055, 724863, 725513, 725804, 726483, 726792, 729340]
+'SO14 6RN': [741080, 741119, 741144, 741168, 741199, 741405, 741438, 741461, 741481, 741499, 741511]
+'SO16 6RL': [712424, 733720, 733905, 734056, 734985, 735766, 736385, 737276, 737627, 737913, 738155]
+'SO16 8FP': [720723, 721021, 722122, 723021, 723566, 724021, 724638, 724832, 725021, 726303, 727026]
+'SO16 9BX': [721099, 721380, 721645, 721906, 722182, 723075, 723343, 723620, 723850, 724074, 724285]
+'SO21 3FT': [709804, 709874, 710025, 710148, 710199, 710260, 710429, 710752, 710976, 711189, 711598]
+'SW4 6QH': [713486, 714277, 715002, 715578, 716061, 718791, 722478, 725310, 729144, 730620, 731785]
+'SW4 6RN': [712802, 713377, 714183, 715512, 715961, 716457, 716922, 718659, 725183, 729014, 730499]
+'TN4 9UR': [710519, 714281, 716553, 717447, 718295, 720361, 720972, 722484, 727394, 730623, 732778]
+'BN13 3GE': [709886, 710040, 710158, 710269, 710351, 710838, 710873, 710892, 710917, 710938, 711054, 711611]
+'BN1 4GT': [713627, 715141, 716176, 717131, 717979, 718955, 719389, 720118, 720753, 725475, 729306, 731929]
+'BN17 7GE': [711820, 711860, 711895, 711924, 712111, 712234, 712332, 712429, 712515, 712579, 712625, 712673]
+'BN2 5PT': [717716, 717727, 718101, 718113, 718134, 718144, 718160, 718500, 718513, 718525, 718540, 718547]
+'BN3 3WA': [712299, 733606, 733616, 733623, 734865, 734875, 734882, 735659, 735667, 735830, 736271, 736279]
+'BN43 5QP': [711791, 711840, 711874, 711908, 712084, 712206, 712305, 712400, 712485, 712552, 712600, 712648]
+'BR6 7EQ': [739557, 739592, 739616, 739637, 739774, 739935, 740027, 740097, 740140, 740171, 740198, 740227]
+'CR0 4YE': [711436, 728873, 729637, 729844, 730031, 730377, 731054, 731204, 731325, 731441, 731561, 732193]
+'CR0 7NQ': [733629, 733835, 733997, 734119, 734888, 735673, 736293, 736786, 737187, 737554, 737837, 738085]
+'CT1 2AE': [713461, 714259, 714981, 715564, 716042, 716533, 717000, 717430, 717871, 730594, 731753, 732750]
+'CT19 5FQ': [741394, 741408, 741411, 741414, 741425, 741448, 741470, 741489, 741506, 741517, 741524, 741527]
+'CT20 3QX': [711793, 712086, 712402, 712650, 733854, 734015, 734136, 735699, 736319, 737211, 737573, 737856]
+'CT6 7EY': [712220, 713650, 714437, 715165, 727587, 729334, 730794, 731959, 732940, 733705, 734969, 736372]
+'DA11 8FT': [709903, 710056, 710171, 710278, 710363, 710466, 710505, 710565, 710617, 711018, 711370, 711631]
+'DA12 2JD': [738936, 738940, 738960, 738963, 738965, 738968, 738970, 738972, 738974, 738976, 738978, 738980]
+'DA12 2PD': [712942, 713498, 714291, 715013, 718807, 722497, 725327, 727406, 729160, 730633, 731802, 732787]
+'DA1 2JD': [738481, 738489, 738499, 738510, 738517, 738525, 738531, 738538, 738546, 738563, 738570, 738576]
+'DA1 2LR': [713742, 719117, 719849, 720520, 721134, 721675, 722213, 723378, 723878, 725632, 729455, 732068]
+'DA1 5LZ': [713636, 714421, 715150, 715668, 716182, 716673, 717139, 717549, 717984, 730778, 731942, 732923]
+'DA1 5NB': [709933, 713918, 713980, 714109, 714618, 714681, 714729, 714778, 714814, 715332, 715364, 715396]
+'DA1 5TY': [709790, 709947, 710095, 710193, 710292, 710377, 710518, 710575, 710735, 711173, 711473, 711696]
+'DA8 1NS': [710665, 710862, 710878, 721416, 721947, 722223, 723107, 723387, 724098, 724316, 724504, 724707]
+'E1 2PD': [712833, 714209, 714922, 716482, 716947, 717389, 717826, 718241, 719633, 720613, 720926, 729043]
+'E1 5EF': [713739, 715246, 716264, 717222, 718062, 719114, 719465, 720185, 720808, 725628, 729451, 732066]
+'E1 5EJ': [713720, 714513, 715730, 716250, 717208, 717616, 719833, 720508, 721121, 721401, 722793, 725605]
+'E2 0BN': [713284, 713760, 715265, 715756, 716772, 717641, 719860, 722852, 727744, 729475, 732090, 733073]
+'E2 6GB': [713061, 714377, 715645, 716632, 717519, 718361, 719744, 720424, 722628, 727528, 730743, 732877]
+'E2 6PZ': [713555, 714334, 716117, 716602, 717931, 719334, 720399, 720707, 725392, 729218, 730686, 732838]
+'E2 7AE': [713212, 715923, 717608, 718443, 720501, 721116, 722199, 725078, 726011, 726956, 730865, 733019]
+'E2 9RG': [713006, 713562, 714340, 715079, 718880, 722566, 725398, 727476, 729221, 730694, 731856, 732844]
+'GU27 3HS': [719775, 720455, 720756, 721353, 721610, 721880, 732925, 733702, 735750, 736369, 736857, 737902]
+'GU28 0EB': [715281, 716290, 719482, 722873, 730931, 733091, 735017, 735326, 735432, 735481, 736417, 737307]
+'GU29 9EH': [728361, 728471, 728593, 728901, 729661, 729865, 729960, 730053, 730144, 731217, 732148, 732257]
+'GU29 9QL': [733703, 734048, 734173, 734383, 734590, 734966, 735751, 736370, 736858, 737258, 737615, 738142]
+'GU31 5DE': [713239, 714523, 715740, 716256, 716749, 717623, 719100, 722805, 727700, 729435, 732050, 733041]
+'KT20 5LH': [713450, 714970, 716034, 716989, 717862, 719257, 720012, 720642, 721257, 721782, 722955, 723501]
+'ME10 4FP': [709783, 710189, 710289, 710373, 710516, 710925, 711033, 711067, 711093, 711111, 711133, 711244]
+'ME10 4GL': [709777, 710403, 710719, 710947, 711157, 711315, 714196, 715525, 716469, 718229, 730518, 732681]
+'ME14 5HQ': [709789, 714246, 715556, 716523, 717419, 718271, 719659, 720333, 722440, 727351, 730579, 732733]
+'ME15 6FL': [711812, 711852, 711889, 711918, 712105, 712224, 712323, 712420, 712506, 712569, 712618, 712666]
+'ME2 2GW': [738391, 738406, 738416, 738446, 738453, 738465, 738473, 738555, 738614, 738719, 738744, 738772]
+'ME5 7TR': [709983, 710469, 713264, 713750, 715255, 722830, 725638, 727721, 729459, 730905, 732075, 733061]
+'N1 7FT': [712994, 713553, 714333, 715069, 718871, 722557, 725389, 727469, 729216, 730682, 731849, 732836]
+'NN2 7TD': [711528, 729922, 730106, 730275, 731108, 731246, 731359, 731480, 732116, 732232, 732331, 732437]
+'NW10 8US': [714117, 714127, 714133, 714136, 714139, 714141, 714143, 714145, 718782, 725303, 729136, 731773]
+'PE1 5ED': [710008, 713279, 714549, 714835, 722847, 725126, 727738, 728956, 728965, 730913, 731610, 733487]
+'PE2 8FB': [711711, 713114, 714426, 716678, 717555, 718391, 719778, 720456, 721062, 722688, 727580, 730784]
+'PE2 8JH': [710696, 713366, 716446, 718207, 719602, 721472, 723200, 723705, 724146, 724543, 724933, 725164]
+'PO10 8UT': [724195, 724592, 725928, 726262, 726728, 726993, 730023, 731202, 731323, 731437, 731558, 732190]
+'PO17 5GT': [712985, 717487, 717923, 718331, 718863, 722549, 725380, 727459, 737231, 737593, 737874, 738121]
+'PO18 0BT': [727888, 728153, 728615, 729584, 729790, 729974, 730164, 730327, 731397, 732156, 733124, 733219]
+'PO18 0PQ': [713157, 714464, 715187, 716215, 721087, 721369, 721634, 722732, 723065, 723610, 724476, 730819]
+'PO18 8AQ': [713139, 714449, 715178, 719003, 722713, 725520, 727603, 729346, 733895, 737619, 737905, 738146]
+'PO19 3JE': [712767, 713355, 714163, 714876, 715502, 716439, 717347, 721195, 721466, 722007, 727251, 731645]
+'PO19 3NR': [736672, 736726, 736957, 737000, 737049, 737404, 737442, 737477, 737506, 737685, 737747, 737777]
+'PO19 6RN': [712888, 713444, 714245, 714963, 717416, 718746, 719658, 735106, 735343, 735447, 735537, 735861]
+'PO19 6ST': [733916, 734194, 734400, 734606, 735470, 735559, 735882, 735977, 736135, 736397, 737288, 737924]
+'PO19 8BE': [722997, 723538, 724003, 724815, 728575, 729748, 730132, 730301, 731380, 731501, 732352, 732541]
+'PO19 8BW': [712922, 719675, 720354, 720964, 721537, 722074, 722472, 723252, 724200, 724595, 730612, 732766]
+'PO20 2AR': [733744, 733927, 734073, 734202, 735011, 735790, 736411, 736894, 737301, 737647, 737936, 738178]
+'PO20 2GN': [711783, 711835, 711872, 711906, 712078, 712201, 712300, 712393, 712479, 712548, 712598, 712643]
+'PO20 2GR': [733725, 733909, 734060, 734189, 734395, 734990, 735770, 736391, 736877, 737282, 737631, 738159]
+'PO20 2JL': [709872, 709952, 710024, 710147, 710197, 710258, 710973, 711186, 711335, 711479, 711596, 711699]
+'PO20 8BE': [713224, 718047, 718448, 725598, 733028, 733914, 734064, 734193, 734399, 734513, 734605, 734677]
+'PO21 5BL': [713439, 714237, 714957, 716021, 716511, 716976, 722429, 727342, 729090, 730570, 731735, 732727]
+'PO3 6FA': [710674, 715971, 716462, 716931, 717373, 717810, 718220, 721487, 722024, 722914, 723210, 723461]
+'PO9 5DJ': [711829, 733594, 733985, 734104, 734855, 735641, 736260, 736761, 737167, 737533, 737814, 738064]
+'RH11 0UP': [713081, 714401, 715131, 717122, 717535, 718375, 719381, 719762, 721600, 730760, 731923, 732901]
+'RH11 8RN': [733670, 733674, 734931, 734937, 735719, 735725, 736338, 736343, 736829, 736835, 737227, 737236]
+'RH12 5YJ': [710894, 718012, 719413, 720773, 721367, 721897, 723063, 723609, 723839, 724065, 724475, 725056]
+'RH16 4FQ': [721139, 721680, 722221, 723386, 723883, 724314, 724705, 725088, 726024, 726353, 726821, 727074]
+'RH20 1HY': [722088, 722985, 723768, 724421, 725946, 736560, 736592, 736616, 736673, 736701, 736727, 736933]
+'RH20 3HW': [709856, 709941, 710013, 710088, 710133, 710243, 710336, 710480, 710722, 711160, 711460, 711687]
+'RH6 8LX': [710315, 713192, 713699, 714486, 715209, 718432, 719056, 725570, 727655, 730848, 732012, 733002]
+'SE11 5TW': [713392, 714197, 715526, 715982, 716470, 716939, 717382, 717817, 718676, 719214, 722375, 725201]
+'SE1 2RX': [733684, 733879, 734039, 734158, 734945, 735734, 736352, 736844, 737244, 737601, 737885, 738131]
+'SE14 5FJ': [712686, 712691, 712696, 712702, 712706, 712712, 712716, 712719, 712723, 712727, 712731, 712735]
+'SE14 5FL': [712687, 712692, 712698, 712703, 712707, 712713, 712717, 712720, 712724, 712728, 712732, 712737]
+'SE14 5RU': [715609, 716099, 716581, 717054, 738431, 738444, 738450, 738471, 738477, 738487, 738497, 738508]
+'SE14 5TL': [713020, 713572, 714350, 715091, 718888, 722584, 725410, 727493, 729235, 730709, 731866, 732855]
+'SE14 6TZ': [715490, 740267, 740295, 740322, 740347, 740522, 740806, 740861, 740901, 740938, 740967, 740996]
+'SE15 5GA': [717206, 718049, 719447, 719885, 719892, 719898, 720212, 720228, 720237, 720241, 720544, 720553]
+'SE15 6QT': [732155, 732364, 733810, 733940, 734085, 734214, 735082, 735841, 736922, 737331, 737955, 738193]
+'SE15 6RF': [738364, 738373, 738380, 738392, 738466, 738556, 738615, 738663, 738701, 738720, 738745, 738773]
+'SE15 6RH': [709843, 713748, 714537, 715252, 719121, 722827, 725636, 727719, 729457, 730904, 732074, 733060]
+'SE15 6RJ': [713304, 713769, 714564, 715277, 719151, 722867, 725670, 727760, 729487, 730928, 732102, 733086]
+'SE15 6RL': [713233, 713726, 714518, 715230, 719096, 722800, 725610, 727695, 729430, 730881, 732044, 733037]
+'SE15 6RR': [715428, 715777, 715799, 715839, 715866, 715892, 716297, 716320, 716343, 716375, 716400, 716815]
+'SE16 4AQ': [711086, 711122, 724626, 724818, 725001, 725759, 725957, 726117, 726447, 726609, 726755, 727016]
+'SE16 5EH': [711925, 712675, 733790, 733937, 734300, 734416, 735055, 736434, 736912, 737322, 737659, 737950]
+'SE18 1QQ': [733689, 733884, 734042, 734163, 734951, 735739, 736358, 736849, 737248, 737608, 737892, 738136]
+'SE19 2JP': [739517, 739538, 739572, 739597, 739755, 739916, 740009, 740077, 740121, 740151, 740178, 740206]
+'SE23 2LN': [710184, 710239, 714851, 715468, 715480, 715484, 716418, 716426, 732618, 732626, 732628, 741306]
+'SE25 6DH': [738788, 738799, 738812, 738838, 738909, 738950, 738989, 739012, 739042, 739065, 739086, 739096]
+'SE26 5RU': [713478, 716056, 717014, 717886, 718783, 719278, 720026, 721797, 722969, 723514, 724410, 731774]
+'SE28 0AL': [723111, 723392, 723657, 723888, 724102, 724318, 724506, 724905, 725091, 725837, 726028, 726197]
+'SE28 0BN': [722905, 723449, 723931, 724361, 724748, 725698, 726380, 726702, 728515, 729504, 730270, 730948]
+'SE9 1LS': [710354, 715180, 716204, 719010, 721894, 723060, 724062, 725807, 726167, 726796, 727877, 728144]
+'SE9 1LW': [711309, 720632, 721775, 723494, 725729, 725916, 726081, 726250, 726407, 726573, 731554, 732188]
+'SE9 6RL': [720147, 721373, 723615, 726491, 726798, 727054, 727879, 728809, 729780, 730156, 730997, 731394]
+'SO14 1NP': [741397, 741409, 741413, 741415, 741428, 741451, 741473, 741492, 741508, 741519, 741526, 741528]
+'SO15 2HD': [741055, 741081, 741085, 741089, 741098, 741120, 741145, 741177, 741205, 741225, 741242, 741255]
+'SO17 2EZ': [723597, 723684, 724046, 724468, 724857, 725797, 726160, 726480, 726789, 727046, 727870, 728138]
+'SO18 5LB': [713278, 713758, 714548, 715261, 719128, 722846, 725647, 727737, 729470, 730912, 732085, 733071]
+'SO22 6FD': [713116, 713644, 714429, 715160, 718984, 722691, 725499, 727583, 729328, 730786, 731952, 732933]
+'SO23 7PS': [712359, 727839, 727980, 736465, 736501, 736532, 736563, 736620, 736650, 736676, 736704, 736730]
+'SO31 1DT': [711053, 711270, 711310, 725022, 726304, 726618, 726901, 727144, 727995, 728464, 728684, 729657]
+'SO31 6ES': [709953, 710198, 710750, 711187, 711481, 711700, 711775, 712070, 712194, 712292, 712386, 712470]
+'SW4 6QG': [714211, 714925, 717829, 718244, 719226, 719635, 722394, 725220, 727306, 730538, 731698, 732695]
+'SW4 6RX': [715121, 715652, 716155, 716643, 717111, 718369, 718933, 719371, 722639, 725450, 727536, 731906]
+'SW9 6AP': [718530, 718531, 718532, 718533, 719492, 719493, 719494, 719495, 719509, 719510, 719511, 736423]
+'SW9 9AU': [733753, 734296, 734411, 734527, 734616, 734685, 734754, 734817, 735018, 735141, 735799, 736418]
+'TN16 3EP': [713763, 714554, 715269, 733076, 733745, 735012, 735791, 736412, 736895, 737302, 737648, 737937]
+'TN26 2JG': [711102, 711121, 711305, 711384, 711558, 711564, 712253, 712262, 712269, 712280, 712345, 712354]
+'BN1 4GP': [713362, 714168, 714881, 715505, 715951, 716443, 716911, 717354, 727257, 728996, 730485, 731651, 732652]
+'BN6 9FD': [721930, 722209, 723097, 723644, 730887, 732054, 733044, 733732, 734997, 735779, 736402, 736883, 737291]
+'CR0 6HB': [716337, 716361, 716383, 716802, 716825, 716842, 716857, 717255, 717287, 717297, 717665, 717678, 717692]
+'DA11 8FB': [719219, 719978, 720609, 721216, 738368, 738384, 738401, 738421, 738439, 738458, 738609, 738696, 738738]
+'DA12 1HJ': [711084, 722046, 722940, 723229, 723488, 723732, 723956, 724179, 724390, 724578, 724775, 724963, 725724]
+'DA9 9DF': [711799, 711845, 711881, 711911, 711935, 712091, 712213, 712311, 712409, 712492, 712558, 712608, 712658]
+'E1 0EA': [720646, 726085, 726413, 726726, 726990, 727812, 728095, 728326, 728550, 728763, 729528, 729733, 729937]
+'E1 2PS': [713133, 713655, 714441, 715171, 715678, 718997, 722705, 725511, 727595, 729339, 730802, 731965, 732950]
+'E1W 1NZ': [713038, 713587, 714363, 715638, 716138, 716622, 718906, 722606, 727507, 729250, 730726, 731883, 732867]
+'E2 7AY': [713315, 714571, 715285, 716294, 717247, 717655, 718083, 719873, 720207, 725677, 727767, 732107, 733093]
+'GU27 3PB': [724037, 726314, 726472, 726634, 726780, 727086, 727863, 727932, 727935, 733603, 734862, 735649, 736268]
+'GU28 0EL': [740280, 740307, 740333, 740355, 740374, 740507, 740674, 740792, 740846, 740886, 740924, 740952, 740981]
+'GU28 9AN': [713732, 716752, 717626, 718459, 719460, 725617, 727702, 730888, 732055, 733045, 735265, 735317, 735372]
+'GU29 9BH': [714284, 715008, 715584, 716067, 716555, 717022, 717894, 722489, 727398, 729149, 730626, 731793, 732780]
+'GU29 9EP': [713631, 716667, 717981, 727565, 729312, 733696, 734799, 734960, 735128, 735193, 735254, 735745, 736366]
+'HA9 9PA': [738358, 738375, 738383, 738400, 738409, 738457, 738550, 738608, 738658, 738695, 738716, 738737, 738766]
+'ME14 2RP': [720134, 720763, 721071, 721620, 722159, 723324, 723828, 724270, 724670, 725051, 725989, 726642, 726922]
+'ME2 1PL': [712957, 713518, 714307, 715037, 716088, 718833, 722519, 725351, 727430, 729181, 730653, 731819, 732808]
+'ME5 0DL': [726075, 726402, 728319, 728538, 728631, 728754, 728833, 729522, 729602, 730960, 731121, 732239, 732339]
+'ME5 7TS': [712808, 713384, 714189, 714905, 715969, 718664, 722362, 725190, 727278, 729024, 730506, 731676, 732669]
+'NW10 8HH': [712900, 714253, 715562, 717425, 718275, 720339, 720952, 721525, 722060, 722449, 727362, 732741, 738410]
+'PE2 8FG': [712616, 733706, 733893, 734049, 734175, 734385, 734970, 735753, 736373, 736860, 737260, 737616, 738144]
+'PE29 3EZ': [711876, 712486, 733653, 733855, 734137, 734357, 734914, 735700, 736320, 736812, 737574, 737857, 738106]
+'PO10 8HJ': [713499, 715014, 721279, 723985, 724417, 725328, 725748, 726103, 727006, 729543, 729744, 729944, 730128]
+'PO10 8JW': [713092, 713626, 714410, 718380, 718953, 719387, 722663, 725474, 732909, 736851, 737251, 737610, 737894]
+'PO18 0BX': [714418, 716670, 718964, 719771, 721877, 722148, 724263, 724659, 725040, 725483, 725983, 731937, 732919]
+'PO18 0ET': [713426, 714227, 714945, 716009, 716498, 716967, 717401, 722419, 725247, 727330, 729074, 731721, 732716]
+'PO19 3NY': [729519, 729721, 729930, 730280, 730957, 731116, 731249, 731367, 731484, 732119, 732236, 732337, 732443]
+'PO19 7LZ': [715101, 716137, 717098, 720085, 720413, 721020, 721326, 722604, 724020, 724245, 725970, 726460, 730725]
+'PO20 0AP': [713209, 713708, 714501, 715218, 716237, 719072, 722781, 725584, 727673, 729409, 730863, 732028, 733017]
+'PO20 0LT': [720287, 720912, 721168, 721485, 723712, 724552, 725891, 726225, 726547, 734821, 735162, 735208, 735327]
+'PO20 0SJ': [712899, 713453, 714973, 715561, 716993, 718756, 722448, 725274, 727361, 729107, 730585, 731745, 732740]
+'PO3 5XH': [713201, 713703, 714493, 715214, 715716, 719063, 722772, 725577, 727664, 729403, 730855, 732022, 733011]
+'RH10 1AP': [712372, 712376, 736540, 736567, 736598, 736625, 736657, 736681, 736945, 736965, 736989, 737010, 737037]
+'RH11 0TU': [724159, 726229, 726553, 726847, 727948, 728642, 729615, 729821, 729999, 730196, 731185, 731541, 732175]
+'RH11 7US': [709844, 714538, 715749, 716272, 718068, 718471, 719470, 719853, 722833, 725640, 727724, 732077, 733063]
+'RH12 5YP': [711140, 711409, 726498, 726929, 727884, 728270, 728705, 728919, 729580, 729785, 730254, 730325, 731000]
+'RH16 4TR': [728199, 728424, 728647, 728852, 729619, 729826, 730005, 730199, 730360, 733145, 733231, 733308, 733376]
+'RH19 3LB': [711951, 734117, 734461, 734556, 734637, 734705, 735159, 735670, 736289, 736782, 737551, 737833, 738082]
+'SE11 5DD': [712761, 713346, 714153, 714867, 715496, 715941, 716435, 716901, 718620, 722318, 725144, 727244, 728979]
+'SE11 5RP': [723265, 723992, 724213, 724420, 724613, 724806, 724988, 726106, 726277, 726434, 727009, 727125, 727832]
+'SE15 6RN': [711082, 719620, 720292, 720919, 721491, 722028, 723213, 723716, 724158, 724556, 724946, 725896, 726552]
+'SE16 4BN': [725932, 738370, 738412, 738423, 738429, 738460, 738486, 738496, 738506, 738551, 738560, 738740, 738767]
+'SE20 7YZ': [710180, 714791, 714792, 714793, 715304, 715306, 715307, 715809, 715813, 715817, 716349, 716353, 716354]
+'SE26 5SD': [713808, 713957, 714730, 716296, 716350, 716865, 717250, 717657, 718087, 718118, 718137, 733155, 733382]
+'SE9 1EJ': [709996, 713920, 713959, 714092, 714110, 714607, 714732, 714779, 714816, 715441, 715823, 733157, 733407]
+'SE9 1LQ': [714381, 716635, 718366, 718927, 719368, 719750, 721039, 721592, 721860, 722631, 723032, 724841, 731899]
+'SE9 1SJ': [710334, 714397, 714831, 715655, 717532, 718554, 720442, 722650, 725124, 728951, 731606, 732896, 733486]
+'SE9 1SN': [714160, 714819, 715917, 717345, 718548, 720267, 720896, 722005, 723196, 723929, 724359, 728298, 732641]
+'SO15 5QW': [713015, 713567, 714346, 715086, 715628, 718885, 722577, 725405, 727486, 729230, 730702, 731860, 732849]
+'SO22 4PR': [741001, 741003, 741006, 741008, 741017, 741027, 741032, 741036, 741042, 741044, 741053, 741054, 741092]
+'SO32 2EW': [712877, 718737, 722425, 725256, 727336, 729085, 730565, 731731, 732722, 733760, 735026, 735804, 736422]
+'SW4 6SU': [713032, 713581, 714358, 715097, 716132, 716618, 718899, 722598, 725422, 727502, 730720, 731877, 732864]
+'BN17 7EF': [710741, 712913, 713468, 714264, 716540, 717434, 718283, 718773, 725292, 727379, 729123, 730601, 731761, 732755]
+'BN43 6NR': [713783, 713815, 713859, 713898, 713935, 733161, 733210, 733243, 733285, 733318, 733350, 733388, 733430, 733462]
+'BN6 9YJ': [711138, 711248, 711264, 711278, 711386, 711402, 711417, 711565, 711644, 711653, 711659, 711666, 711671, 711734]
+'CT5 1JZ': [713222, 713716, 714508, 715223, 715726, 716243, 719082, 722791, 725597, 727686, 729417, 730872, 732038, 733026]
+'DA11 0JA': [711809, 711851, 711888, 711917, 711940, 711961, 712101, 712223, 712321, 712419, 712502, 712566, 712615, 712664]
+'DA11 7BU': [711897, 712336, 713635, 731939, 733750, 733929, 734204, 735014, 735796, 736899, 737304, 737651, 737939, 738181]
+'DA11 8DP': [726746, 727008, 727975, 728230, 728450, 728673, 728876, 729639, 729845, 730033, 730221, 730378, 731055, 731205]
+'DA14 5HN': [711070, 711442, 719285, 720034, 720669, 726426, 726741, 727002, 727824, 730973, 731132, 731258, 731377, 733281]
+'E1 5EE': [717632, 718466, 719847, 720518, 721132, 721673, 722212, 723377, 723877, 724309, 724699, 725083, 726020, 726350]
+'E2 6FS': [730972, 731257, 731376, 732135, 732249, 732453, 733754, 733755, 733756, 733757, 735019, 735020, 735021, 735022]
+'E2 6GA': [713182, 713691, 715200, 716227, 717185, 718027, 719047, 719428, 722758, 725561, 727643, 729386, 730839, 732004]
+'GU27 3PD': [713787, 713820, 713864, 713904, 713966, 714036, 714066, 714100, 714587, 733215, 733355, 733392, 733433, 733466]
+'GU27 3QY': [717042, 717466, 718831, 720376, 720683, 720988, 721293, 722096, 722517, 722993, 723534, 723775, 725349, 729180]
+'GU28 0EH': [713059, 713602, 715111, 715644, 717106, 719364, 720096, 720735, 721336, 721858, 722627, 734946, 736353, 737886]
+'GU29 0AP': [709863, 709945, 710019, 710139, 710191, 710250, 710290, 710342, 710374, 711168, 711324, 711469, 711585, 711693]
+'GU29 9HP': [739523, 739545, 739579, 739603, 739626, 739648, 739762, 739923, 740015, 740084, 740127, 740158, 740185, 740214]
+'GU31 5LE': [725923, 726255, 726579, 726988, 727809, 727965, 728094, 728212, 728324, 728546, 728660, 728862, 729629, 729730]
+'ME1 1GW': [711781, 711832, 711870, 711904, 711930, 711949, 712075, 712199, 712297, 712391, 712476, 712545, 712595, 712641]
+'ME14 1HQ': [711526, 713309, 713771, 714567, 715279, 715768, 716289, 719155, 722871, 725673, 727763, 729490, 732105, 733090]
+'ME14 2EQ': [717242, 718078, 719480, 720201, 720827, 721425, 721955, 722236, 723117, 723400, 723662, 724107, 724511, 724909]
+'ME14 2PW': [711504, 713149, 713669, 714455, 715183, 716208, 716700, 719015, 722722, 725531, 727614, 729355, 731980, 732964]
+'ME15 6YJ': [712880, 713438, 714235, 714956, 715551, 716020, 718738, 722427, 725257, 727340, 729089, 730569, 731734, 732726]
+'ME15 7FA': [711762, 711826, 711865, 711900, 711926, 711945, 712058, 712183, 712283, 712379, 712462, 712535, 712587, 712633]
+'N7 9EH': [713847, 713988, 714577, 714687, 715290, 715337, 715368, 715402, 715797, 715837, 715865, 715890, 716318, 716342]
+'NW10 8DF': [713475, 714991, 716053, 717009, 718777, 723511, 723973, 724407, 724794, 725300, 726094, 726417, 729130, 731770]
+'NW10 8EZ': [727900, 728394, 728624, 728826, 729595, 729979, 730172, 730332, 738707, 739115, 739116, 739214, 739215, 739216]
+'NW10 8NX': [713786, 713863, 713999, 714065, 714586, 714646, 714693, 714745, 714788, 715297, 715341, 715370, 733354, 733432]
+'PE2 9BQ': [713260, 716764, 719120, 722826, 725635, 733921, 734068, 734198, 734404, 736888, 737295, 737640, 737930, 738171]
+'PO12 1HH': [734094, 734218, 734219, 734222, 734232, 734236, 734309, 734422, 734426, 734434, 734438, 734443, 734540, 734542]
+'PO12 1HQ': [733948, 733953, 733970, 737393, 737412, 737470, 737482, 737767, 738000, 738013, 738022, 738042, 738209, 738219]
+'PO18 0AY': [712869, 714229, 716500, 716968, 717402, 717846, 718257, 720936, 721237, 723487, 724178, 725249, 727331, 729076]
+'PO18 8DR': [715044, 715603, 719312, 720994, 721823, 722527, 722998, 723540, 723782, 724226, 725955, 726608, 728454, 730035]
+'PO19 3NJ': [723243, 726259, 726583, 726870, 727112, 727968, 728217, 728439, 728663, 730213, 735294, 735403, 735495, 735582]
+'PO19 3NZ': [728855, 729622, 729829, 730010, 730202, 731037, 731191, 731315, 731426, 731548, 732179, 732288, 732386, 732493]
+'PO19 6UY': [713801, 713951, 713984, 732573, 733143, 733229, 733307, 733374, 733421, 737981, 738004, 738028, 738195, 738207]
+'PO19 7NQ': [729708, 729813, 729911, 729993, 730350, 730947, 731026, 731179, 731304, 731416, 731474, 731537, 732109, 732228]
+'PO20 0BW': [725039, 725982, 726155, 726476, 726636, 726914, 727040, 727155, 728009, 728135, 728259, 728598, 728798, 729562]
+'PO20 1PJ': [720527, 720819, 721417, 721949, 723389, 723655, 723886, 724505, 726027, 726195, 726520, 728169, 728824, 728933]
+'PO8 8EL': [740239, 740268, 740296, 740323, 740348, 740364, 740493, 740660, 740778, 740832, 740872, 740910, 740939, 740968]
+'RH11 8RG': [711205, 711348, 713095, 713629, 714414, 715143, 716177, 716666, 718957, 722666, 725477, 730770, 731930, 732914]
+'RH12 3XE': [710324, 710393, 710535, 710594, 710633, 710666, 710711, 710843, 711106, 711127, 711151, 711258, 711274, 711287]
+'RH14 0BU': [713408, 714930, 715996, 716951, 718697, 721222, 721756, 722926, 725224, 727802, 735223, 736032, 736107, 736174]
+'RH14 9RW': [710343, 710375, 715544, 716012, 716503, 716971, 719239, 719648, 719997, 720319, 720626, 720939, 721239, 721510]
+'RH15 0GZ': [733654, 733856, 734016, 734138, 734263, 734358, 734915, 735701, 736321, 736813, 737212, 737575, 737858, 738107]
+'RH15 9EG': [710330, 717299, 717310, 717667, 717695, 717714, 717725, 718099, 718111, 718132, 718142, 718159, 718498, 718511]
+'RH16 1EF': [712277, 712366, 712375, 712436, 736228, 736474, 736504, 736538, 736566, 736596, 736624, 736680, 736712, 736964]
+'RH20 1PE': [714959, 716513, 717410, 729091, 733644, 734009, 734902, 735688, 736147, 736215, 736308, 736491, 736554, 738098]
+'SE10 8ED': [711862, 712126, 733693, 733952, 733959, 734956, 735143, 735144, 735145, 735146, 735147, 735148, 735149, 735743]
+'SE14 5FU': [709995, 709998, 710000, 710002, 710003, 710004, 710065, 710068, 710070, 710073, 710077, 710078, 710080, 710081]
+'SE25 4SP': [733801, 733938, 734083, 734212, 734301, 734417, 735068, 735832, 736438, 736914, 737324, 737662, 737952, 738191]
+'SE25 6DF': [733673, 733873, 734031, 734152, 734271, 734370, 734936, 735724, 736342, 736834, 737235, 737595, 737877, 738123]
+'SE26 4PG': [710539, 714829, 714845, 715090, 715473, 716884, 716891, 718553, 718565, 719565, 719928, 721982, 721992, 731864]
+'SE28 0PD': [710911, 721613, 721883, 722154, 723048, 723323, 723598, 723823, 724047, 724267, 724664, 724858, 725044, 725798]
+'SE8 5NJ': [711273, 723844, 724279, 724678, 725060, 725998, 726328, 726652, 726925, 727167, 728018, 741364, 741365, 741366]
+'SE8 5PR': [713166, 713677, 715189, 715697, 716707, 717585, 719029, 722741, 725546, 727625, 729367, 730821, 731988, 732976]
+'SE8 5UT': [739524, 739546, 739580, 739604, 739627, 739649, 739763, 739924, 740016, 740085, 740128, 740159, 740186, 740215]
+'SE9 1EN': [711388, 726435, 727083, 727833, 727931, 728110, 728340, 728775, 729746, 729804, 729947, 729986, 730336, 731379]
+'SE9 1SH': [716413, 718168, 719378, 720250, 720746, 720860, 721345, 721451, 724121, 725463, 725788, 725870, 727217, 731919]
+'SO18 2PE': [712433, 712580, 733751, 733930, 734076, 734205, 734295, 734409, 735015, 735797, 736415, 737305, 737940, 738182]
+'SO21 1PR': [712974, 713534, 714318, 715051, 716098, 716580, 718852, 722535, 725367, 727445, 729198, 730669, 731834, 732820]
+'SO31 8HW': [713301, 713630, 714415, 715144, 715764, 716178, 719145, 722864, 725667, 727758, 729311, 730772, 731932, 732915]
+'SW4 6SX': [713075, 713616, 714396, 715126, 715654, 716162, 717119, 717530, 718938, 720107, 720440, 725460, 729290, 732894]
+'SW4 6SZ': [713529, 715045, 715604, 717472, 717911, 718317, 718845, 719313, 720381, 722528, 727441, 730663, 731828, 732815]
+'BN1 4GR': [713213, 713710, 714504, 715220, 715723, 716239, 716735, 719074, 722784, 725587, 727677, 729412, 730866, 732031, 733020]
+'BN2 9SA': [712378, 725540, 727621, 729362, 733568, 733581, 733593, 734829, 734843, 734854, 735618, 735630, 735640, 736240, 737156]
+'BN3 2SB': [711886, 711938, 711979, 733704, 733892, 734174, 734384, 734591, 734968, 735752, 736371, 736859, 737259, 737903, 738143]
+'CR0 4WH': [737725, 737740, 737753, 737770, 737782, 737793, 737800, 737966, 737977, 737989, 738002, 738015, 738026, 738037, 738044]
+'CR2 0PA': [733576, 733587, 734837, 734849, 735626, 735635, 736247, 736255, 736757, 738783, 738903, 738944, 738984, 739008, 739036]
+'CT18 7QP': [728372, 728602, 728803, 729567, 729773, 729965, 731149, 731277, 731389, 732513, 732591, 733167, 733250, 733325, 733395]
+'DA1 5LY': [711435, 711447, 711538, 711545, 711553, 711560, 711569, 711647, 711655, 711661, 711668, 711673, 711735, 711741, 711745]
+'DA9 9FW': [710303, 713549, 714331, 715065, 716112, 716595, 717069, 717925, 718335, 719328, 719717, 720069, 720394, 731845, 732832]
+'E1 2PE': [712898, 713451, 716035, 716528, 716990, 717424, 717863, 719258, 719662, 720338, 720643, 720951, 727358, 729104, 732738]
+'E1 2PY': [723128, 723129, 723139, 723155, 723167, 723404, 723408, 723418, 723419, 723665, 723668, 723669, 723672, 723674, 723676]
+'E2 6LY': [714448, 716695, 717573, 720466, 721078, 722165, 722710, 725991, 726646, 727601, 728263, 728914, 729672, 730064, 730247]
+'E2 7AQ': [714355, 715094, 716128, 717091, 718347, 719344, 719731, 720409, 720716, 721016, 721321, 722592, 729240, 730715, 731872]
+'GU28 0EX': [713715, 714507, 716242, 717202, 717613, 720505, 721664, 721923, 723090, 723364, 723635, 725596, 730871, 732037, 733025]
+'GU28 0EZ': [716637, 723577, 724842, 725782, 727532, 733880, 734159, 734948, 735415, 735509, 735551, 736355, 737603, 737888, 738132]
+'GU29 9PG': [713236, 713729, 714521, 715233, 716253, 716748, 718455, 719453, 719837, 720177, 720511, 735776, 736398, 736880, 737289]
+'GU31 5QW': [728167, 735604, 735931, 735983, 736166, 736233, 736482, 740362, 740386, 740408, 740429, 740451, 740472, 740491, 740539]
+'ME1 1GX': [711782, 711834, 711871, 711905, 711931, 711950, 711970, 712077, 712200, 712298, 712392, 712478, 712547, 712597, 712642]
+'ME16 9DZ': [711774, 711777, 712069, 712071, 712193, 712195, 712291, 712293, 712385, 712387, 712469, 712471, 712540, 712591, 712637]
+'ME20 7GP': [709957, 710028, 710204, 711599, 711704, 713548, 715618, 716111, 717067, 717488, 717924, 718334, 719327, 729211, 730677]
+'ME2 2GA': [712917, 714267, 716054, 716544, 717010, 717438, 717882, 718778, 719275, 725301, 727384, 729131, 730608, 731771, 732761]
+'N1 7DH': [717226, 717636, 718065, 718469, 719469, 719851, 720187, 720523, 720813, 721135, 721412, 721677, 721939, 722217, 723102]
+'N7 9EX': [714296, 715590, 716563, 717456, 720367, 720976, 722086, 722504, 723263, 724611, 724987, 725943, 727413, 730639, 732793]
+'NW10 8HQ': [728667, 728870, 729843, 730029, 730217, 730376, 731053, 731203, 731324, 731439, 731560, 732192, 732298, 732394, 732500]
+'PO10 8BE': [711985, 712171, 712432, 733749, 734075, 734683, 734815, 735206, 735430, 735608, 735795, 735933, 736021, 736099, 736168]
+'PO10 8NY': [717560, 718394, 721065, 722155, 724269, 724666, 725046, 726919, 728907, 729667, 730060, 731223, 734545, 734546, 734547]
+'PO18 0DF': [713312, 713773, 714569, 715283, 715769, 716292, 716785, 717245, 717654, 718082, 722874, 727765, 729492, 730933, 732106]
+'PO18 0EG': [713240, 713730, 715236, 716257, 716750, 717214, 717624, 719101, 722806, 725615, 727701, 729436, 730885, 732051, 733042]
+'PO19 1DE': [713790, 718089, 733435, 734539, 734541, 734543, 734620, 734621, 734622, 734624, 734626, 734687, 734690, 734692, 734694]
+'PO19 6AN': [713510, 715025, 716078, 718822, 722509, 725339, 729174, 729544, 738817, 738874, 738886, 738898, 739015, 739068, 739099]
+'PO19 7BD': [733861, 734921, 735708, 736328, 736819, 737217, 737582, 737864, 738114, 738816, 738842, 738873, 738880, 738885, 738891]
+'PO19 8DE': [717475, 718321, 720386, 720997, 721555, 722102, 723279, 723783, 724229, 729196, 731833, 733669, 734487, 735717, 737590]
+'PO20 0PA': [713087, 713621, 715136, 715659, 716169, 716658, 717123, 718947, 719384, 724036, 724460, 726471, 727037, 727553, 730764]
+'PO20 1AG': [709943, 710017, 710136, 710190, 710248, 710730, 710957, 711167, 711322, 711467, 711582, 711790, 711839, 712083, 712647]
+'PO20 2ET': [714188, 716928, 717807, 718662, 719207, 719966, 720286, 720597, 721484, 722022, 722360, 725704, 726971, 729022, 731674]
+'PO20 8AY': [713101, 713633, 714417, 715147, 716180, 716669, 717134, 718963, 722671, 725482, 727569, 729317, 730775, 731936, 732918]
+'PO20 8AZ': [709806, 710026, 710261, 710300, 710348, 710430, 711483, 711955, 712211, 712308, 712489, 712605, 712654, 734486, 736827]
+'PO21 5BQ': [710988, 714389, 716157, 716644, 717112, 717965, 718935, 722640, 727538, 729281, 731910, 733883, 734162, 737607, 738135]
+'PO2 7RB': [724462, 724526, 724849, 724919, 725790, 725871, 726153, 726211, 726473, 726534, 726782, 726832, 727039, 727087, 727865]
+'PO5 3AQ': [733662, 733863, 734025, 734144, 734364, 734482, 734574, 734923, 735710, 736330, 736821, 737219, 737584, 737866, 738116]
+'RH1 2AY': [710283, 713308, 713770, 714565, 715278, 716288, 716783, 719153, 722870, 725672, 727762, 729489, 730930, 732104, 733089]
+'RH13 9GF': [726419, 726735, 726998, 727114, 727820, 727971, 728105, 728220, 728331, 728443, 728558, 728666, 728769, 728869, 729635]
+'RH14 0NA': [726349, 727071, 737145, 737352, 737396, 737413, 737450, 737472, 737483, 737498, 737711, 737724, 737739, 737752, 737769]
+'RH1 6GB': [711458, 712790, 714176, 716452, 717361, 718211, 719605, 720276, 720906, 721478, 722014, 722348, 723205, 727265, 732658]
+'SE10 0AB': [726570, 726859, 727958, 728088, 728205, 728318, 728537, 728753, 729521, 729625, 729723, 730014, 730206, 730365, 741343]
+'SE14 5FN': [712040, 712042, 712044, 712045, 712046, 712047, 712048, 712049, 712050, 712051, 712052, 712053, 712054, 712055, 712056]
+'SE15 6RB': [721438, 721693, 721695, 721698, 721700, 721705, 721957, 735044, 735814, 736430, 736908, 737316, 737656, 737948, 738189]
+'SE18 4PT': [712582, 712583, 730032, 730220, 730294, 731442, 731499, 731562, 732137, 737505, 737669, 737698, 737731, 737746, 737760]
+'SE20 8TZ': [710951, 711318, 711786, 711836, 711952, 711971, 711990, 712080, 712203, 712302, 712395, 712482, 712550, 712599, 712644]
+'SE25 6LB': [739513, 739534, 739568, 739594, 739617, 739640, 739661, 739751, 739911, 740005, 740072, 740117, 740146, 740174, 740201]
+'SE8 3AG': [715006, 717020, 717892, 719286, 720035, 720670, 722978, 723523, 723982, 724415, 725745, 726742, 728562, 729539, 729943]
+'SO16 8FR': [711392, 711425, 711548, 729707, 729812, 729910, 729992, 730268, 731178, 731303, 731415, 731473, 732172, 733300, 733416]
+'SO31 8JA': [710282, 713767, 715275, 716285, 718079, 719146, 719481, 720202, 720828, 721956, 723118, 723663, 725668, 729485, 732100]
+'BN11 5DT': [712426, 712574, 733727, 733911, 734061, 734191, 734288, 734397, 734511, 734603, 734992, 735772, 736393, 737284, 737920, 738161]
+'BN1 1XF': [733588, 733820, 733984, 734103, 734242, 734334, 734451, 734550, 734850, 735636, 736256, 736758, 737164, 737531, 737813, 738063]
+'BN1 4ZH': [733639, 733842, 734006, 734124, 734257, 734348, 734469, 734562, 734895, 735684, 736302, 736797, 737196, 737561, 737844, 738093]
+'BN8 5LW': [709899, 709975, 710051, 711009, 711367, 711626, 713205, 715720, 716235, 716730, 717196, 719068, 722776, 727669, 730858, 733014]
+'BR3 1HH': [739526, 739548, 739582, 739606, 739629, 739651, 739671, 739690, 739765, 739926, 740018, 740087, 740130, 740161, 740188, 740217]
+'BR6 0NN': [733596, 733821, 733986, 734105, 734244, 734336, 734453, 734857, 735643, 736262, 736763, 737169, 737535, 737816, 738066, 738895]
+'CR0 2SG': [712239, 712627, 733784, 733936, 734082, 734211, 734299, 734414, 734530, 734619, 735046, 736431, 736909, 737318, 737657, 738190]
+'DA11 9FB': [738441, 738448, 738469, 738475, 738485, 738494, 738504, 738513, 738522, 738528, 738535, 738542, 738559, 738566, 738573, 738579]
+'E1 0LN': [715513, 716923, 717368, 719610, 720280, 721206, 721482, 721741, 722018, 723458, 723937, 724152, 729015, 730500, 731667, 732664]
+'E1 5DA': [713419, 714938, 716005, 716960, 717841, 718715, 719235, 719993, 720622, 721229, 721762, 722931, 723477, 725237, 729066, 731714]
+'E2 0BG': [715032, 715598, 716083, 716571, 717463, 718308, 719693, 720985, 721289, 721813, 722093, 722515, 722990, 723270, 725347, 730650]
+'E2 6ND': [713200, 714492, 715213, 715715, 716233, 717194, 717603, 718038, 719062, 719819, 725576, 727663, 729402, 730854, 732021, 733010]
+'GU29 9PQ': [733694, 733887, 734044, 734167, 734278, 734379, 734497, 734734, 734957, 735190, 735251, 735310, 736363, 737253, 737896, 738138]
+'ME12 3UF': [710163, 710272, 710310, 710356, 710384, 710499, 710528, 710560, 710586, 710614, 710629, 710644, 710661, 710706, 710840, 710875]
+'ME4 6PG': [711684, 712791, 713372, 714177, 714892, 715958, 716453, 716917, 717362, 718653, 722349, 725175, 727266, 729007, 730494, 731659]
+'MK10 9SF': [712209, 733656, 733858, 734019, 734140, 734265, 734360, 734478, 734569, 734917, 736324, 736815, 737214, 737578, 737860, 738110]
+'N1 8PT': [733574, 733584, 734177, 734593, 734739, 734836, 734845, 735257, 735366, 735624, 735631, 736245, 736252, 736748, 736755, 737162]
+'NW10 8NY': [728797, 729560, 729769, 729962, 730148, 730313, 730989, 731146, 731273, 731386, 731512, 732359, 732461, 732547, 733116, 733214]
+'PE3 8EQ': [709956, 710431, 711192, 711484, 711702, 712970, 713532, 715048, 715607, 716095, 716578, 717051, 722531, 725363, 729193, 731831]
+'PO12 1HE': [733969, 733976, 737363, 737406, 737429, 737687, 737702, 737719, 737762, 737779, 737986, 737998, 738010, 738021, 738032, 738236]
+'PO18 0HT': [714181, 714895, 715511, 716455, 717364, 717798, 719200, 719607, 719962, 720278, 722353, 725179, 727270, 729011, 731663, 732662]
+'PO18 8HH': [710795, 711818, 712109, 712886, 716027, 716522, 720330, 720946, 722055, 722439, 723740, 724188, 724970, 725919, 727348, 730577]
+'PO19 6PB': [713833, 713917, 713978, 714616, 714679, 714776, 714812, 715330, 726199, 727077, 727902, 728396, 728626, 732522, 733257, 733333]
+'PO19 6SY': [735964, 736052, 736123, 736467, 736533, 736594, 736651, 736705, 736937, 736984, 737031, 737078, 737121, 737344, 737388, 737703]
+'PO19 7HQ': [712972, 717915, 718320, 718850, 719315, 719705, 720057, 720385, 720694, 720996, 723000, 723543, 729195, 730668, 732819, 733868]
+'PO19 8AH': [723014, 724633, 725768, 726128, 726297, 727021, 728243, 728584, 729654, 729759, 729856, 730044, 730391, 731065, 731214, 731331]
+'PO20 2DN': [713204, 713704, 714497, 715215, 716729, 717604, 718040, 719067, 719823, 720164, 720496, 720793, 721111, 721394, 721660, 727668]
+'RH12 5YD': [710708, 711628, 713723, 714516, 715229, 715735, 716746, 718052, 719092, 719452, 720175, 721403, 721668, 722796, 729427, 733035]
+'RH1 2BF': [709797, 710142, 713497, 714287, 715011, 716557, 717024, 717451, 718802, 722493, 725323, 727402, 729153, 730629, 731797, 732783]
+'RH15 8NY': [712013, 712229, 733721, 733907, 734058, 734187, 734415, 734508, 734601, 734986, 736387, 736874, 737278, 737629, 737915, 738157]
+'RH20 1HZ': [730223, 730298, 730380, 730976, 736958, 736980, 737002, 737028, 737096, 737117, 737341, 737361, 737385, 737405, 737443, 737463]
+'RH6 9EY': [710850, 721243, 721771, 722943, 723958, 724182, 724392, 724581, 724777, 724965, 725726, 725913, 726077, 726248, 726404, 726572]
+'SE11 5TY': [722033, 723466, 724163, 724374, 724561, 724760, 724950, 726233, 726557, 726976, 727097, 727798, 728196, 728311, 728421, 728529]
+'SE1 1AP': [734760, 735085, 735151, 735211, 735274, 735328, 735386, 735433, 735523, 735525, 735569, 735845, 735893, 735938, 736024, 736025]
+'SE14 5FX': [712683, 712689, 712695, 712701, 712705, 712710, 712715, 712718, 712722, 712726, 712730, 712734, 712736, 712738, 712739, 712740]
+'SE14 6QQ': [710397, 717733, 717761, 718559, 718570, 719911, 719921, 719934, 726688, 726954, 726958, 728294, 728295, 728297, 730091, 730095]
+'SE16 3PN': [738789, 738800, 738813, 738839, 738857, 738863, 738871, 738879, 738910, 738951, 738990, 739013, 739043, 739066, 739087, 739097]
+'SE1 7JR': [741056, 741058, 741099, 741100, 741122, 741123, 741147, 741148, 741179, 741180, 741207, 741208, 741226, 741227, 741243, 741244]
+'SE26 6XQ': [712975, 713536, 714320, 715052, 715610, 716100, 716583, 717057, 718854, 722537, 725368, 727446, 729199, 730670, 731835, 732822]
+'SE7 8UH': [733774, 733934, 734079, 734208, 734297, 734412, 734528, 734617, 735036, 735811, 736424, 736904, 737313, 737654, 737945, 738186]
+'SE9 6RJ': [711057, 713164, 714467, 715696, 717584, 718414, 719799, 722176, 722740, 723337, 723845, 725061, 727168, 728019, 728482, 728916]
+'SO15 3DJ': [713089, 713622, 714407, 715137, 715660, 716171, 716660, 717126, 718950, 722659, 725471, 727556, 729302, 730766, 731927, 732906]
+'SO18 5LA': [713223, 713717, 714509, 715224, 715727, 716244, 716738, 717203, 719083, 733027, 741140, 741165, 741196, 741221, 741238, 741253]
+'SW8 1BD': [712915, 715568, 716052, 716542, 717007, 717879, 718775, 719272, 720022, 720351, 720654, 720960, 725297, 729128, 730606, 731768]
+'SW9 0AD': [718910, 724525, 724531, 724917, 724922, 724924, 725869, 725873, 733768, 733772, 733778, 733779, 733781, 735032, 735042, 735048]
+'BN3 5GF': [733503, 733504, 733505, 733524, 733525, 733526, 733530, 733531, 733532, 733535, 733536, 733541, 733542, 733546, 733547, 733551, 733555]
+'BR5 2PJ': [712988, 718332, 719325, 719716, 720066, 720393, 720702, 721002, 721310, 721567, 721831, 722110, 723005, 723288, 723550, 723789, 724437]
+'CT1 1JZ': [713068, 715119, 715650, 716154, 716641, 717110, 718932, 722638, 725449, 733875, 734033, 734662, 736837, 737237, 737596, 737878, 738125]
+'CT5 1SW': [709859, 710016, 710134, 710245, 710340, 711433, 711446, 715733, 716745, 717619, 718453, 719225, 719835, 720510, 721124, 721667, 722205]
+'DA1 2GF': [725920, 726084, 726254, 726410, 726577, 738474, 738484, 738493, 738503, 738512, 738521, 738527, 738534, 738541, 738558, 738565, 738572]
+'DA1 2NF': [721739, 722016, 722910, 723456, 723710, 723935, 724150, 724548, 724752, 724939, 729612, 729710, 729817, 729916, 735899, 736104, 738710]
+'E1 5EZ': [713610, 715120, 715651, 716642, 717526, 717963, 719754, 720432, 721862, 724031, 724650, 724843, 725033, 725783, 725975, 726146, 729278]
+'E2 6FR': [712945, 713502, 714294, 715017, 715589, 716072, 716560, 717028, 717453, 718809, 722499, 725331, 727409, 729162, 730635, 731805, 732790]
+'GU27 3PA': [730058, 730242, 730314, 730404, 730990, 731074, 731147, 731513, 731575, 732205, 732310, 732511, 732548, 732588, 733117, 733165, 733182]
+'GU29 9HR': [740244, 740273, 740301, 740328, 740352, 740369, 740392, 740414, 740435, 740498, 740665, 740783, 740837, 740877, 740915, 740943, 740973]
+'GU29 9HS': [740266, 740294, 740321, 740345, 740363, 740387, 740409, 740430, 740452, 740521, 740689, 740805, 740860, 740900, 740937, 740966, 740995]
+'GU29 9TH': [713199, 717193, 717602, 718036, 719061, 719436, 720790, 721108, 722771, 725575, 727662, 729401, 732020, 733007, 734059, 734394, 734509]
+'GU31 5LQ': [713753, 727728, 729466, 736019, 736097, 736140, 736512, 736572, 736603, 740556, 740571, 740584, 740597, 740610, 740623, 740635, 740647]
+'GU6 7FY': [710934, 711048, 711066, 711083, 711092, 711100, 711110, 711132, 711243, 711261, 711276, 711288, 711303, 711381, 711394, 711406, 711423]
+'ME10 4JL': [713660, 715175, 716200, 716688, 717159, 717569, 718002, 718398, 719403, 719787, 720463, 721074, 721623, 722161, 723326, 723830, 724271]
+'ME15 6NS': [711813, 711853, 711890, 711919, 711941, 711962, 711981, 711999, 712012, 712106, 712226, 712324, 712421, 712507, 712570, 712619, 712667]
+'ME7 1TD': [720934, 721508, 722045, 723228, 723731, 724177, 724577, 724962, 738621, 738629, 738639, 738646, 738653, 738666, 738670, 738676, 738682]
+'ME9 9SS': [713604, 715113, 719747, 720426, 723310, 723808, 724254, 724647, 725030, 726310, 726628, 726906, 727151, 728000, 728252, 728898, 729659]
+'NW10 8HF': [739222, 739231, 739243, 739252, 739261, 739270, 739279, 739288, 739297, 739322, 739391, 739424, 739439, 739448, 739457, 739466, 739475]
+'NW10 8UW': [713762, 716280, 717238, 719137, 720823, 723112, 723658, 724103, 724507, 725656, 725838, 726522, 726823, 727075, 729477, 732093, 738599]
+'PO10 8TH': [715653, 717116, 717529, 717968, 719375, 719759, 723035, 723581, 724033, 724455, 725785, 726469, 726778, 727035, 728364, 729286, 731914]
+'PO10 8UR': [718281, 719670, 720347, 720958, 721530, 722068, 723748, 735450, 735539, 735863, 735955, 736043, 736116, 736182, 736461, 736527, 736588]
+'PO19 3NH': [712813, 713387, 714195, 714911, 715521, 715974, 716463, 716933, 717376, 718669, 722366, 725194, 727283, 729028, 730512, 731680, 732675]
+'PO19 3NW': [713503, 715018, 716073, 717029, 717899, 718810, 719294, 720039, 720673, 721282, 721808, 722983, 723528, 723989, 724418, 725333, 729163]
+'PO19 7AR': [737432, 737449, 737468, 737481, 737495, 737513, 737675, 737690, 737708, 737722, 737736, 737751, 737765, 737781, 737791, 737799, 737975]
+'PO19 8FA': [713281, 719131, 722849, 724711, 724903, 725090, 725650, 727185, 727741, 727899, 728040, 735378, 735427, 735477, 735518, 735564, 735605]
+'PO20 7DX': [713491, 716065, 717446, 717890, 719681, 720031, 720360, 720971, 721276, 721804, 722080, 722483, 723256, 723980, 724204, 725314, 729147]
+'PO3 6DS': [712777, 713361, 714167, 714880, 716442, 717352, 718204, 718638, 719600, 720272, 722334, 725160, 727256, 728995, 730484, 731650, 732651]
+'PO5 4BZ': [711815, 711856, 711894, 711922, 711942, 711964, 711982, 712000, 712014, 712107, 712230, 712327, 712425, 712510, 712573, 712622, 712670]
+'RH10 6GH': [711803, 711848, 711884, 711914, 711937, 711958, 711977, 711996, 712009, 712095, 712217, 712315, 712413, 712496, 712561, 712611, 738133]
+'RH12 5YR': [710169, 710688, 710707, 710876, 710896, 711008, 711513, 711623, 713697, 714484, 716722, 719055, 721652, 723080, 724488, 724686, 727654]
+'RH1 2BP': [739516, 739537, 739571, 739596, 739620, 739642, 739663, 739682, 739701, 739754, 739915, 740008, 740076, 740120, 740150, 740177, 740205]
+'RH19 2SG': [710214, 713172, 713681, 714471, 715193, 716219, 717176, 717587, 718017, 718416, 719035, 722746, 725550, 727631, 729373, 730828, 732981]
+'SE10 9PF': [710827, 710915, 714992, 717011, 720875, 721444, 721454, 723249, 724524, 724530, 725302, 726418, 726734, 727819, 728104, 741330, 741333]
+'SE11 5RW': [713508, 716077, 716566, 717033, 717458, 717903, 718819, 719687, 720042, 720371, 720676, 720979, 721286, 722508, 727417, 730642, 732797]
+'SE11 5TP': [713775, 713841, 713922, 713982, 714053, 714078, 714574, 714596, 714657, 714684, 714780, 715287, 715308, 715366, 715380, 733418, 733445]
+'SE12 9QE': [721532, 722070, 723247, 723750, 724196, 724593, 724977, 725930, 726264, 726586, 726873, 727113, 727970, 728219, 728442, 728665, 728868]
+'SE14 6DN': [718037, 718437, 719437, 719818, 720161, 720495, 720791, 721109, 721658, 722193, 723085, 723630, 723861, 724083, 724292, 724688, 724888]
+'SE18 1BJ': [712962, 714310, 715601, 717470, 718314, 719701, 720378, 720992, 722098, 723275, 723780, 724622, 724996, 727434, 729549, 730658, 732812]
+'SE18 4AB': [711788, 711838, 711907, 711932, 712398, 712480, 712551, 712646, 718648, 722342, 734002, 734892, 735678, 736297, 736783, 737191, 737841]
+'SE22 9AE': [713202, 714832, 714847, 715463, 715476, 715922, 715928, 716728, 719065, 722775, 725578, 728954, 728963, 731609, 731619, 732615, 732623]
+'SE3 9XN': [713013, 713566, 714344, 715085, 715626, 716124, 716609, 717085, 717498, 717940, 718884, 722574, 725404, 727484, 729229, 730701, 731859]
+'SE5 0TU': [709966, 713128, 713653, 715168, 715677, 716196, 718994, 722701, 725506, 727590, 729336, 730797, 731962, 732946, 738414, 738426, 738433]
+'SE8 5JG': [728621, 728821, 729591, 729795, 729977, 730168, 730330, 731009, 731162, 731292, 731401, 731526, 732269, 732368, 732556, 733127, 733223]
+'SO14 0PR': [714067, 714588, 714647, 714694, 714747, 714789, 715299, 715343, 715373, 715407, 733572, 734834, 735623, 736243, 736747, 737159, 737524]
+'SO14 5AD': [712986, 713545, 714328, 715062, 715617, 716110, 718865, 719324, 719715, 720065, 722550, 725382, 727460, 729209, 730675, 731844, 732830]
+'SO19 2NX': [710692, 721958, 721959, 721960, 733714, 733901, 734054, 734182, 734298, 734980, 735762, 736381, 736869, 737272, 737622, 737910, 738151]
+'SO19 8NB': [718102, 718114, 718135, 718152, 718492, 718501, 718514, 718528, 718541, 719486, 719506, 719522, 719538, 719550, 719875, 719879, 719880]
+'SW9 0AH': [733761, 733780, 733787, 733789, 733795, 733812, 735027, 735043, 735045, 735050, 735052, 735060, 735805, 735816, 735824, 735826, 735843]
+'SW9 0RR': [733794, 733796, 733798, 733802, 733804, 735054, 735056, 735062, 735063, 735067, 735071, 735075, 735818, 735825, 735827, 735831, 735836]
+'SW9 0RX': [715728, 716246, 716739, 717205, 717615, 718048, 718449, 720172, 720506, 721398, 721665, 723365, 724299, 725599, 729419, 730874, 733029]
+'SW9 9HG': [712809, 713385, 715516, 715970, 716460, 716930, 717371, 717809, 718218, 718665, 719209, 719613, 719967, 720598, 730507, 731677, 732670]
+'BN11 5RW': [733711, 733897, 734052, 734179, 734388, 734502, 734595, 734672, 734741, 734803, 734976, 735759, 736378, 736866, 737267, 737621, 737907, 738148]
+'BN18 0BW': [726710, 726974, 728644, 728849, 729617, 730357, 731034, 731186, 731310, 731362, 731423, 731542, 732176, 732283, 732383, 732491, 732572, 733141]
+'BN2 3AN': [739531, 739554, 739588, 739612, 739633, 739657, 739677, 739696, 739713, 739730, 739771, 739932, 740024, 740093, 740136, 740167, 740194, 740223]
+'CT5 1SY': [711267, 711281, 711294, 711306, 711387, 711403, 711419, 711430, 711444, 711530, 711541, 711552, 711557, 711563, 711643, 711652, 711658, 711665]
+'DA11 8EA': [709873, 715033, 716084, 717040, 717905, 719301, 720046, 720680, 721290, 721814, 723271, 723773, 724219, 724616, 724991, 725948, 726280, 726598]
+'DA1 5JQ': [715423, 715448, 715795, 715833, 715861, 715883, 715911, 716312, 716339, 716365, 716388, 716408, 716806, 716827, 716847, 716862, 716882, 717260]
+'E1 5HF': [712785, 713370, 714174, 714889, 716450, 717794, 718647, 719196, 720591, 720904, 721475, 721736, 723707, 724148, 724364, 724546, 724937, 731656]
+'E2 6QP': [713531, 714315, 716094, 716577, 717049, 717473, 717912, 718847, 719703, 720383, 720692, 722530, 725361, 727442, 729191, 730666, 731829, 732817]
+'E2 6QR': [712783, 713368, 714172, 714887, 715509, 715955, 716449, 716915, 717357, 717791, 718644, 722338, 725166, 727260, 729001, 730488, 731654, 732656]
+'ME15 7SY': [712876, 713434, 714233, 714952, 715548, 716016, 716508, 716974, 717407, 717850, 718736, 722424, 725255, 727335, 729084, 730564, 731730, 732721]
+'ME20 7FH': [709826, 709895, 709970, 710047, 710109, 710165, 710213, 710274, 710312, 710359, 710454, 710778, 711000, 711219, 711359, 711507, 711619, 711715]
+'ME20 7GQ': [709937, 710001, 710069, 710071, 710075, 714029, 714061, 714579, 714609, 714642, 714668, 714691, 714716, 714740, 714786, 714802, 715295, 715318]
+'ME2 2FU': [709824, 709893, 709968, 710045, 710108, 710164, 710212, 710273, 710311, 710357, 710452, 710775, 710997, 711216, 711357, 711505, 711618, 711714]
+'NW10 8GY': [739220, 739229, 739241, 739250, 739259, 739268, 739277, 739286, 739295, 739304, 739320, 739389, 739422, 739437, 739446, 739455, 739464, 739473]
+'PE2 8FF': [711797, 711879, 712033, 733869, 734149, 734367, 734488, 734577, 734659, 734724, 734930, 735718, 736337, 736828, 737226, 737591, 737872, 738120]
+'PE3 6BT': [710060, 710593, 710632, 710691, 713265, 715748, 717637, 718067, 718470, 719852, 720189, 722219, 722831, 723384, 723651, 727722, 729460, 733062]
+'PO19 3NP': [720975, 721544, 722085, 723262, 723765, 724211, 724609, 724986, 725942, 726274, 734022, 734267, 735178, 735300, 735706, 736817, 737580, 738112]
+'PO19 7QS': [729518, 729621, 730008, 730112, 730201, 730278, 730362, 730956, 731115, 731190, 731314, 731365, 731425, 731483, 731547, 732178, 732287, 732336]
+'PO19 8AX': [725767, 726127, 727850, 728583, 729758, 730306, 731382, 735963, 736051, 736122, 736189, 737437, 737465, 737788, 737961, 737987, 737992, 738011]
+'PO20 2JF': [723761, 723984, 724208, 724606, 725747, 725939, 726102, 726272, 726429, 726593, 726744, 726880, 727005, 727122, 727829, 728448, 728566, 729743]
+'RH11 7UP': [710159, 710210, 710352, 710768, 713111, 713639, 714423, 715154, 715670, 717144, 717553, 718389, 718975, 725491, 727577, 730781, 731947, 732928]
+'RH14 0SR': [721606, 723043, 724658, 725038, 725981, 726474, 735192, 735311, 735363, 736623, 736655, 736710, 736733, 736942, 736962, 737101, 737124, 737142]
+'SE11 5RN': [712835, 714210, 714923, 715534, 715992, 716483, 717390, 717827, 718242, 719634, 719983, 720302, 720614, 722389, 725216, 730534, 731695, 732692]
+'SE14 6EQ': [713256, 713741, 714531, 715247, 715745, 716760, 717223, 717634, 718064, 719116, 722819, 725631, 727714, 729454, 730899, 732067, 733055, 741304]
+'SE15 5GD': [710812, 713524, 715039, 716090, 717045, 717907, 719306, 720051, 720688, 721297, 721819, 722523, 723536, 724001, 724428, 724813, 727433, 730657]
+'SE18 1RX': [711331, 712936, 713492, 714283, 715007, 715583, 716066, 716554, 717021, 717448, 717893, 718796, 722488, 725319, 727397, 730625, 731792, 732779]
+'SE19 3AA': [710398, 717758, 717764, 718170, 718178, 718184, 718555, 719567, 719573, 719578, 719918, 719931, 719937, 719940, 723459, 723686, 723691, 723696]
+'SE20 8AX': [710599, 714834, 714849, 714856, 716888, 717748, 717760, 718557, 718568, 719919, 719938, 719941, 721182, 721186, 721187, 721717, 721942, 723177]
+'SE5 0BJ': [733659, 733859, 734021, 734141, 734571, 734653, 734719, 734784, 735112, 735350, 735407, 735453, 735497, 735541, 735705, 736326, 737862, 738111]
+'SO16 5SD': [709912, 709920, 713805, 713886, 713925, 713946, 713953, 713987, 714020, 714057, 714086, 714576, 714602, 714636, 714662, 733379, 733423, 733450]
+'SO19 9DA': [710552, 712186, 713550, 715066, 716113, 717070, 717926, 719329, 720705, 721312, 725385, 727216, 727228, 729212, 730443, 731846, 733580, 734842]
+'BR6 0FB': [711767, 711827, 711866, 712002, 712017, 712063, 712143, 712152, 712160, 712166, 712172, 712177, 712240, 712287, 712382, 712465, 712538, 735213, 735276]
+'CR0 1FR': [710464, 711015, 711629, 711779, 711831, 711869, 711903, 711929, 711948, 711969, 711988, 712073, 712197, 712295, 712389, 712474, 712543, 712593, 712639]
+'CT20 2QH': [712760, 713345, 714152, 714866, 715495, 715939, 716434, 716899, 717341, 717773, 718619, 722317, 725143, 727243, 728978, 730471, 731634, 732533, 732637]
+'DA14 6LR': [712743, 738507, 738515, 738523, 738529, 738536, 738544, 738561, 738568, 738622, 738626, 738631, 738636, 738802, 738840, 738926, 739103, 739104, 739109]
+'DA2 7WT': [710500, 713150, 713670, 714457, 715184, 716209, 716701, 717166, 717579, 718008, 718408, 719016, 722723, 725532, 727615, 729356, 730815, 731981, 732965]
+'DA8 1AP': [711650, 728038, 728168, 728286, 728393, 728496, 728623, 728715, 728823, 728932, 729594, 729687, 729798, 732270, 732320, 732423, 732475, 732521, 732558]
+'GU29 9PH': [713728, 714520, 715232, 715737, 716747, 717212, 717621, 718054, 718454, 719836, 720176, 721125, 721929, 722803, 723095, 723641, 725612, 727697, 733039]
+'N7 9EG': [724397, 724783, 726083, 726409, 726987, 728092, 728323, 729526, 729729, 730961, 731123, 731252, 731488, 732340, 732448, 732535, 733105, 733201, 733345]
+'NW10 8NN': [713183, 714481, 715708, 716717, 717593, 718425, 719806, 720486, 721102, 721648, 722184, 722759, 723345, 723853, 724684, 725066, 727644, 730840, 738771]
+'NW10 8RH': [713455, 714974, 716037, 716994, 717865, 718757, 719260, 720013, 725275, 729108, 731747, 735344, 735448, 735953, 736040, 736114, 736179, 736458, 736525]
+'NW10 8RU': [714121, 714131, 714134, 714137, 714140, 714142, 714144, 714146, 715274, 722284, 722295, 722300, 722303, 722304, 722305, 722306, 722307, 729482, 732097]
+'PE3 9YA': [710194, 710293, 710417, 710576, 711326, 714251, 714971, 716991, 720644, 721258, 721783, 722059, 722447, 722956, 724398, 724785, 725272, 726412, 727359]
+'PO16 7NJ': [713460, 714258, 714980, 716041, 716532, 716999, 717429, 717870, 718763, 720344, 720650, 720956, 722460, 725282, 727371, 729115, 730593, 731752, 732749]
+'PO19 3LX': [728134, 734166, 734586, 734733, 735126, 735250, 735362, 735554, 735878, 735971, 736059, 736130, 736194, 736471, 736536, 736708, 736940, 737252, 737895]
+'PO19 6TS': [721101, 721382, 721647, 733906, 734186, 734286, 734393, 734507, 734675, 734745, 734805, 735198, 735262, 735767, 736386, 737277, 737628, 737914, 738156]
+'RH12 3XJ': [710526, 710557, 710584, 710612, 710628, 710684, 710705, 710817, 710839, 710856, 710874, 710910, 710918, 710931, 710939, 711041, 711055, 711073, 711088]
+'SE10 9FG': [712959, 713523, 714309, 715038, 715600, 716089, 718834, 719699, 720687, 721296, 722521, 723778, 724427, 725352, 727431, 729183, 730655, 731821, 732810]
+'SE14 5AW': [713792, 713825, 713868, 713910, 713941, 713971, 714002, 714040, 714068, 714102, 714589, 714620, 714622, 714624, 714626, 714628, 714630, 714631, 714632]
+'SE14 5EY': [710845, 710880, 710903, 710923, 711031, 711064, 711091, 711108, 711130, 711380, 727790, 728074, 728304, 728522, 728737, 729711, 729919, 730103, 730274]
+'SE26 4SL': [740257, 740285, 740312, 740337, 740357, 740378, 740400, 740421, 740443, 740464, 740483, 740512, 740679, 740797, 740851, 740891, 740928, 740957, 740986]
+'SE4 1JL': [710236, 715835, 715863, 715887, 716295, 716315, 716341, 716370, 716399, 716789, 716810, 716830, 716849, 717249, 717263, 717278, 717290, 717302, 717656]
+'SO16 7BP': [740240, 740269, 740297, 740324, 740349, 740365, 740388, 740410, 740432, 740453, 740473, 740494, 740661, 740779, 740833, 740873, 740911, 740940, 740969]
+'SW4 6QJ': [712981, 714325, 715060, 715613, 716107, 717063, 717482, 717921, 718327, 718860, 719711, 720062, 720390, 720698, 721307, 721829, 725375, 731841, 732826]
+'SW4 6SY': [712920, 713477, 714269, 714994, 715573, 716546, 717884, 718288, 718780, 720025, 720658, 720963, 721536, 721795, 722073, 727386, 729133, 730610, 732764]
+'TN4 0BF': [710188, 712826, 713399, 714204, 714919, 716942, 717822, 718236, 718682, 719218, 719628, 719977, 722383, 725208, 727298, 729037, 730524, 731689, 732686]
+'BN1 4AE': [712460, 733566, 733817, 733982, 734101, 734243, 734335, 734452, 734551, 734630, 734699, 734763, 734828, 735088, 735617, 736239, 736744, 737527, 737810, 738060]
+'BN2 9NR': [710155, 711609, 713094, 713628, 714413, 715142, 715663, 716664, 717132, 717545, 717980, 718383, 718956, 719390, 722665, 725476, 727561, 729307, 730769, 732913]
+'BR6 9AX': [709961, 711197, 713026, 713578, 715095, 715635, 716129, 716615, 717092, 717505, 717945, 718348, 718894, 719345, 722593, 725416, 729241, 730716, 731873, 732861]
+'CT4 7DW': [709835, 709900, 709976, 710054, 710112, 710170, 710217, 710277, 710316, 710362, 710386, 710504, 710530, 710564, 711722, 712141, 712150, 712158, 712165, 719090]
+'DA1 2GA': [710093, 710291, 710376, 710605, 714239, 714958, 716023, 716512, 716978, 717854, 719246, 719653, 720004, 720325, 720944, 721246, 724184, 724396, 726251, 726408]
+'DA8 2PG': [709822, 710044, 710501, 713671, 714458, 715691, 716210, 716702, 717167, 717580, 718009, 718409, 719018, 722724, 725533, 727616, 729358, 730816, 731983, 732968]
+'E1 0AZ': [715582, 717019, 718296, 719284, 720033, 720973, 721278, 721805, 722486, 723758, 723981, 724605, 724800, 725317, 725937, 726099, 726425, 727396, 730624, 731791]
+'E14 7LQ': [709781, 709800, 709858, 709868, 710141, 710254, 710408, 710490, 710547, 710724, 710747, 710952, 711162, 711184, 711319, 711461, 711477, 711578, 711590, 711689]
+'E2 7AH': [713435, 714953, 715549, 716018, 716509, 716975, 718261, 719242, 720000, 720322, 720629, 721772, 722050, 722426, 722944, 723491, 727337, 729087, 730566, 732724]
+'GU29 9BG': [712914, 713469, 722467, 725294, 729125, 730602, 731762, 732756, 740247, 740275, 740302, 740329, 740501, 740668, 740786, 740840, 740880, 740918, 740946, 740976]
+'N1 7FJ': [733605, 733827, 733990, 734110, 734249, 734456, 734553, 734633, 734701, 734765, 734864, 735092, 735651, 736270, 736770, 737174, 737195, 737540, 737823, 738073]
+'NN2 7TB': [709990, 709993, 711739, 713798, 713880, 713949, 714014, 714081, 714708, 714757, 714796, 715311, 715350, 732381, 732489, 732569, 733138, 733304, 733372, 733446]
+'NW10 8LG': [712930, 713488, 714279, 715004, 715579, 716063, 717888, 718292, 718793, 719678, 720030, 720665, 720969, 721273, 721801, 722077, 723253, 725312, 731789, 732776]
+'NW10 8SD': [713167, 714468, 715698, 716708, 717586, 718415, 719800, 720479, 721093, 721639, 722177, 722742, 723338, 723846, 724280, 724679, 725062, 727627, 730823, 732977]
+'PE1 5JF': [712894, 713448, 714969, 715558, 716032, 716526, 716988, 717423, 717861, 718273, 718753, 719256, 719661, 720337, 720641, 722445, 725270, 729101, 730583, 731742]
+'PE2 8NL': [709855, 712799, 714182, 714897, 715960, 716456, 716920, 717365, 717800, 718213, 718658, 719201, 719608, 722354, 725181, 727271, 729013, 730498, 731665, 732663]
+'PE2 9FD': [711861, 711863, 711864, 711899, 712523, 712528, 712534, 712630, 712632, 712676, 712682, 733956, 733966, 734087, 737796, 737971, 738040, 738213, 738223, 738235]
+'PO1 1QS': [733666, 733867, 734029, 734148, 734366, 734485, 734576, 734658, 734723, 734789, 734927, 735116, 735182, 735714, 736334, 736824, 737223, 737588, 737870, 738119]
+'PO12 1HD': [734028, 734147, 734484, 734657, 735353, 735457, 735913, 735959, 736003, 736047, 736082, 736153, 736186, 736498, 736648, 736674, 736982, 737005, 737029, 737097]
+'PO12 1HF': [734088, 734091, 734093, 734097, 734216, 734217, 734226, 734230, 734234, 734307, 734311, 734314, 734317, 734324, 734327, 734424, 734436, 734441, 734534, 734538]
+'PO19 6UJ': [731544, 732284, 736031, 736106, 736452, 736579, 736637, 736693, 736925, 736970, 737065, 737335, 737377, 737420, 737456, 737487, 737694, 737756, 737785, 737957]
+'PO20 1PQ': [717554, 717987, 718976, 719776, 720125, 721355, 721611, 721882, 723046, 723595, 724045, 724855, 725492, 725795, 726158, 726479, 726787, 727044, 729323, 729565]
+'PO6 4EY': [726852, 727100, 727951, 728200, 728425, 728648, 728853, 729365, 729620, 729827, 730006, 730200, 730361, 731482, 732118, 732234, 732335, 732442, 732531, 733103]
+'RH12 4ND': [710265, 714402, 715132, 716167, 716653, 717536, 717972, 718376, 719382, 719763, 720111, 720444, 720747, 721050, 721346, 721601, 721870, 722141, 723039, 723315]
+'RH12 4NE': [710015, 712827, 713400, 714205, 715987, 716478, 716944, 717386, 717823, 718239, 718683, 719222, 719629, 722384, 725209, 727299, 729039, 730526, 731690, 732687]
+'RH16 4TT': [709936, 710067, 710124, 713813, 713897, 713961, 714028, 714608, 714714, 714765, 715388, 715442, 715877, 716308, 716335, 716359, 716380, 716407, 733387, 733459]
+'SE11 5SZ': [713042, 713588, 714364, 715103, 716140, 716623, 717953, 718352, 718908, 719353, 719735, 720725, 721023, 721580, 722124, 722610, 725431, 729253, 730730, 732868]
+'SE11 5TU': [726763, 726896, 727020, 727139, 727849, 728122, 728242, 728353, 728460, 728509, 728786, 729554, 729757, 729952, 730137, 730305, 730389, 730982, 731063, 731213]
+'SE15 6ND': [709864, 710251, 714955, 716019, 717851, 719244, 720003, 721245, 721774, 722946, 723493, 723961, 724394, 724779, 725728, 726079, 726406, 726723, 729088, 731733]
+'SE15 6QX': [712905, 722458, 723241, 723745, 724192, 724588, 724973, 725926, 726258, 726582, 726869, 727111, 727369, 727967, 728216, 728438, 728662, 728866, 730591, 732747]
+'SE3 9QS': [711429, 713788, 713865, 713938, 714000, 729561, 729770, 729963, 730315, 731148, 731275, 731387, 731514, 732259, 732360, 732462, 733118, 733216, 733356, 733434]
+'SW4 6QS': [713381, 714904, 715514, 716459, 716926, 717013, 717369, 717805, 718217, 719204, 719612, 719965, 720283, 720596, 725187, 727276, 729021, 730504, 731673, 732668]
+'SW9 9HN': [738795, 738804, 738819, 738846, 738860, 738868, 738876, 738882, 738888, 738893, 738900, 738916, 738922, 738956, 738998, 739020, 739049, 739072, 739090, 739102]
+'TN1 2PW': [711636, 713749, 715254, 716271, 717228, 729458, 739792, 739823, 739851, 739877, 739901, 739946, 739961, 739974, 739987, 739999, 740034, 740046, 740054, 740062]
+'CR5 3FX': [709965, 710042, 710107, 710161, 710270, 710308, 710353, 710383, 710446, 710498, 710527, 710558, 710585, 710613, 710643, 710685, 710818, 710857, 710992, 711352, 711614]
+'CR7 6BD': [711859, 711923, 712015, 728281, 733737, 734067, 734291, 734402, 734518, 734610, 734749, 734809, 735004, 735136, 735784, 736405, 736887, 737293, 737639, 737929, 738169]
+'CR7 8NE': [711772, 711773, 711828, 711867, 711901, 711927, 711946, 711967, 711986, 712003, 712018, 712067, 712068, 712191, 712192, 712290, 712384, 712468, 712539, 712590, 712636]
+'CT19 5QF': [713457, 714255, 714978, 716040, 716530, 716997, 717427, 717868, 718278, 719263, 719665, 720015, 720343, 720649, 722456, 725279, 727367, 729112, 730590, 731750, 732745]
+'DA14 4AG': [740254, 740282, 740309, 740335, 740356, 740376, 740398, 740419, 740441, 740462, 740481, 740509, 740530, 740547, 740563, 740676, 740794, 740848, 740888, 740954, 740983]
+'GU27 3JX': [740258, 740286, 740313, 740338, 740358, 740379, 740401, 740422, 740444, 740465, 740484, 740513, 740532, 740549, 740680, 740798, 740852, 740892, 740929, 740958, 740987]
+'GU29 9BJ': [714399, 715128, 716165, 716651, 717120, 717533, 717970, 718373, 719379, 720109, 721599, 729293, 732898, 733690, 734953, 735596, 735740, 735876, 735922, 735970, 736360]
+'GU31 5LG': [714964, 716029, 716524, 716985, 717858, 719254, 720010, 720334, 720638, 720948, 721254, 721521, 724586, 724971, 725731, 731739, 732613, 733645, 734905, 735690, 736311]
+'ME16 9EQ': [709879, 709960, 710030, 710103, 710151, 710205, 710263, 710304, 710761, 710979, 711196, 711341, 711490, 711602, 711707, 711761, 712057, 712182, 712282, 712377, 712461]
+'N1 7FS': [712755, 713340, 714862, 715491, 715935, 716430, 716896, 717337, 717769, 718192, 718615, 719181, 719589, 719942, 722312, 725138, 727238, 728974, 730466, 731629, 732632]
+'NW10 8NW': [713692, 715202, 717186, 718028, 719048, 719429, 720784, 721385, 721908, 723077, 723622, 724076, 724485, 724882, 725562, 725817, 726176, 726501, 729388, 732005, 738405]
+'NW2 4NA': [738372, 738378, 738389, 738395, 738404, 738413, 738424, 738432, 738445, 738452, 738462, 738479, 738553, 738612, 738660, 738699, 738717, 738742, 738770, 738792, 738919]
+'PE2 8QX': [739529, 739552, 739586, 739610, 739632, 739655, 739675, 739694, 739711, 739728, 739746, 739769, 739787, 739804, 739930, 740022, 740091, 740134, 740165, 740192, 740221]
+'PO18 0EN': [714503, 716734, 717198, 717606, 718441, 719073, 719826, 720168, 720499, 721661, 721919, 722196, 723634, 724086, 724295, 724691, 725586, 727675, 732029, 735924, 736506]
+'PO18 8SL': [712932, 713490, 717889, 719680, 720359, 720970, 721540, 722079, 722481, 722977, 723255, 723756, 724203, 724602, 724982, 725936, 726268, 727118, 728224, 730030, 730218]
+'PO19 3AG': [712907, 713462, 714261, 714982, 715565, 716043, 716536, 717872, 718280, 718768, 719264, 719667, 720017, 720345, 720957, 721789, 722462, 725285, 727374, 731755, 732752]
+'PO19 6SX': [733678, 734036, 734492, 735185, 735413, 735505, 735729, 735917, 736223, 736502, 736564, 736621, 736677, 736731, 736839, 737007, 737053, 737364, 737407, 737598, 738127]
+'PO19 7HG': [715266, 716773, 717643, 718075, 721420, 721684, 721950, 722226, 723656, 723887, 724101, 724712, 733743, 733926, 735010, 735270, 735322, 735788, 736410, 737645, 738175]
+'PO19 8AA': [713134, 713656, 718000, 719401, 719785, 720135, 720461, 721622, 731966, 732951, 734050, 734176, 734386, 734500, 734592, 734971, 735754, 736374, 736861, 737261, 737617]
+'PO20 0PB': [712840, 716948, 718245, 718693, 719984, 720304, 720617, 722036, 722924, 723218, 723472, 723947, 724168, 724379, 724567, 724766, 724954, 725715, 725903, 726068, 730540]
+'PO20 8LX': [713228, 714514, 716742, 719834, 720509, 721122, 723367, 724301, 724695, 726016, 726343, 726664, 726939, 727691, 728277, 729682, 730073, 731347, 731461, 731585, 733033]
+'PO20 8LY': [713721, 715227, 716251, 717209, 718050, 719091, 719449, 720174, 720800, 723636, 724895, 726189, 726510, 727067, 727892, 728617, 728819, 729424, 729587, 729793, 732042]
+'RH19 3EG': [711954, 711973, 711993, 712007, 712023, 712041, 712043, 712405, 733663, 733864, 734026, 734145, 734269, 734788, 734924, 735711, 736331, 737220, 737585, 737867, 738117]
+'SE14 6EF': [710305, 714342, 715625, 716607, 718342, 719725, 720402, 721011, 721570, 722112, 722571, 723293, 723792, 724237, 724632, 725011, 725962, 726294, 727481, 730698, 732846]
+'SE16 4BJ': [736121, 736156, 736188, 736222, 736466, 736500, 736531, 736593, 736619, 736649, 736703, 736729, 736936, 736983, 737006, 737030, 737052, 737077, 737098, 737120, 737139]
+'SE8 5BH': [710434, 712991, 713551, 714332, 715067, 715619, 716114, 716596, 717071, 717489, 717927, 718336, 719330, 719718, 722553, 725386, 727465, 729213, 730680, 731847, 732835]
+'SO14 1NW': [733614, 733805, 733939, 734084, 734213, 734873, 735076, 735657, 735837, 736277, 736443, 736773, 736917, 737177, 737326, 737543, 737663, 737677, 737826, 737953, 738192]
+'SO14 6RD': [713413, 714113, 714933, 715456, 716000, 716411, 716954, 717315, 717836, 718163, 718703, 719232, 719561, 719989, 722278, 722291, 725230, 727208, 727225, 729057, 731708]
+'SO17 2GN': [740250, 740277, 740304, 740346, 740354, 740371, 740394, 740431, 740437, 740458, 740492, 740504, 740526, 740543, 740671, 740789, 740843, 740883, 740921, 740949, 740978]
+'SO21 3NH': [711361, 713682, 714472, 715194, 715699, 716220, 716709, 717177, 717588, 718018, 718417, 719036, 719418, 719801, 720148, 722747, 725551, 727632, 730829, 731995, 732982]
+'SW4 6RS': [716163, 716649, 717531, 719377, 719760, 720108, 720441, 720745, 721048, 721869, 722649, 723038, 723583, 723815, 724457, 724653, 725462, 729291, 730757, 731918, 732895]
+'SW9 9BN': [721974, 721976, 721978, 721979, 722241, 722242, 722244, 722247, 722248, 722249, 722250, 722251, 722252, 722253, 722254, 722255, 722257, 722258, 722259, 722260, 722261]
+'CR0 4FF': [733824, 733989, 734109, 734248, 734339, 735091, 735155, 735216, 735279, 735331, 735848, 735896, 735941, 735989, 736027, 736211, 736449, 736487, 736515, 736551, 737819, 738070]
+'CR0 4WG': [734814, 735139, 735205, 735272, 735324, 735380, 735429, 735479, 735520, 735566, 735607, 735890, 735932, 735984, 736020, 736068, 736098, 736141, 736167, 736206, 736234, 736483]
+'CT1 1ZL': [710264, 710349, 710985, 711203, 711606, 713063, 713603, 714378, 715112, 715646, 716149, 716633, 717520, 718362, 718925, 719365, 719745, 720097, 722630, 729268, 730744, 732878]
+'CT6 7SW': [713826, 713911, 713972, 714041, 714103, 714674, 714722, 714770, 715779, 715802, 715844, 731458, 731582, 732314, 732414, 732515, 732594, 733170, 733252, 733326, 733397, 733471]
+'DA14 6NN': [733692, 733886, 734043, 734164, 734276, 734377, 734496, 734585, 734667, 734732, 734796, 734955, 735125, 735189, 735248, 735742, 736362, 736850, 737250, 737609, 737893, 738137]
+'DA14 6NT': [733709, 733896, 734051, 734178, 734281, 734387, 734501, 734594, 734671, 734740, 734802, 734974, 735130, 735196, 735258, 735757, 736377, 736864, 737265, 737620, 737906, 738147]
+'DA14 6NX': [733695, 733888, 734045, 734168, 734279, 734380, 734498, 734587, 734668, 734735, 734798, 734958, 735127, 735191, 735252, 735744, 736364, 736852, 737254, 737611, 737897, 738139]
+'DA2 7WY': [710520, 711476, 711591, 712937, 713493, 714285, 715009, 716068, 716556, 717023, 717449, 717895, 718297, 718798, 719287, 720036, 720363, 722490, 725320, 727399, 729150, 732781]
+'E1 0DB': [713079, 713617, 714400, 715129, 715657, 716166, 716652, 717121, 717534, 717971, 718374, 718942, 719380, 719761, 720110, 720443, 722652, 725465, 729294, 730759, 731920, 732899]
+'GU29 9HT': [740242, 740271, 740299, 740326, 740351, 740367, 740390, 740412, 740434, 740455, 740475, 740496, 740524, 740541, 740558, 740663, 740781, 740835, 740875, 740913, 740941, 740971]
+'GU29 9PN': [726019, 726668, 726816, 726942, 727070, 727181, 727895, 728033, 728160, 728279, 728390, 728494, 728620, 728713, 729888, 730260, 736137, 736162, 737144, 737351, 737370, 737395]
+'GU29 9PX': [713733, 714525, 715238, 716259, 716754, 717217, 717628, 718461, 719461, 720180, 720804, 721129, 721408, 721670, 721932, 722210, 723098, 723374, 723645, 730891, 732060, 733046]
+'ME16 8UP': [739521, 739543, 739577, 739601, 739624, 739646, 739667, 739686, 739704, 739721, 739739, 739760, 739780, 739799, 739814, 739829, 739921, 740082, 740125, 740156, 740183, 740212]
+'NW10 8ES': [714553, 715759, 716775, 718484, 719866, 720534, 721147, 721687, 722230, 722855, 723395, 723890, 724320, 724714, 725093, 726358, 726675, 726945, 727187, 727749, 730919, 733075]
+'PE28 0HD': [709815, 710037, 713607, 714385, 716152, 716639, 717108, 717524, 717961, 718367, 718930, 719369, 719751, 720100, 720430, 722635, 725446, 727534, 729275, 730748, 731903, 732883]
+'PE7 8GS': [710863, 723415, 723416, 723420, 723666, 723670, 723673, 723677, 724111, 724113, 724114, 724327, 724328, 724330, 724333, 724335, 724514, 724515, 724517, 724518, 724522, 724719]
+'PO10 8HL': [719738, 721028, 721330, 721583, 721850, 723801, 731886, 733682, 734038, 734157, 734374, 734581, 734664, 735244, 735732, 736843, 737054, 737140, 737365, 737510, 737688, 738129]
+'PO10 8PH': [713195, 717600, 718033, 718434, 719058, 720492, 721105, 721655, 721913, 722190, 722767, 723628, 724081, 724491, 724886, 725571, 725820, 726179, 726504, 727658, 729397, 732015]
+'PO19 3AR': [733889, 734169, 734381, 734588, 734736, 734959, 735253, 735466, 735972, 736060, 736131, 736195, 736365, 736472, 736654, 736709, 736941, 736986, 737034, 737081, 737255, 737898]
+'PO19 3NX': [723724, 724957, 725906, 726242, 727102, 728201, 728426, 728651, 733638, 734005, 734256, 734468, 734645, 735167, 735288, 735398, 735491, 735683, 735905, 736796, 737560, 738092]
+'PO19 6RW': [720947, 723238, 723741, 724585, 725921, 726578, 726866, 728093, 728211, 729836, 730018, 730369, 731045, 731432, 732393, 735952, 736039, 736113, 736457, 736524, 736585, 736644]
+'PO19 7NH': [713009, 713563, 714341, 715624, 716119, 716605, 717079, 717494, 718340, 718882, 719336, 719723, 720709, 721315, 721836, 722111, 722569, 723010, 723292, 727479, 729222, 730697]
+'RH14 0BT': [724568, 724955, 725904, 726240, 726564, 726853, 729828, 730007, 732286, 734003, 735903, 735993, 736792, 737502, 737558, 737681, 737714, 737742, 737773, 737795, 738016, 738038]
+'SE11 5TX': [712823, 713396, 714201, 714916, 715984, 716475, 717737, 717819, 718233, 719215, 719625, 719974, 720295, 720605, 721213, 721751, 722380, 725205, 727294, 730521, 731686, 732684]
+'SE15 6FB': [711592, 712944, 713501, 714293, 715016, 715588, 716071, 717898, 718300, 719291, 721807, 722084, 722981, 723261, 723527, 723764, 723987, 724803, 724985, 725749, 726273, 732789]
+'SE9 2BA': [711044, 711720, 713714, 726013, 726186, 726340, 726509, 726661, 726812, 727685, 728386, 728490, 728616, 728711, 728817, 728924, 729416, 729585, 729680, 729791, 730870, 732035]
+'SW4 6RU': [713280, 714550, 715262, 715753, 716769, 717235, 717640, 718074, 718478, 719130, 719859, 720529, 721143, 721418, 722225, 723109, 723390, 725649, 727739, 729472, 732087, 733072]
+'SW9 9BW': [710826, 723123, 723132, 723133, 723134, 723135, 723136, 723137, 723145, 723146, 723147, 723148, 723149, 723150, 723151, 723152, 723153, 723154, 723162, 723164, 723165, 723166]
+'BN2 9AA': [733650, 733852, 734013, 734134, 734261, 734355, 734474, 734566, 734650, 734716, 734780, 734911, 735109, 735233, 735295, 735346, 735696, 736316, 736809, 737208, 737571, 737854, 738104]
+'DA14 6LS': [738706, 738723, 739025, 739027, 739029, 739031, 739033, 739051, 739052, 739053, 739054, 739055, 739056, 739057, 739058, 739075, 739077, 739078, 739080, 739105, 739106, 739107, 739108]
+'E1 0EL': [713246, 713734, 714526, 715239, 715741, 716260, 716755, 717218, 717629, 718059, 718462, 719106, 719462, 719844, 720181, 720514, 720805, 722813, 725622, 729443, 730892, 732061, 733048]
+'E14 7FU': [709845, 709908, 709985, 710061, 710116, 710173, 710221, 710280, 710321, 710366, 710392, 710471, 710507, 710534, 710799, 711025, 711124, 711235, 711272, 711374, 711522, 711637, 711727]
+'E2 6QT': [713119, 713646, 714432, 715163, 716193, 716682, 717558, 717993, 718393, 719396, 719780, 720128, 720458, 721064, 721357, 721615, 721884, 722695, 723600, 724050, 730789, 731955, 732935]
+'GU28 0EQ': [729598, 730334, 731296, 731404, 732477, 735568, 735892, 735986, 736070, 736208, 736485, 736605, 736663, 736720, 736948, 736992, 737041, 737088, 737129, 737967, 737990, 738049, 738200]
+'GU28 9NW': [713517, 714305, 715035, 716086, 716573, 717043, 717467, 718832, 719696, 720684, 720989, 723273, 723776, 723999, 724425, 724619, 724994, 725755, 725952, 726111, 727427, 730652, 731817]
+'GU29 0HQ': [713241, 713731, 714524, 717215, 717625, 719102, 719459, 719841, 721128, 721407, 722208, 723096, 723373, 723643, 723874, 724304, 727182, 728034, 729437, 735513, 735778, 736400, 736881]
+'N1 7FH': [733578, 733637, 733818, 733983, 734102, 734241, 734333, 734450, 734549, 734629, 734698, 734762, 734840, 735087, 735628, 735682, 736249, 736301, 736752, 737160, 737528, 737811, 738061]
+'N7 8BE': [710571, 712770, 713357, 714164, 714877, 715503, 715947, 717349, 717782, 718632, 719597, 719952, 720585, 720899, 721196, 721467, 721731, 722328, 725153, 728991, 730479, 731648, 732647]
+'N7 9EL': [726344, 726511, 726665, 726813, 727068, 728030, 728157, 728278, 728388, 728492, 728618, 728820, 728927, 729589, 729887, 729976, 730074, 730167, 730258, 730417, 731006, 731158, 731233]
+'N7 9JU': [713249, 713737, 714528, 715242, 715742, 716262, 716756, 717220, 717631, 718464, 719109, 719464, 719845, 720182, 720516, 720806, 722814, 725624, 727707, 729446, 730895, 732063, 733050]
+'NW10 8EX': [713001, 713558, 714337, 715076, 715622, 716118, 716603, 717077, 717492, 717933, 718339, 718877, 719335, 719721, 720400, 720708, 721008, 722563, 725395, 727472, 730689, 731853, 732842]
+'NW10 8GW': [739224, 739233, 739245, 739254, 739263, 739272, 739281, 739290, 739299, 739307, 739314, 739324, 739331, 739341, 739348, 739355, 739393, 739426, 739441, 739450, 739459, 739468, 739477]
+'NW10 8RP': [712885, 713443, 714962, 716026, 716982, 718745, 725264, 729098, 731738, 738468, 738491, 738502, 738520, 738782, 738797, 738808, 738853, 738902, 738983, 739007, 739035, 739059, 739093]
+'PE1 5LW': [710487, 710544, 710606, 712895, 713447, 714249, 714968, 716033, 716527, 716987, 717422, 718274, 718752, 720950, 721256, 721523, 721780, 722058, 722446, 725271, 729102, 731743, 732736]
+'PE2 8HL': [710590, 713220, 713713, 714506, 715222, 715725, 716241, 716737, 717201, 717610, 718446, 718556, 718567, 719080, 719829, 721118, 722789, 725593, 727684, 729415, 730869, 732034, 733023]
+'PO10 8TN': [716590, 717485, 718330, 719323, 719714, 720063, 727456, 728458, 733870, 734368, 734933, 735304, 735501, 735588, 736004, 736154, 736220, 736499, 736562, 736618, 736675, 737230, 737873]
+'PO12 1HG': [734057, 734185, 734285, 734506, 734600, 734674, 734744, 735261, 735315, 735368, 735557, 735975, 736012, 736091, 736161, 736505, 736569, 736627, 736658, 736990, 737011, 737058, 737103]
+'PO19 6PA': [713764, 715270, 718076, 720535, 721688, 722231, 723891, 726676, 726946, 728042, 728499, 729479, 729689, 730077, 733746, 734074, 734524, 734812, 735203, 735792, 736896, 737649, 738179]
+'PO20 1PH': [728284, 733920, 734197, 734403, 734519, 734611, 734680, 734750, 734810, 735005, 735268, 735320, 735375, 735423, 735562, 735602, 735887, 735982, 736016, 736163, 736511, 737294, 738170]
+'RH1 2BJ': [711480, 712953, 713511, 714300, 716568, 717461, 718305, 718825, 719688, 720372, 720982, 721547, 722090, 722511, 723268, 723770, 724216, 724614, 725342, 727421, 729175, 731811, 732801]
+'RH6 7DA': [713547, 716593, 718333, 718867, 719326, 720067, 720703, 721003, 721832, 723551, 723790, 724823, 725008, 725384, 726452, 726761, 726895, 727138, 727847, 727990, 728121, 728241, 728352]
+'SE13 6DZ': [709831, 709897, 709973, 710049, 710111, 710167, 710216, 710276, 710314, 710360, 710385, 710457, 710503, 710529, 710562, 710588, 710784, 711005, 711222, 711362, 711511, 711622, 711718]
+'SE20 8DR': [711389, 726217, 729606, 729608, 729610, 729806, 729808, 729809, 729811, 731407, 731411, 731412, 731414, 731531, 731535, 732166, 732169, 732170, 732171, 732272, 732273, 732274, 732275]
+'SE26 5BP': [711792, 711991, 712146, 712602, 733849, 734010, 734130, 734258, 734351, 734471, 734648, 734712, 734777, 734903, 735105, 735171, 735230, 735292, 735689, 736309, 737200, 737566, 738099]
+'SO14 5GP': [712181, 712459, 712626, 733565, 733591, 733604, 734827, 734853, 734863, 735639, 735650, 736238, 736259, 736269, 736743, 736760, 736769, 737166, 737173, 737532, 737539, 737804, 737822]
+'SW9 9AA': [713082, 715133, 716168, 716654, 717537, 717973, 719383, 719764, 720112, 720748, 721051, 721347, 721602, 721871, 722142, 723316, 723585, 724458, 725468, 727548, 729297, 730761, 732902]
+'TN24 8PY': [711605, 713051, 713597, 714372, 715109, 715643, 716146, 716627, 717102, 717517, 717957, 718357, 718916, 719360, 719743, 720094, 720421, 722618, 725435, 727519, 729260, 730735, 732874]
+'BN17 7PU': [710816, 720123, 720757, 721354, 721881, 723594, 724043, 724465, 724854, 725794, 726157, 726786, 727043, 727868, 728137, 728369, 728601, 728801, 729564, 729772, 729964, 730149, 730316, 730992]
+'BN2 3PZ': [713218, 713712, 714505, 715221, 715724, 716240, 716736, 717200, 717609, 718044, 718445, 719078, 719443, 719828, 720170, 720503, 720797, 722787, 725591, 727683, 729414, 730868, 732033, 733022]
+'BN2 5LH': [713178, 713687, 714475, 715196, 715703, 716223, 716712, 717180, 717590, 718022, 718421, 719043, 719423, 719803, 720150, 720482, 720779, 722754, 725557, 727638, 729380, 730833, 732000, 732987]
+'BN43 6NQ': [713570, 714349, 715089, 715631, 716613, 717089, 717501, 717942, 718345, 719343, 719728, 720405, 720714, 721015, 721319, 721573, 721841, 722582, 725408, 727491, 729233, 730707, 731863, 732854]
+'BR5 2PR': [711597, 712954, 713513, 714303, 715029, 715597, 716081, 716569, 717036, 717462, 718307, 718828, 719690, 720373, 720983, 721549, 722091, 722513, 723269, 725345, 727423, 729177, 730648, 732804]
+'CR0 4BW': [713410, 714931, 715997, 716952, 717833, 718698, 719230, 719987, 720619, 721223, 721757, 722927, 723473, 723948, 724380, 724767, 725226, 725717, 726069, 726397, 726717, 726980, 729053, 731705]
+'DA12 2EF': [709819, 709884, 709964, 710038, 710106, 710156, 710209, 710266, 710307, 710350, 710382, 710444, 710497, 710525, 710556, 710583, 710611, 710767, 710990, 711207, 711349, 711498, 711610, 711710]
+'DA1 5UU': [709778, 709853, 709939, 710012, 710404, 710720, 710948, 711158, 711302, 711308, 711316, 711379, 711393, 711399, 711405, 711410, 711422, 711426, 711432, 711440, 711445, 711457, 711577, 711683]
+'GU28 0EG': [730429, 730431, 735522, 735610, 735935, 736023, 736101, 736170, 736236, 736514, 736574, 736630, 736686, 736737, 736967, 737013, 737061, 737106, 737148, 737373, 737416, 737453, 737486, 737516]
+'ME12 4NG': [711074, 711649, 711675, 724482, 724877, 725814, 726495, 726802, 731154, 731228, 731283, 731344, 731395, 731459, 731519, 731583, 732154, 732262, 732315, 732363, 732416, 732516, 733171, 733253]
+'ME15 6HB': [711657, 711664, 732113, 732174, 732230, 732279, 732379, 732488, 732528, 732567, 733099, 733137, 733194, 733225, 733272, 733303, 738357, 738456, 738549, 738607, 738657, 738694, 738715, 738736]
+'ME9 9HB': [709860, 710091, 710246, 712841, 714213, 714927, 715993, 716487, 717393, 717831, 718246, 718694, 719228, 719636, 719985, 720305, 720618, 722395, 725221, 727308, 729047, 730541, 731700, 732698]
+'N7 9LB': [720392, 722109, 723287, 724235, 725960, 726292, 726613, 727137, 727989, 728888, 729649, 730041, 730230, 731061, 731210, 731330, 731447, 731568, 732302, 732398, 732503, 732583, 733316, 733461]
+'NW10 8RZ': [713541, 715056, 716104, 717062, 718859, 719320, 720697, 721305, 721828, 723002, 724008, 724436, 724820, 725374, 725762, 726120, 726450, 726758, 727845, 728119, 728351, 728580, 729204, 738784]
+'PE3 9YD': [710122, 710125, 713806, 713849, 713928, 713955, 713989, 714059, 714712, 714737, 714761, 715291, 715354, 715403, 715787, 715822, 715838, 715906, 716307, 716357, 716378, 716800, 716813, 733238]
+'PO19 3AF': [728150, 733908, 734188, 734602, 734746, 734987, 735133, 735263, 735369, 735469, 735558, 735881, 735976, 736063, 736134, 736198, 736388, 736476, 736541, 736599, 736659, 736714, 737279, 737916]
+'PO19 3LR': [733837, 733999, 734120, 734558, 734640, 734707, 734771, 734890, 735097, 735163, 735284, 735393, 735440, 735531, 735576, 735675, 735900, 735944, 736295, 736788, 737189, 737556, 737839, 738087]
+'PO19 8DF': [713606, 714383, 715115, 716150, 716636, 717107, 718928, 720429, 720737, 722633, 725443, 730747, 731900, 732881, 734729, 734793, 735121, 735508, 735550, 735593, 735871, 735919, 735966, 736055]
+'PO20 2HT': [714021, 714087, 714603, 714760, 730364, 731041, 731119, 731194, 731318, 731486, 731551, 732123, 732183, 732293, 732446, 732534, 732577, 733104, 733149, 733199, 733277, 733380, 733424, 733451]
+'PO20 8QS': [739530, 739553, 739587, 739611, 739656, 739676, 739695, 739712, 739729, 739747, 739770, 739788, 739805, 739820, 739834, 739847, 739862, 739931, 740023, 740092, 740135, 740166, 740193, 740222]
+'RH11 7GT': [711943, 733728, 733913, 734063, 734192, 734398, 734512, 734604, 734676, 734747, 734806, 734993, 735134, 735199, 735264, 735316, 735370, 735773, 736394, 736878, 737285, 737634, 737922, 738163]
+'SE11 5BU': [713043, 713589, 714365, 717099, 717510, 718353, 719354, 719736, 720087, 720726, 721024, 721328, 721448, 722611, 723023, 723302, 723569, 724024, 724248, 724640, 725774, 727511, 731885, 732869]
+'SE11 5TD': [713900, 713937, 713963, 713997, 714032, 714064, 714097, 714583, 714610, 714644, 714669, 714692, 714717, 714742, 714766, 714787, 714803, 715296, 715319, 733211, 733244, 733287, 733319, 733389]
+'SE14 6ED': [713564, 715082, 716121, 717082, 717937, 719338, 720075, 720710, 721316, 721837, 723011, 723554, 724013, 724825, 725402, 725766, 726453, 726762, 727848, 729225, 731857, 741341, 741351, 741359]
+'SE16 3ES': [710414, 713420, 713845, 713923, 713985, 714055, 714575, 714634, 714686, 714735, 714781, 714939, 715288, 715335, 715367, 715399, 715426, 715773, 716006, 716961, 717843, 719236, 725239, 731716]
+'SE16 3QT': [711989, 733625, 733833, 733995, 734116, 734253, 734343, 734460, 734636, 734704, 734768, 734884, 735095, 735158, 735219, 735282, 735334, 735668, 736287, 736780, 737184, 737549, 737831, 738081]
+'SE2 0BB': [711875, 711933, 712145, 712601, 712649, 733641, 733844, 734126, 734349, 734470, 734563, 734646, 734710, 734774, 734897, 735102, 735168, 735227, 735289, 735685, 736304, 736800, 737197, 737563]
+'SE28 8LJ': [714200, 715528, 716474, 718232, 718576, 720922, 721709, 721718, 723422, 723902, 724162, 724560, 724949, 725120, 725898, 726232, 726556, 726955, 726959, 727096, 727293, 728420, 730520, 732683]
+'SW9 9EU': [713738, 716263, 716757, 717221, 718061, 718465, 719846, 720183, 720807, 721130, 721409, 721672, 721934, 722211, 723376, 723875, 724307, 724500, 724899, 725625, 725829, 727708, 729447, 733051]
+'BN17 5FF': [711806, 711849, 711885, 711915, 711959, 711978, 711997, 712010, 712026, 712035, 712098, 712121, 712129, 712134, 712139, 712148, 712156, 712163, 712219, 712318, 712416, 712499, 712564, 712613, 712662]
+'DA14 6NR': [733651, 733853, 734014, 734135, 734262, 734356, 734475, 734567, 734651, 734717, 734781, 734912, 735110, 735174, 735234, 735296, 735347, 735404, 735697, 736317, 736810, 737209, 737572, 737855, 738105]
+'DA5 1JT': [740264, 740293, 740320, 740344, 740385, 740407, 740428, 740450, 740471, 740490, 740520, 740538, 740555, 740570, 740583, 740596, 740609, 740622, 740687, 740804, 740859, 740899, 740936, 740965, 740994]
+'E1 2NL': [713071, 713613, 714390, 715122, 716158, 716645, 717113, 717527, 717966, 719372, 719756, 720103, 720435, 720741, 721043, 721341, 721864, 722136, 722642, 725454, 727541, 729284, 730754, 731912, 732888]
+'E1W 3DP': [724916, 725104, 725105, 725107, 725109, 725845, 725854, 725859, 725865, 726038, 726042, 726043, 726045, 726046, 726204, 726205, 726206, 726207, 726366, 726367, 726368, 726369, 726370, 726528, 726529]
+'E2 6QS': [712779, 713363, 714169, 714883, 715506, 715953, 716444, 716913, 717355, 717789, 718206, 718641, 719601, 719955, 720273, 720587, 720902, 721199, 721470, 722907, 723451, 725162, 727259, 728998, 731652]
+'GU29 9BT': [721041, 721339, 722134, 726466, 726908, 727860, 728003, 728131, 735873, 735921, 735968, 736010, 736056, 736088, 736127, 736159, 736191, 736225, 736469, 739669, 739688, 739706, 739723, 739741, 739782]
+'GU29 9TF': [712963, 714311, 716574, 717908, 718315, 718839, 719308, 719702, 720053, 720689, 721299, 721553, 724223, 724430, 724997, 725356, 727435, 729186, 730659, 731824, 732813, 735587, 735914, 735960, 736048]
+'GU31 5HL': [727160, 728373, 728604, 728696, 728804, 728908, 729568, 729668, 729774, 729873, 729966, 730061, 730150, 730245, 731075, 731515, 731578, 736943, 736963, 736987, 737009, 737706, 737721, 737735, 737750]
+'HA1 4WP': [739223, 739232, 739244, 739253, 739262, 739271, 739280, 739289, 739298, 739306, 739313, 739323, 739330, 739340, 739347, 739354, 739361, 739367, 739392, 739425, 739440, 739449, 739458, 739467, 739476]
+'ME14 2EN': [710879, 711275, 724324, 724718, 725097, 725842, 726034, 726202, 726362, 726526, 726679, 726827, 726950, 727079, 727191, 728046, 728173, 728399, 728503, 728717, 728936, 729693, 729894, 730081, 730265]
+'NW10 8BF': [717881, 719274, 720024, 720656, 721267, 721794, 722967, 726733, 726996, 727817, 728102, 728329, 728557, 728768, 729534, 729738, 729941, 730124, 730289, 730967, 731130, 731255, 731373, 731495, 732132]
+'NW10 8DQ': [713690, 715199, 716226, 717182, 718026, 719045, 719427, 720153, 720782, 721381, 721907, 723076, 723621, 724075, 724484, 724881, 725559, 725816, 726175, 726499, 726804, 727057, 728149, 729384, 732002]
+'NW10 8GS': [711032, 711109, 711131, 711242, 711260, 711800, 711846, 711882, 711912, 711936, 711957, 711976, 711995, 712008, 712024, 712034, 712092, 712120, 712214, 712312, 712410, 712493, 712559, 712609, 712659]
+'NW10 8NL': [715268, 719477, 720197, 721422, 721951, 723113, 724508, 724906, 725657, 725839, 726198, 726523, 727076, 727901, 728170, 728395, 728625, 728827, 729478, 729799, 729980, 732094, 738407, 738578, 738704]
+'PO19 3NL': [725750, 726430, 726745, 727007, 727830, 728109, 728337, 728567, 728773, 733942, 733951, 733962, 733974, 737384, 737427, 737462, 737670, 737699, 737787, 737959, 737984, 738007, 738030, 738218, 738228]
+'PO19 3NU': [718710, 725233, 728534, 728749, 729061, 733841, 734123, 734347, 734561, 734709, 735226, 735340, 735442, 735534, 735855, 736034, 736108, 736175, 736519, 736580, 736638, 736694, 736926, 736971, 737843]
+'PO19 6TN': [730002, 734466, 735099, 735164, 735222, 735285, 735337, 735395, 735489, 735533, 735578, 735853, 735902, 735946, 736074, 736146, 736553, 736610, 736722, 736952, 736994, 737044, 737092, 737135, 737358]
+'PO20 1JR': [716064, 717018, 717445, 718294, 720667, 722482, 723522, 723757, 724603, 724799, 725744, 726098, 726269, 726424, 726740, 727973, 728225, 728334, 728446, 728670, 729942, 730126, 730291, 730621, 731790]
+'PO20 1JW': [713118, 713645, 714431, 715162, 716192, 716681, 717151, 717557, 717992, 718987, 719395, 720760, 722694, 723050, 723825, 724049, 725501, 725800, 725987, 726639, 727585, 729329, 730787, 731954, 732934]
+'SE11 5DB': [726122, 726760, 727019, 727136, 727988, 728240, 728459, 728582, 728681, 728886, 729553, 729647, 729852, 729951, 730039, 730135, 730228, 730304, 730386, 730981, 731059, 731265, 731446, 731567, 732141]
+'SE11 5TB': [729658, 729699, 729861, 729956, 730140, 730235, 730309, 730396, 730984, 731068, 731142, 731269, 731332, 731449, 731508, 731570, 732145, 732200, 732254, 732304, 732355, 732505, 732544, 732584, 733114]
+'SE16 4AZ': [733635, 733840, 734004, 734467, 734560, 734643, 734708, 734772, 735100, 735165, 735224, 735286, 735338, 735396, 736299, 736794, 738091, 738837, 738856, 738862, 738908, 738949, 739041, 739064, 739085]
+'SE9 1EH': [711397, 711439, 711669, 712950, 714299, 717459, 723266, 723767, 724214, 726278, 727418, 728675, 728878, 729697, 729846, 730222, 730379, 730424, 731095, 731206, 731326, 731594, 732220, 732324, 732798]
+'SO15 8AP': [710540, 710828, 714379, 717521, 717744, 717960, 718167, 718363, 719366, 719746, 720098, 720425, 720563, 720736, 720859, 721036, 721337, 721450, 721590, 721714, 721859, 721986, 722132, 722263, 723031]
+'SW4 6RZ': [713156, 713674, 714463, 715186, 715692, 716213, 716704, 717581, 718013, 718410, 719414, 720475, 721086, 721368, 721633, 721898, 722731, 723064, 723335, 724869, 725539, 725809, 727620, 731987, 732972]
+'SW9 9DL': [712812, 714191, 714906, 715972, 717374, 717811, 718221, 718666, 719968, 720289, 720599, 720914, 721207, 721488, 721743, 722025, 722915, 723462, 724369, 724554, 724755, 725191, 727281, 730728, 732672]
+'BN17 6WD': [713701, 714488, 715211, 716231, 716724, 717190, 717601, 718034, 718435, 719434, 719816, 720159, 720493, 720789, 721106, 721390, 721656, 721914, 722191, 723083, 723353, 727659, 729398, 730851, 732016, 733004]
+'BR1 4TQ': [739518, 739539, 739573, 739598, 739621, 739643, 739664, 739683, 739702, 739718, 739735, 739756, 739776, 739794, 739810, 739825, 739839, 739853, 739866, 739879, 739917, 740010, 740078, 740122, 740179, 740207]
+'BR1 5JN': [709803, 709871, 709951, 710023, 710099, 710146, 710196, 710257, 710297, 710346, 710378, 710427, 710492, 710521, 710548, 710578, 710607, 710625, 710637, 710656, 710678, 710701, 710749, 710810, 711595, 711698]
+'BR3 4BB': [713146, 713667, 714452, 715181, 716206, 716698, 717164, 717577, 718006, 718405, 719012, 719410, 719793, 720470, 721082, 721629, 722171, 722719, 723330, 723835, 725528, 727611, 729351, 730812, 731977, 732961]
+'BR3 4BH': [713598, 715110, 716147, 717103, 717958, 718917, 719361, 720095, 720732, 721334, 721856, 722619, 723029, 723574, 724030, 724452, 724839, 725436, 725780, 726144, 726465, 726774, 727032, 727520, 727858, 731892]
+'CR0 4YF': [710439, 713067, 713609, 714387, 715118, 715649, 716153, 716640, 717109, 717525, 717962, 718368, 719370, 719752, 720101, 720431, 720739, 721040, 721338, 722637, 725448, 727535, 729277, 730750, 731905, 732885]
+'CR0 4YG': [711128, 711729, 713287, 714552, 715758, 716774, 717646, 718481, 719862, 720532, 721144, 721685, 722227, 722853, 723393, 723889, 724319, 724713, 725092, 726030, 726357, 726674, 727186, 727748, 728041, 730918]
+'E1 0BA': [713158, 713675, 714465, 717170, 718411, 719797, 720144, 721370, 721636, 722734, 723612, 723842, 724067, 724277, 724477, 724676, 724871, 725058, 725541, 725810, 725996, 726169, 727622, 729364, 730820, 732974]
+'E1 2PL': [714419, 715148, 715667, 716671, 717135, 719392, 719772, 720120, 720452, 721058, 722150, 722672, 724851, 725042, 725791, 727041, 727156, 728599, 728799, 729563, 729665, 729771, 729871, 730243, 730406, 731938]
+'E1 5HH': [714323, 715058, 716105, 716587, 717480, 718326, 719321, 721561, 722106, 723284, 723545, 723787, 724233, 724821, 725005, 725763, 725959, 726121, 726291, 726451, 726759, 726960, 727846, 728120, 728581, 728680]
+'E2 9RH': [713665, 715179, 715684, 716203, 716696, 717162, 718403, 719008, 719408, 719791, 720139, 720468, 720768, 721175, 721625, 721892, 721988, 722167, 723833, 724060, 724273, 724472, 725526, 729350, 731976, 732957]
+'GU28 9HN': [713047, 714368, 716143, 717513, 718911, 719356, 719739, 720089, 720249, 720259, 720417, 721029, 725433, 729255, 732871, 735507, 735549, 735592, 735870, 735918, 735965, 736008, 736054, 736086, 736125, 736157]
+'GU28 9HY': [713747, 718066, 722823, 723650, 724096, 724311, 725084, 725634, 725831, 726819, 727717, 728036, 730902, 732073, 733738, 734823, 735382, 735383, 735384, 735385, 735424, 735474, 735888, 735929, 736718, 736735]
+'GU29 9PJ': [713915, 713976, 714005, 714070, 730418, 731007, 731085, 731160, 731289, 731462, 731524, 732160, 732213, 733945, 733950, 738014, 738025, 738035, 738053, 738198, 738204, 738211, 738220, 738231, 738238, 738247]
+'HA1 4GQ': [739225, 739234, 739246, 739255, 739264, 739273, 739282, 739291, 739300, 739308, 739315, 739325, 739332, 739342, 739349, 739356, 739362, 739368, 739373, 739394, 739427, 739442, 739451, 739460, 739469, 739478]
+'NW10 8LQ': [723521, 723755, 724413, 724600, 724798, 724981, 725743, 725935, 726097, 726423, 726590, 726739, 726877, 727001, 727117, 727823, 728223, 728333, 728445, 728561, 728669, 728771, 728872, 729537, 729636, 729739]
+'NW10 8NJ': [712925, 713481, 714274, 714998, 715576, 716059, 716549, 717442, 717887, 718786, 719279, 720027, 720660, 721270, 721798, 722475, 722970, 723515, 723974, 724411, 725305, 725739, 729141, 730617, 731779, 732771]
+'PE4 7BW': [710329, 710332, 716858, 716869, 716879, 717252, 717257, 717266, 717272, 717281, 717288, 717292, 717298, 717305, 717309, 717659, 717666, 717673, 717684, 717694, 717702, 717718, 717724, 718091, 718098, 718106]
+'PO19 7HB': [712926, 713482, 717015, 718787, 720661, 722476, 722971, 723516, 724596, 724980, 725306, 726266, 727390, 729142, 731780, 734017, 734476, 734782, 735175, 735297, 735405, 735524, 735583, 735909, 737576, 738108]
+'PO20 7LT': [713056, 714374, 717104, 718358, 719362, 720422, 721335, 721587, 722130, 722624, 723308, 723575, 723807, 724252, 724646, 725029, 725440, 725781, 726145, 726625, 726775, 727525, 729265, 730739, 731894, 732876]
+'RH11 8AJ': [710325, 710367, 710394, 711641, 711732, 713314, 713774, 714570, 715284, 715770, 716293, 716786, 717246, 719159, 719483, 719872, 720206, 720542, 720830, 721154, 721427, 722876, 725676, 727766, 729493, 730934]
+'RH19 2SD': [709866, 710546, 714254, 714976, 716038, 716995, 717426, 717867, 718276, 718759, 719262, 719663, 720341, 720647, 720955, 721261, 721527, 721786, 722452, 722958, 725277, 727365, 729111, 730588, 731748, 732743]
+'SE11 5SF': [713152, 713672, 714459, 715185, 716212, 718011, 719412, 720143, 720473, 720772, 721085, 721632, 722726, 723062, 723334, 723608, 723838, 724064, 724276, 724474, 724675, 724868, 725535, 725808, 729360, 732970]
+'SE11 5TA': [723301, 723568, 724023, 724247, 724447, 724834, 725024, 725773, 725972, 726137, 726209, 726305, 726462, 726619, 726770, 726903, 727028, 727855, 727997, 728125, 728249, 728356, 728465, 728685, 728791, 728894]
+'SE16 4DY': [736132, 736160, 736196, 736227, 736473, 736503, 736537, 736679, 736711, 736734, 737035, 737056, 737082, 737368, 737390, 737410, 737431, 737448, 737467, 737480, 737494, 737512, 737618, 737674, 737689, 737707]
+'SW4 6QL': [712931, 713489, 714280, 715005, 715580, 716552, 717017, 718293, 718794, 719282, 719679, 720358, 720666, 721274, 721802, 722078, 722480, 722976, 723254, 723979, 724202, 724414, 724601, 725313, 729146, 732777]
+'BN17 6FB': [717795, 719197, 719959, 720592, 720905, 721202, 721476, 721737, 722013, 722908, 723203, 723453, 723708, 723934, 724149, 724365, 724547, 724938, 726383, 726705, 726969, 727788, 728070, 728302, 728519, 728735, 729508]
+'CR0 4YD': [711414, 711428, 722980, 723524, 723983, 724416, 724802, 725746, 726101, 726427, 726743, 727003, 728106, 728335, 728564, 728772, 729540, 729741, 730292, 730974, 731133, 731259, 731378, 731498, 732136, 732250, 732348]
+'CR2 0QG': [711892, 720778, 721096, 721376, 721642, 733717, 733903, 734183, 734283, 734391, 734504, 734598, 734673, 734743, 734804, 734983, 735132, 735197, 735260, 735314, 735764, 736383, 736872, 737274, 737624, 737912, 738153]
+'PO10 8TJ': [712868, 713427, 714228, 714946, 716499, 717845, 718256, 718727, 725248, 729075, 731722, 732717, 735443, 735856, 735948, 736035, 736109, 736176, 736453, 736520, 736581, 736639, 736695, 736927, 736972, 737019, 737066]
+'PO19 7NT': [736934, 736959, 736981, 737003, 737051, 737075, 737118, 737342, 737362, 737386, 737444, 737464, 737492, 737508, 737672, 737686, 737701, 737718, 737732, 737748, 737761, 737778, 737798, 737960, 737985, 738009, 738020]
+'RH16 4JP': [710052, 711226, 713207, 713707, 714500, 715721, 716236, 716732, 717605, 718042, 718439, 719070, 719441, 719825, 720166, 720497, 721113, 721916, 722195, 722779, 723088, 723632, 725582, 729407, 730862, 732026, 733016]
+'SE11 5BX': [726138, 726620, 726771, 726904, 727029, 727147, 728357, 728466, 728588, 728686, 728895, 729762, 729957, 730141, 730310, 730397, 730985, 731215, 731333, 731509, 731571, 732146, 732255, 732305, 732356, 732400, 732458]
+'SE11 5DA': [713544, 715616, 716109, 716592, 717065, 717486, 720064, 720391, 720701, 721309, 721564, 722108, 722548, 723004, 723285, 723548, 723788, 724010, 724234, 724438, 724631, 725007, 725379, 725764, 729208, 731843, 732829]
+'SE18 6UD': [709927, 711395, 711434, 728646, 728746, 728851, 729517, 729719, 729825, 729929, 730004, 730111, 730359, 731112, 731189, 731248, 731313, 731364, 731424, 732285, 732384, 732574, 733102, 733144, 733197, 733230, 733275]
+'SO14 3TH': [711036, 721505, 721764, 722040, 723224, 723480, 723726, 723953, 724174, 724384, 724573, 724770, 725908, 726072, 726243, 726400, 726567, 726720, 726856, 726982, 727105, 727805, 727956, 741344, 741346, 741347, 741348]
+'SW4 6SA': [713024, 713576, 714352, 715092, 715633, 716126, 716614, 717503, 717943, 718346, 718891, 719729, 720407, 721574, 722116, 722587, 723015, 723295, 723558, 724015, 724442, 724827, 725012, 725965, 726129, 730711, 731869]
+'SW9 9AG': [713230, 713722, 715228, 715732, 716744, 717618, 718051, 718452, 719451, 720801, 721123, 722795, 723369, 723639, 723870, 724303, 724498, 724697, 724896, 725607, 725827, 726345, 726512, 726666, 726940, 727893, 729426]
+'BN18 0TH': [712906, 714260, 716535, 717432, 718279, 718767, 720016, 720651, 721263, 721788, 723506, 723967, 724401, 724788, 725284, 725733, 726087, 728553, 728765, 729117, 729532, 729632, 729734, 730120, 730285, 730964, 731754, 732751]
+'BR6 7AU': [717612, 718045, 718447, 719445, 719830, 720171, 720504, 720798, 721119, 721397, 721663, 721922, 722201, 723363, 723866, 724298, 724694, 725079, 726014, 726341, 726662, 726937, 727891, 728028, 728276, 728491, 728712, 728925]
+'CT19 5SX': [733679, 733878, 734037, 734156, 734273, 734373, 734493, 734580, 734663, 734728, 734792, 734941, 735120, 735186, 735243, 735307, 735358, 735414, 735462, 735506, 735548, 735730, 736348, 736840, 737240, 737599, 737881, 738128]
+'E1 2NN': [714114, 714124, 714132, 714135, 714138, 714825, 714840, 716496, 718579, 718591, 718596, 718602, 718719, 719562, 719570, 719913, 719924, 720313, 720930, 721506, 721765, 722934, 723173, 723424, 723429, 725242, 729069, 732710]
+'E2 9AD': [713180, 713689, 714478, 715704, 716714, 717181, 718024, 719425, 720152, 720483, 720780, 721098, 721379, 722755, 723074, 723619, 724073, 724284, 724682, 724879, 726003, 726174, 726332, 726497, 727640, 730835, 732001, 732989]
+'GU28 9NP': [713108, 718971, 722681, 726602, 726685, 726692, 726750, 726831, 727012, 728344, 730130, 730382, 731262, 732351, 732395, 732455, 737107, 737108, 737130, 737131, 737150, 737152, 737355, 737356, 737978, 737979, 737991, 738753]
+'GU31 5HJ': [713124, 713649, 714436, 717152, 721066, 721885, 722156, 722697, 723051, 723601, 723826, 724052, 724667, 724861, 725802, 726161, 726320, 729333, 730793, 731958, 732939, 734670, 734738, 734801, 735195, 735256, 735313, 735365]
+'ME14 1HF': [710120, 710174, 711259, 711283, 713310, 714566, 715280, 719156, 719871, 720204, 720541, 720829, 722872, 723402, 723664, 723896, 724108, 725674, 726036, 726203, 726364, 726527, 728174, 728291, 729695, 729802, 729896, 729983]
+'ME20 7GF': [711427, 724402, 724591, 724789, 724975, 725734, 726088, 726261, 726414, 726584, 726727, 726871, 726992, 728098, 728440, 728554, 729841, 729938, 730022, 730214, 730286, 730373, 730965, 731050, 738683, 738686, 738688, 738702]
+'N1 7FF': [711776, 718640, 733823, 733988, 734107, 734246, 734337, 734454, 734552, 734631, 734700, 734764, 734859, 735089, 735153, 735214, 735277, 735330, 735388, 735435, 735483, 735645, 736264, 736765, 737171, 737537, 737818, 738068]
+'N7 9EJ': [711014, 713229, 714515, 715731, 716252, 716743, 717210, 717617, 718451, 719450, 721666, 721926, 722204, 723093, 723638, 723869, 724089, 724302, 724497, 724696, 725081, 725826, 726017, 727692, 729425, 733034, 739159, 739160]
+'NN5 7LX': [710579, 711337, 739519, 739540, 739575, 739599, 739644, 739665, 739684, 739719, 739737, 739757, 739778, 739797, 739812, 739841, 739856, 739868, 739882, 739893, 739904, 739918, 739938, 740011, 740079, 740153, 740180, 740209]
+'NW10 8BW': [712810, 714190, 715517, 716461, 717372, 718219, 719614, 720288, 720913, 721486, 722023, 722363, 723209, 723714, 724155, 724553, 724942, 725892, 726226, 726548, 726843, 727092, 727279, 727946, 728192, 728416, 730508, 732671]
+'PO19 8DA': [712829, 713402, 714207, 715989, 716481, 716946, 717388, 717825, 718240, 718684, 719224, 719631, 719982, 720300, 720611, 721219, 721498, 721753, 722035, 722386, 722923, 723470, 723721, 723945, 725211, 727301, 730528, 731691]
+'SE16 3SG': [712824, 713397, 714202, 714917, 715529, 715985, 716476, 716940, 717384, 717820, 718234, 718680, 719216, 719626, 719975, 720296, 720606, 720923, 721214, 721495, 721752, 722381, 725206, 727296, 729035, 730522, 731687, 732685]
+'SE25 4DW': [710322, 713270, 713752, 714542, 715257, 715750, 716273, 716765, 717229, 718069, 718472, 719125, 719471, 719854, 720190, 720524, 720815, 721136, 721414, 721678, 721945, 722837, 725642, 727727, 729465, 730908, 732079, 733066]
+'SE5 9JJ': [714824, 714853, 715919, 715926, 716883, 716890, 717739, 717752, 718561, 718571, 719923, 720561, 720569, 720576, 721171, 721178, 721711, 721720, 721724, 722267, 723423, 723437, 723911, 723917, 731601, 731620, 733483, 733492]
+'SW9 0RZ': [713794, 713829, 713869, 713943, 714003, 714043, 714069, 714104, 714590, 714614, 714649, 714676, 714724, 714750, 714771, 714790, 714808, 715301, 715325, 715359, 715374, 715409, 715420, 733329, 733362, 733400, 733438, 733473]
+'TN24 0LR': [712875, 713433, 714232, 714951, 715547, 716015, 716507, 716973, 717406, 717849, 718260, 718735, 719241, 719649, 719999, 720321, 720628, 720941, 721242, 721514, 721770, 722423, 725254, 727334, 729083, 730563, 731729, 732720]
+'BN17 5FB': [711760, 711814, 711854, 711855, 711891, 711893, 711920, 711921, 711963, 712227, 712228, 712325, 712326, 712422, 712423, 712508, 712509, 712571, 712572, 712620, 712621, 712668, 712669, 712741, 712742, 712744, 733716, 734982, 735614]
+'BR1 1AA': [710756, 710937, 711117, 711137, 711148, 711796, 711844, 711878, 711910, 711956, 711974, 711994, 712089, 712265, 712270, 712276, 712309, 712342, 712346, 712350, 712355, 712358, 712362, 712369, 712406, 712490, 712555, 712606, 712655]
+'E2 6QY': [713353, 714162, 714874, 715501, 716438, 716907, 717346, 717780, 718200, 718628, 719188, 719950, 721194, 721730, 722006, 722903, 723702, 723930, 724142, 724360, 724538, 724747, 724930, 725879, 726542, 726701, 727250, 731643, 732642]
+'GU28 9ES': [715028, 715596, 716080, 717035, 717904, 718306, 718827, 719299, 719689, 720044, 721548, 723771, 723995, 724217, 724808, 724989, 725752, 725947, 726108, 726279, 726436, 726597, 726884, 727126, 727422, 727834, 730647, 731812, 732803]
+'N7 9EQ': [710226, 714022, 714089, 714605, 714663, 714711, 714798, 715314, 715353, 715386, 715416, 715440, 715821, 715856, 715875, 715904, 716356, 716405, 716822, 716839, 716855, 716872, 717269, 717284, 717663, 717722, 718096, 718109, 718127]
+'NW10 8BE': [740260, 740288, 740315, 740340, 740360, 740381, 740403, 740424, 740446, 740467, 740486, 740515, 740534, 740551, 740566, 740579, 740592, 740605, 740618, 740631, 740643, 740656, 740682, 740800, 740854, 740894, 740931, 740960, 740989]
+'NW10 8GL': [738397, 738419, 738434, 738557, 738690, 738691, 738721, 738774, 738786, 738798, 738810, 738835, 738861, 738870, 738878, 738884, 738889, 738896, 738906, 738947, 738987, 739010, 739039, 739062, 739095, 739114, 739121, 739194, 739212]
+'NW10 8HZ': [739219, 739228, 739240, 739249, 739258, 739267, 739276, 739285, 739294, 739303, 739311, 739319, 739328, 739338, 739345, 739352, 739359, 739365, 739371, 739376, 739380, 739384, 739388, 739421, 739436, 739445, 739454, 739463, 739472]
+'NW10 8LA': [712815, 713388, 714912, 715455, 715471, 715522, 715975, 716465, 716934, 717377, 717813, 718162, 718174, 718225, 718671, 719211, 719617, 719970, 720290, 720602, 720855, 720865, 722368, 725196, 727285, 729029, 730439, 730513, 732676]
+'NW10 8LE': [712751, 712752, 712753, 713336, 718610, 718611, 718612, 722308, 722309, 722310, 725132, 725133, 725134, 725135, 727233, 727234, 727235, 727236, 728971, 728972, 728973, 730459, 730460, 730461, 730462, 731624, 731625, 731626, 731627]
+'PO19 3LS': [735991, 736029, 736071, 736144, 736213, 736450, 736489, 736518, 736552, 736577, 736607, 736635, 736666, 736691, 736721, 736924, 736950, 736969, 736993, 737018, 737043, 737063, 737090, 737110, 737133, 737334, 737375, 737399, 737418]
+'PO19 6RS': [714592, 714651, 714751, 715781, 715793, 715850, 717674, 717685, 732371, 733128, 733364, 733440, 734431, 734439, 734446, 734533, 734537, 734544, 734623, 734625, 734627, 734689, 734696, 734756, 734757, 734758, 734759, 734819, 734820]
+'PO9 5EW': [712119, 733661, 733862, 734024, 734143, 734363, 734481, 734573, 734655, 734721, 734786, 734922, 735180, 735238, 735302, 735352, 735409, 735455, 735499, 735543, 735586, 735709, 735866, 736329, 736820, 737218, 737583, 737865, 738115]
+'RH11 7UG': [709854, 710623, 710673, 712788, 714175, 714890, 715510, 715957, 716451, 716916, 717360, 717796, 718210, 718651, 719198, 719604, 719960, 720275, 720593, 721203, 721477, 722345, 723204, 723454, 725172, 727264, 729006, 730493, 732657]
+'RH14 9RD': [710868, 711049, 711646, 722049, 723231, 724180, 724579, 724964, 726247, 726571, 726860, 727107, 727959, 728206, 728431, 728656, 728859, 729626, 729833, 730015, 730207, 730366, 731042, 731195, 731319, 731428, 731552, 732294, 732389]
+'SE1 3GF': [734118, 734254, 734344, 734462, 734557, 734638, 734706, 734769, 735096, 735160, 735220, 735283, 735335, 735392, 735439, 735487, 735575, 735851, 738356, 738367, 738374, 738455, 738548, 738606, 738656, 738693, 738714, 738735, 738765]
+'SE15 2AA': [712581, 712948, 718817, 722505, 725338, 727414, 729168, 730640, 731808, 732794, 733776, 734080, 734209, 734413, 734529, 734618, 734686, 734755, 734818, 735039, 735142, 735812, 736426, 736905, 737314, 737946, 738187, 741410, 741416]
+'SE15 5QJ': [712337, 715071, 715620, 716116, 716601, 717491, 717930, 718338, 719332, 720072, 720397, 720706, 721006, 721314, 721569, 721835, 723009, 723290, 733771, 733933, 734078, 734207, 735034, 735809, 736903, 737310, 737653, 737944, 738185]
+'SE8 3DF': [713044, 713590, 714366, 715104, 715639, 716141, 716625, 718909, 721851, 722126, 722612, 723025, 723305, 723571, 723802, 724026, 724250, 724449, 724642, 724836, 725026, 725432, 725776, 725974, 726141, 727512, 729254, 730731, 731887]
+'SO16 8FQ': [712267, 712439, 712442, 719184, 719945, 720890, 721189, 721461, 721725, 721999, 722896, 723443, 723925, 726699, 726835, 726962, 727785, 728514, 728843, 728980, 729503, 736172, 736212, 736488, 736516, 736949, 737016, 737042, 737089]
+'SO18 3RP': [709944, 710484, 710602, 710731, 711583, 712856, 713418, 714936, 715537, 716003, 716494, 716958, 717397, 717839, 718252, 718712, 719639, 719991, 720311, 720929, 721227, 721503, 721760, 722038, 725235, 727321, 729063, 730553, 732705]
+'SO18 4AR': [711896, 712518, 733748, 733928, 734203, 734294, 734408, 734525, 734614, 734682, 734752, 734813, 735029, 735138, 735204, 735271, 735323, 735379, 735428, 735478, 735519, 735565, 735606, 735794, 736414, 736898, 737650, 737938, 738180]
+'SW9 9AY': [712857, 714221, 714937, 715538, 716004, 716959, 717398, 717840, 718713, 719234, 719640, 719992, 720621, 721228, 721504, 721761, 722039, 722408, 722930, 723223, 723725, 723952, 724172, 724383, 724572, 724958, 729064, 731713, 732707]
+'SW9 9ET': [713126, 713652, 714439, 715167, 715676, 716195, 717154, 717562, 717996, 718991, 719398, 720130, 720460, 721068, 721360, 721619, 721887, 722158, 722699, 723053, 723602, 723827, 724053, 724862, 725048, 725505, 725803, 731961, 732943]
+'SW9 9EZ': [713190, 713696, 714483, 715206, 716229, 716721, 717188, 717597, 718031, 718428, 719053, 719810, 720488, 721388, 721650, 721910, 722186, 722765, 723079, 723348, 723625, 723856, 724078, 724288, 725071, 725819, 727653, 729394, 733000]
+'BR1 4AX': [710797, 713251, 713255, 713740, 714529, 715245, 715744, 716266, 716759, 717633, 718063, 718467, 719112, 719115, 719466, 719848, 720186, 720519, 720809, 721133, 721411, 721674, 721936, 725630, 727710, 729450, 729453, 730897, 732065, 733053]
+'E1 5BN': [714558, 715761, 716777, 717649, 718487, 720537, 721149, 722233, 722857, 723397, 723893, 724322, 724716, 725095, 726032, 726360, 726948, 727189, 727752, 728044, 728288, 728501, 728716, 728935, 729691, 730079, 730263, 730921, 731092, 733079]
+'GU27 3NZ': [713623, 714408, 715138, 715661, 716172, 716661, 717127, 717540, 717975, 718379, 719385, 720115, 720448, 720750, 721054, 721348, 721604, 721873, 723040, 732907, 736738, 736740, 737153, 737154, 737517, 737519, 737802, 737803, 738054, 738055]
+'GU29 0NX': [715553, 716022, 717852, 720631, 724966, 725915, 726249, 733643, 733847, 734008, 734128, 734900, 735444, 735492, 735535, 735687, 735857, 735995, 736582, 736640, 736668, 736696, 736802, 736953, 736973, 736995, 737020, 737565, 737847, 738097]
+'HA1 1GU': [711808, 711850, 711887, 711916, 711939, 711960, 711980, 711998, 712011, 712027, 712036, 712100, 712122, 712130, 712135, 712140, 712149, 712157, 712164, 712170, 712175, 712180, 712222, 712243, 712320, 712418, 712501, 712565, 712614, 712663]
+'PO19 7LS': [740251, 740278, 740305, 740331, 740372, 740395, 740416, 740438, 740459, 740478, 740505, 740527, 740544, 740560, 740574, 740587, 740600, 740613, 740626, 740638, 740651, 740672, 740693, 740704, 740790, 740844, 740884, 740922, 740950, 740979]
+'RH16 3QQ': [739532, 739555, 739589, 739613, 739634, 739658, 739678, 739697, 739714, 739731, 739748, 739772, 739789, 739806, 739821, 739835, 739848, 739863, 739875, 739888, 739899, 739909, 739933, 739944, 740025, 740094, 740137, 740168, 740195, 740224]
+'SE11 5TT': [713012, 714343, 716123, 716608, 717497, 718343, 719340, 719726, 720078, 720403, 720711, 721013, 721317, 721447, 721571, 721838, 722113, 722573, 723012, 723555, 723793, 724014, 724441, 725963, 726126, 726295, 726454, 727483, 729228, 730700]
+'SE18 1BL': [710347, 710608, 713526, 715040, 717046, 718837, 719307, 720052, 721298, 721820, 722996, 723537, 724429, 724814, 725355, 726113, 726444, 726752, 727014, 727840, 728347, 728574, 728781, 729185, 729747, 729949, 730131, 730300, 731137, 731823]
+'SE19 2TE': [711300, 711424, 728728, 728731, 728943, 728945, 728946, 728947, 729702, 729703, 729705, 729706, 729899, 729903, 729907, 729908, 729909, 730083, 730084, 730085, 730086, 730087, 730088, 730089, 733803, 735073, 735800, 736441, 736915, 737325]
+'SO15 0NS': [713125, 713651, 714438, 715166, 715675, 716194, 716684, 717153, 717561, 717995, 718395, 718990, 719397, 719782, 720129, 720459, 720761, 721067, 721359, 721618, 721886, 722157, 722698, 723052, 725504, 727588, 729335, 730795, 731960, 732942]
+'SW9 0SA': [715432, 715790, 715804, 715826, 715845, 715859, 715870, 715880, 715896, 716302, 716309, 716348, 716363, 716376, 716386, 716403, 716794, 716817, 716826, 716836, 716845, 716853, 716860, 716870, 716881, 717253, 717259, 717267, 717274, 717282]
+'SW9 9AZ': [725907, 726071, 726399, 726565, 726719, 726855, 727103, 727804, 727954, 728086, 728316, 728427, 728535, 728652, 728750, 729520, 729830, 729931, 730011, 730113, 730203, 730281, 730958, 731038, 731117, 731368, 731427, 731485, 732120, 732180]
+'BN3 5GG': [733506, 733507, 733509, 733510, 733512, 733513, 733515, 733516, 733517, 733518, 733519, 733520, 733521, 733522, 733527, 733528, 733533, 733534, 733537, 733538, 733539, 733543, 733544, 733548, 733549, 733552, 733553, 733556, 733557, 733559, 733560]
+'BR3 4BA': [713016, 713568, 715087, 716125, 716610, 717087, 717499, 717941, 718344, 718886, 719342, 719727, 720080, 720404, 720713, 721014, 721318, 721572, 721840, 722114, 722578, 723013, 723294, 723556, 723795, 725406, 727487, 729231, 730703, 731861, 732850]
+'BR5 2PX': [710433, 710551, 710680, 711485, 712982, 713543, 714326, 715061, 715614, 716108, 716589, 717064, 717484, 717922, 718329, 719322, 719713, 720699, 721001, 721308, 721563, 722107, 722546, 723003, 723547, 724009, 725376, 727455, 729207, 731842, 732828]
+'DA1 5JG': [709986, 713291, 713766, 715273, 716282, 716778, 717240, 717650, 718488, 719140, 719479, 719868, 720199, 720538, 720825, 721150, 721690, 721953, 722234, 722858, 723115, 723398, 723660, 723894, 724105, 725660, 727753, 729481, 730922, 732096, 733080]
+'DA1 5JU': [710486, 710655, 710864, 719644, 719994, 720316, 720624, 720932, 721233, 721767, 722042, 722937, 723226, 723425, 723430, 723438, 723441, 723484, 723682, 723694, 723697, 723729, 723955, 724176, 724387, 724576, 724773, 724961, 725721, 725910, 726073]
+'E1 2NQ': [713048, 713593, 714369, 715105, 715641, 716144, 716626, 717514, 717954, 718912, 719357, 719740, 720090, 720418, 720729, 721030, 721331, 721853, 722614, 723026, 723306, 723804, 724027, 724251, 724450, 724643, 724837, 725778, 729256, 730733, 731888]
+'GU27 3QZ': [726440, 726601, 726749, 726888, 727011, 727129, 727837, 727978, 728233, 728343, 728572, 728780, 728881, 729547, 729642, 729848, 729948, 730034, 730224, 730299, 730381, 730978, 731136, 731207, 731327, 731500, 731563, 732138, 732195, 732299, 732350]
+'GU29 0NU': [730116, 731197, 731430, 731487, 732124, 732187, 732296, 732391, 732447, 739558, 739559, 739560, 739561, 739562, 739563, 739564, 739565, 739566, 739567, 740199, 740200, 740228, 740229, 740230, 740231, 740232, 740233, 740234, 740235, 740236, 740237]
+'ME14 1EZ': [710364, 710532, 710566, 710630, 710649, 710690, 710841, 713257, 713744, 714533, 715249, 715746, 716267, 716761, 717224, 717635, 718468, 719119, 719467, 720521, 720810, 721676, 722214, 722821, 723100, 723647, 723879, 725633, 727715, 730901, 732069]
+'N7 8HW': [712828, 713401, 714206, 714920, 715532, 715988, 716480, 716945, 717387, 717824, 719223, 719630, 719981, 720299, 721218, 721497, 722385, 722922, 723217, 723469, 723720, 724165, 724376, 724564, 724762, 724952, 725210, 725713, 727300, 730527, 732688]
+'NW10 8EQ': [713034, 714359, 715637, 716619, 717507, 718350, 720411, 721018, 721577, 722119, 722601, 723298, 723798, 724242, 724637, 725969, 726302, 726617, 726900, 727143, 727503, 727994, 728246, 728463, 730722, 739191, 739192, 739197, 739199, 739201, 739202]
+'PE2 5HP': [740241, 740270, 740298, 740325, 740350, 740366, 740389, 740411, 740433, 740454, 740474, 740495, 740523, 740540, 740557, 740572, 740585, 740598, 740611, 740624, 740636, 740648, 740662, 740690, 740701, 740712, 740780, 740834, 740874, 740912, 740970]
+'PE4 6GG': [721911, 722189, 723081, 723351, 739527, 739550, 739584, 739608, 739631, 739653, 739673, 739692, 739709, 739726, 739744, 739767, 739785, 739802, 739818, 739832, 739845, 739860, 739873, 739886, 739928, 740020, 740089, 740132, 740163, 740190, 740219]
+'SE16 4BF': [733874, 734032, 734153, 734272, 734371, 734490, 734579, 734661, 734726, 734791, 734938, 735118, 735184, 735241, 735306, 735355, 735411, 735459, 735503, 735546, 735590, 735726, 735869, 735916, 735962, 736006, 736050, 736084, 736344, 736836, 738124]
+'SE6 4NE': [710511, 710568, 714112, 714123, 715454, 715470, 716410, 716424, 717314, 717326, 717334, 718173, 718181, 719569, 719575, 720258, 720854, 720872, 721441, 721457, 721996, 722277, 722297, 723172, 723179, 723184, 723678, 723692, 729026, 730449, 730455]
+'SO31 6RL': [739525, 739547, 739581, 739605, 739628, 739650, 739670, 739689, 739707, 739724, 739742, 739764, 739783, 739801, 739816, 739831, 739843, 739859, 739871, 739885, 739896, 739907, 739925, 739941, 739951, 740017, 740086, 740129, 740160, 740187, 740216]
+'SW4 6SB': [712997, 713554, 715070, 716598, 717074, 717490, 717929, 718337, 718874, 719331, 720070, 721005, 721313, 721568, 721834, 722561, 723007, 723289, 723553, 723791, 724012, 724440, 724824, 725010, 725765, 725961, 726124, 727470, 730683, 731850, 732837]
+'SW4 6TE': [713226, 714512, 715729, 716741, 718450, 719088, 719448, 719832, 720173, 720507, 720799, 721120, 721400, 721925, 722202, 722792, 723091, 723366, 723867, 724088, 724300, 724496, 724894, 725080, 725604, 725825, 726188, 727689, 729422, 730878, 733032]
+'BN2 4EU': [710941, 711311, 711420, 711431, 724481, 724681, 724876, 725813, 726002, 726173, 726331, 726494, 726655, 726801, 726928, 727056, 727171, 727882, 728022, 728147, 728268, 728383, 728485, 728611, 728704, 728812, 729578, 729677, 729783, 729882, 730069, 730253]
+'DA1 5UN': [709861, 710018, 710137, 710249, 710341, 710415, 710485, 710543, 710603, 710636, 710677, 710807, 710848, 710881, 710904, 710926, 710959, 711035, 711068, 711094, 711112, 711134, 711245, 711262, 711277, 711289, 711304, 711323, 711382, 711400, 711412, 711584]
+'E2 9AE': [713386, 714194, 714909, 715520, 715973, 717375, 717812, 718223, 718668, 719210, 719615, 719969, 720601, 720915, 721208, 721489, 722365, 722916, 723211, 723463, 723939, 724156, 724370, 724756, 724944, 726388, 726550, 727282, 729027, 730511, 731679, 732674]
+'E2 9RJ': [712762, 713348, 714154, 714869, 715497, 715942, 716436, 716903, 717342, 717735, 717776, 718196, 718622, 719185, 719946, 720263, 720892, 721727, 722001, 722319, 722898, 723194, 723926, 724139, 724356, 724743, 724927, 725146, 727245, 728982, 730472, 731636]
+'N1 7BA': [712757, 712758, 713342, 713343, 714149, 714150, 714864, 715493, 715937, 716432, 716897, 717339, 717771, 718194, 718617, 719182, 719591, 722314, 722315, 725140, 725141, 727240, 727241, 728975, 728976, 730468, 730469, 731631, 731632, 732634, 732635, 733136]
+'PO19 6UP': [716977, 722052, 723233, 723736, 724582, 729523, 729725, 729935, 734647, 734776, 735103, 735170, 735228, 735291, 735341, 735400, 735445, 735493, 735858, 735949, 736036, 736110, 736306, 736454, 736521, 736641, 736928, 736974, 737021, 737067, 737198, 737848]
+'RH11 8AZ': [709876, 710027, 710203, 710638, 710702, 710755, 710836, 710928, 711038, 714316, 715606, 717050, 717913, 720055, 720995, 721824, 722999, 723541, 724005, 724227, 724432, 724625, 724999, 725362, 725956, 726115, 726286, 726446, 727443, 729192, 730667, 731830]
+'RH1 2BL': [710732, 712879, 714234, 716510, 717409, 718263, 719651, 720002, 720323, 720630, 720942, 721244, 721515, 721773, 722051, 722945, 723492, 723960, 724393, 724778, 725727, 726078, 726405, 726722, 726985, 727339, 727807, 728089, 728321, 728539, 730568, 732725]
+'SE14 5AP': [712795, 713373, 714179, 715046, 715605, 715959, 716454, 716918, 717363, 717797, 718212, 718655, 719606, 719961, 720277, 720594, 720907, 721204, 721479, 721738, 722015, 722351, 722909, 723206, 723455, 723709, 725176, 727268, 729009, 730496, 731662, 732660]
+'SE18 4JY': [711733, 716046, 717004, 717873, 721264, 721790, 722963, 723508, 723969, 724403, 724790, 725735, 726089, 727814, 728099, 728327, 731127, 731253, 731371, 731492, 732129, 732245, 732343, 732451, 732538, 737070, 737113, 737338, 737380, 737423, 737489, 737667]
+'SO17 2JU': [711438, 726329, 726492, 726799, 726926, 727055, 727169, 727880, 728020, 728146, 728267, 728382, 728483, 728609, 728702, 728810, 728917, 729576, 729675, 729781, 729880, 729970, 730067, 730158, 730323, 730412, 730998, 731080, 731153, 731227, 731282, 731342]
+'SW9 9DU': [713136, 713661, 714445, 715682, 716201, 716689, 717160, 718399, 718999, 719404, 719788, 720137, 720464, 720766, 721075, 721890, 722162, 722708, 723057, 723831, 724057, 724470, 724865, 725516, 726164, 726323, 726485, 727598, 729343, 730805, 731970, 732954]
+'CR0 4FB': [733848, 734129, 734350, 734564, 734711, 734901, 735104, 735229, 735342, 735446, 735536, 735859, 735950, 736037, 736111, 736177, 736307, 736455, 736522, 736583, 736642, 736697, 736929, 736975, 737022, 737068, 737111, 737199, 737336, 737378, 737421, 737457, 737849]
+'HA1 4GE': [739217, 739227, 739239, 739248, 739257, 739266, 739275, 739284, 739293, 739302, 739310, 739317, 739327, 739337, 739344, 739351, 739358, 739364, 739370, 739375, 739379, 739383, 739387, 739396, 739399, 739402, 739405, 739420, 739435, 739444, 739453, 739462, 739471]
+'N7 8BA': [713440, 715554, 716024, 716515, 716979, 717412, 717855, 719248, 720006, 720326, 720633, 721247, 721518, 721777, 722053, 722951, 723236, 723497, 723963, 724782, 724967, 726082, 726252, 726575, 726864, 727109, 727962, 728209, 728433, 729835, 730017, 730572, 731736]
+'N7 8HY': [710792, 711058, 713237, 714522, 715234, 715738, 717213, 718456, 719454, 719838, 720512, 720802, 721126, 721405, 721669, 722207, 723371, 723642, 723872, 724092, 724499, 725082, 725613, 726190, 726346, 726515, 726669, 726817, 726943, 728161, 728280, 729432, 732047]
+'PO19 6UR': [716647, 720439, 721047, 721598, 722140, 722646, 727543, 729768, 732891, 733885, 734376, 734584, 734731, 734952, 735124, 735247, 735465, 735875, 735969, 736058, 736129, 736193, 736359, 736535, 736653, 736707, 736939, 736985, 737033, 737080, 737123, 737249, 737346]
+'PO19 7HX': [713709, 714502, 715219, 715722, 716238, 716733, 717197, 718043, 718440, 719932, 720167, 720498, 721114, 721395, 721918, 723358, 723633, 723863, 724085, 724294, 724690, 724891, 725076, 725585, 726009, 726182, 726934, 727064, 727175, 727674, 728152, 728273, 728385]
+'PO19 7QJ': [716188, 716677, 717146, 717989, 718390, 719394, 719777, 720126, 720759, 721612, 722153, 723047, 723596, 724266, 724467, 724856, 725796, 725985, 726159, 726788, 727045, 727869, 728371, 729566, 737705, 737734, 737764, 737790, 737963, 738012, 738033, 738047, 738196]
+'SE11 5TR': [726713, 728299, 728411, 728516, 728637, 728844, 729505, 729912, 730099, 730191, 730271, 730351, 730949, 731027, 731103, 731180, 731417, 731475, 731538, 732110, 732173, 732277, 732436, 732486, 732527, 732566, 733097, 733135, 733192, 733271, 733302, 733340, 733371]
+'SE16 3EW': [710369, 710598, 717307, 717662, 717676, 717689, 717709, 717721, 718095, 718126, 718140, 718495, 718507, 718517, 718536, 718544, 719498, 719513, 719530, 719543, 719901, 719908, 720219, 720225, 720230, 720240, 720242, 720545, 720549, 720554, 720556, 720832, 720834]
+'SE18 6SZ': [710604, 710960, 711169, 711470, 712870, 713429, 714230, 714948, 715543, 716010, 716501, 716969, 717403, 717847, 718258, 718731, 719238, 719646, 719996, 720318, 720937, 721238, 721509, 721768, 722048, 722420, 722941, 723230, 723489, 723735, 729079, 731726, 732718]
+'SE8 3DD': [710572, 711030, 716921, 717366, 717801, 718214, 719202, 719609, 719963, 720595, 720908, 721205, 721481, 721740, 722017, 722911, 723207, 723457, 723711, 723936, 724151, 724366, 724549, 724753, 724940, 725887, 726057, 726384, 726544, 729917, 729995, 730102, 730193]
+'SE8 3GB': [728472, 728595, 728692, 728796, 728903, 729559, 729663, 729767, 729867, 729961, 730055, 730146, 730240, 730312, 730402, 730988, 731070, 731145, 731218, 731272, 731336, 731385, 731451, 731511, 731572, 732149, 732203, 732258, 732308, 732358, 732404, 732460, 732509]
+'SW10 0NT': [713321, 713322, 713324, 713326, 713330, 713332, 713334, 713335, 719164, 719165, 719167, 719169, 719171, 719173, 719176, 719178, 719179, 722883, 722886, 722888, 722890, 722892, 722894, 725681, 725683, 725685, 725687, 725689, 725691, 727773, 727775, 727777, 727780]
+'SW9 0RY': [726938, 727066, 727178, 728029, 728156, 728387, 728818, 728926, 729586, 729681, 729792, 729886, 729975, 730072, 730166, 730328, 730416, 731005, 731083, 731157, 731232, 731287, 731346, 731399, 731460, 732158, 732211, 732367, 732419, 732470, 732552, 733173, 733221]
+'SW9 9DR': [712782, 713367, 714886, 715508, 715954, 716448, 716914, 717356, 718208, 718643, 719194, 719603, 719956, 720274, 720588, 721200, 721473, 721734, 722012, 722337, 723452, 723706, 723933, 724147, 724363, 724544, 724751, 724935, 725165, 725701, 729000, 730487, 732655]
+'SW9 9DS': [725884, 726222, 726382, 726543, 726703, 726839, 726967, 727091, 727787, 727792, 727940, 728188, 728300, 728412, 728517, 728638, 728733, 728845, 729814, 729914, 730100, 730192, 730272, 730352, 730950, 731028, 731104, 731182, 731306, 731357, 731418, 731476, 732111]
+'SW9 9DX': [726645, 726794, 727049, 727164, 728141, 728262, 728376, 728479, 728606, 728700, 728913, 729572, 729777, 729876, 730063, 730153, 730246, 730319, 730994, 731390, 731455, 731516, 732151, 732207, 732312, 732361, 732410, 732464, 732549, 732593, 733121, 733168, 733217]
+'SW9 9HB': [712919, 713476, 714268, 714993, 715570, 716055, 716545, 717012, 717439, 717883, 718287, 718779, 719276, 719674, 720353, 720657, 720962, 721268, 721535, 722072, 722470, 722968, 723250, 723512, 723752, 724199, 724408, 724979, 727385, 729132, 730609, 731772, 732762]
+'BN16 1TG': [711493, 713073, 713614, 714392, 715124, 716159, 716646, 717115, 717528, 717967, 718372, 718936, 719374, 719758, 720105, 720437, 720742, 721045, 721342, 721596, 721866, 722138, 722645, 723034, 723313, 723580, 723813, 724032, 724257, 725455, 727542, 729285, 731913, 732890]
+'CT5 1SX': [709906, 709981, 710058, 710114, 710219, 710319, 710391, 710467, 710533, 710592, 710631, 710664, 710710, 710842, 710877, 710897, 710920, 710943, 711023, 711059, 711090, 711105, 711125, 711372, 711634, 716216, 717171, 718014, 719415, 720145, 720774, 721371, 721900, 723066]
+'E1 0LW': [724550, 725703, 725888, 726058, 726385, 726545, 726706, 726841, 727944, 728075, 728190, 728305, 728523, 728639, 728738, 728846, 729712, 729818, 729920, 729996, 730104, 730194, 730354, 730952, 731031, 731307, 731420, 731539, 732114, 732231, 732330, 732380, 732568, 733195]
+'HA9 8PQ': [738365, 738381, 738398, 738418, 738427, 738447, 738454, 738482, 738490, 738500, 738518, 738532, 738539, 738564, 738577, 738581, 738584, 738588, 738592, 738598, 738604, 738616, 738619, 738633, 738722, 738746, 738843, 738920, 738931, 738941, 739003, 739005, 739006, 739100]
+'PO15 6TA': [713036, 713584, 714361, 715100, 716134, 716620, 717096, 717508, 717950, 718351, 718903, 719350, 719733, 720084, 720412, 720722, 721019, 721325, 721578, 721846, 722120, 722602, 723020, 723299, 723563, 723799, 724019, 724243, 725426, 727504, 729248, 730724, 731881, 732866]
+'RH15 0TD': [710536, 710803, 710825, 710899, 713311, 713772, 714568, 715282, 716291, 716784, 717244, 717653, 718081, 719157, 720205, 721153, 721426, 721692, 722238, 723403, 724110, 724512, 724911, 725100, 725675, 725843, 726365, 726681, 726952, 727194, 727764, 727905, 730932, 733092]
+'RH16 4SH': [710657, 710681, 710871, 710916, 711087, 711103, 711266, 719352, 719734, 720086, 720414, 720724, 721022, 721327, 722123, 723022, 723300, 723567, 724022, 724246, 724446, 724833, 725023, 725772, 725971, 726136, 726461, 726769, 726902, 727027, 727146, 727854, 727996, 728248]
+'SE8 3GA': [714744, 720106, 720438, 720743, 721046, 721343, 721597, 721867, 722139, 723036, 723314, 723582, 723814, 724034, 724258, 724456, 724652, 724845, 725035, 725786, 725977, 726149, 726312, 726470, 726632, 726779, 726910, 727036, 727154, 727862, 728005, 728133, 728256, 728365]
+'SW9 9DD': [725893, 726387, 726549, 726707, 726844, 726972, 727093, 728076, 728193, 728417, 728524, 728640, 728740, 729512, 729613, 729713, 729819, 729921, 729997, 730105, 730195, 730355, 730953, 731032, 731107, 731183, 731245, 731308, 731358, 731421, 731479, 731540, 731678, 732115]
+'BN3 5NQ': [712498, 733697, 733890, 734046, 734170, 734280, 734382, 734499, 734589, 734669, 734737, 734800, 734961, 735129, 735194, 735255, 735312, 735364, 735419, 735467, 735512, 735555, 735597, 735746, 735879, 735923, 735973, 736011, 736061, 736090, 736367, 736853, 737612, 737899, 738140]
+'BN41 2UZ': [720050, 720377, 720686, 720991, 721295, 721552, 721818, 722097, 722994, 723274, 723535, 723777, 724000, 724222, 724426, 724620, 724812, 724995, 725756, 725953, 726112, 726284, 726442, 726603, 726751, 726889, 727013, 727130, 727838, 727979, 728113, 728234, 728346, 728452, 728573]
+'E2 7AA': [714411, 716174, 717130, 717543, 717977, 718381, 719388, 720450, 720752, 721056, 721350, 722145, 723042, 723588, 723820, 724039, 724262, 724656, 724848, 725980, 726152, 726315, 726635, 726781, 726912, 727038, 727864, 728007, 728258, 728367, 728694, 728905, 730767, 731928, 732910]
+'ME16 8FU': [710640, 710658, 710683, 710704, 710814, 710837, 710854, 710872, 710885, 710909, 711801, 711847, 711883, 711913, 711944, 711966, 711983, 712001, 712016, 712030, 712038, 712093, 712125, 712131, 712136, 712142, 712151, 712159, 712215, 712313, 712411, 712494, 712560, 712610, 712660]
+'ME9 9SH': [713129, 713654, 715170, 716198, 717157, 717999, 718995, 719399, 720132, 720762, 722703, 724669, 725050, 725508, 726641, 726921, 727161, 727592, 727872, 728139, 728374, 728605, 728805, 729337, 729569, 729670, 729775, 729874, 729967, 730151, 730317, 730799, 730993, 731964, 732949]
+'N7 9EN': [713830, 713944, 713974, 714004, 714044, 714105, 714591, 714650, 714698, 714725, 731400, 731523, 731586, 732159, 732212, 732267, 732316, 732420, 732471, 732553, 732598, 733174, 733295, 733330, 733363, 733401, 733439, 733474, 739204, 739205, 739206, 739207, 739208, 739209, 739210]
+'NW10 8GP': [709801, 709842, 709870, 709907, 709950, 709982, 710022, 710059, 710098, 710115, 710145, 710172, 710195, 710220, 710256, 710279, 710296, 710320, 710365, 710426, 710468, 710748, 710798, 710972, 711024, 711185, 711234, 711333, 711373, 711478, 711521, 711594, 711635, 712652, 712674]
+'NW10 8LP': [713755, 714544, 715259, 715751, 716275, 716766, 717232, 717638, 718475, 719127, 719856, 720192, 720525, 721140, 721415, 721681, 721946, 722222, 722843, 723106, 723652, 723884, 724097, 724315, 724502, 724706, 724901, 725089, 725645, 725834, 726025, 726354, 727733, 732083, 733068]
+'PE2 5GQ': [739522, 739544, 739578, 739602, 739625, 739647, 739668, 739687, 739705, 739722, 739740, 739761, 739781, 739800, 739815, 739830, 739842, 739858, 739870, 739884, 739895, 739906, 739922, 739940, 739950, 739957, 739965, 739970, 739978, 740014, 740083, 740126, 740157, 740184, 740213]
+'SE16 4JA': [740248, 740276, 740303, 740330, 740353, 740370, 740393, 740415, 740436, 740457, 740477, 740502, 740525, 740542, 740559, 740573, 740586, 740599, 740612, 740625, 740637, 740650, 740669, 740692, 740703, 740714, 740723, 740732, 740741, 740787, 740841, 740881, 740919, 740947, 740977]
+'SE18 4NA': [711549, 713777, 721745, 722917, 723464, 723940, 724371, 724757, 725707, 726059, 726389, 726708, 726973, 727793, 728077, 728308, 728525, 728741, 729513, 729714, 729923, 730107, 730276, 730954, 731109, 731360, 732117, 732332, 732438, 732529, 733100, 733196, 733273, 733342, 733419]
+'SW9 0ST': [712929, 713487, 714278, 715003, 716062, 716551, 717016, 717444, 718290, 718792, 719281, 719677, 720029, 720357, 720664, 720967, 721272, 721539, 721800, 722076, 722479, 722975, 723520, 723754, 723978, 724201, 724412, 724598, 724796, 725311, 725741, 727393, 729145, 731786, 732774]
+'SW9 9BA': [714430, 715161, 715672, 716191, 717150, 717556, 717991, 718392, 718986, 719779, 720127, 720457, 721063, 721356, 721614, 722693, 723049, 723599, 723824, 724048, 724268, 724469, 724665, 725045, 725500, 725799, 725986, 726318, 726481, 726790, 726918, 727159, 727584, 727871, 731953]
+'CT4 7LE': [710675, 710924, 711691, 712825, 713398, 714203, 714918, 715530, 715986, 716477, 716941, 717385, 717821, 718235, 718681, 719217, 719627, 719976, 720297, 720607, 720924, 721215, 722034, 722382, 722921, 723216, 723467, 723719, 723943, 724164, 724375, 725207, 727297, 729036, 730523, 731688]
+'DA11 8EB': [710483, 710601, 710956, 713414, 714934, 716001, 716491, 716955, 717396, 717837, 718248, 718704, 719638, 719990, 720307, 720927, 721226, 721502, 721759, 722037, 722928, 723220, 723475, 723723, 723951, 724382, 724768, 725719, 729058, 731709, 741069, 741086, 741132, 741188, 741230, 741257]
+'E1 1BN': [712796, 713797, 713844, 713879, 719497, 719505, 719512, 719521, 719529, 719537, 719542, 719549, 719555, 723120, 723124, 723130, 723138, 725844, 725847, 725849, 725851, 727907, 727909, 727911, 727912, 727915, 727918, 727921, 727925, 727928, 729599, 729600, 729601, 731013, 731014, 731015]
+'ME14 2EL': [710288, 710867, 711080, 711142, 711297, 712804, 713380, 714185, 714902, 715966, 718216, 718660, 719611, 720282, 720910, 721483, 722020, 722273, 722287, 722357, 723208, 724153, 724551, 724941, 725186, 725890, 726546, 726842, 727274, 727945, 728191, 728415, 729018, 730502, 731671, 732666]
+'N1 7FX': [714428, 715671, 732932, 733571, 733815, 733981, 734100, 734240, 734332, 734449, 734548, 734628, 734697, 734761, 734830, 734833, 735086, 735152, 735212, 735275, 735329, 735387, 735434, 735482, 735526, 735570, 735622, 735846, 735894, 735939, 736242, 736746, 737158, 737523, 737806, 738057]
+'NN1 3AE': [740256, 740284, 740311, 740336, 740377, 740399, 740420, 740442, 740463, 740482, 740511, 740531, 740548, 740564, 740577, 740590, 740603, 740616, 740629, 740641, 740654, 740678, 740696, 740707, 740717, 740726, 740735, 740744, 740752, 740760, 740796, 740850, 740890, 740927, 740956, 740985]
+'NW10 8SA': [718581, 718592, 718598, 718603, 718606, 718607, 718608, 718609, 738377, 738394, 738436, 738437, 738451, 738478, 738552, 738659, 738731, 738732, 738733, 738769, 738781, 738807, 738844, 738852, 738866, 738869, 738877, 738883, 738894, 738901, 738918, 738943, 738982, 739034, 739081, 739092]
+'RH11 7UQ': [710104, 710207, 710891, 710983, 713049, 713594, 714370, 715107, 717100, 717515, 717955, 718355, 718913, 719358, 719741, 720092, 720419, 720730, 721031, 721332, 721584, 721854, 722616, 723027, 723307, 723572, 723805, 724028, 724451, 724644, 724838, 727516, 729257, 730734, 731889, 732872]
+'SE16 3EN': [709925, 713803, 713884, 714018, 714084, 714600, 714660, 714709, 715383, 715414, 715438, 715786, 727104, 727955, 728202, 728428, 728653, 728856, 729623, 729831, 730012, 730204, 730363, 731039, 731192, 731316, 731549, 732181, 732290, 732387, 732494, 733147, 733232, 733377, 733448, 741385]
+'SE28 8LQ': [713193, 713700, 714487, 715210, 715921, 716416, 716887, 717321, 717599, 718032, 718433, 719433, 719815, 720158, 720567, 720574, 720788, 721654, 722265, 723176, 723352, 723627, 723859, 724080, 724290, 724490, 724726, 724734, 724885, 726178, 727656, 730445, 730452, 730849, 732013, 733003]
+'SW9 9AB': [712821, 714199, 715527, 715983, 716471, 717818, 718230, 718678, 719622, 719973, 720604, 721212, 721750, 722031, 722377, 722920, 723215, 723718, 723942, 724161, 724373, 724558, 724759, 724948, 725202, 725710, 725897, 726231, 726391, 726555, 726711, 727291, 729033, 730519, 731684, 732682]
+'SW9 9AD': [713350, 714156, 714870, 715943, 716904, 717343, 717777, 718197, 718624, 719947, 720264, 720582, 720893, 721191, 721463, 721728, 722002, 722321, 722899, 723445, 723700, 723927, 724535, 724744, 724928, 725695, 725876, 726054, 726218, 726700, 726836, 726963, 727247, 728984, 730474, 731638]
+'TN2 3BB': [710929, 711299, 719348, 720082, 720719, 721323, 721843, 723018, 723561, 723797, 724017, 724241, 724444, 724636, 725017, 725770, 725968, 726133, 726301, 726458, 726616, 726766, 726899, 727024, 727142, 727851, 727993, 728245, 728462, 728893, 729656, 729860, 730047, 730234, 730393, 731067]
+'E1 0DU': [712927, 713484, 714275, 715000, 715577, 716550, 717443, 718289, 718790, 719676, 720356, 720663, 720966, 721271, 721538, 721799, 722075, 722973, 723518, 723753, 723976, 724597, 724795, 725309, 725740, 725933, 726096, 726267, 726420, 726736, 726875, 726999, 727391, 727821, 728221, 730619, 731783]
+'N1 7DJ': [728027, 728275, 728709, 728923, 729679, 733608, 733829, 733991, 734112, 734250, 734340, 734457, 734554, 734634, 734702, 734766, 734866, 735093, 735156, 735217, 735280, 735332, 735390, 735437, 735484, 735528, 735572, 735652, 735849, 735897, 735942, 736272, 736771, 737175, 737541, 737824, 738074]
+'NW10 8EY': [713181, 714479, 715706, 716716, 717592, 718424, 719804, 720484, 721100, 721646, 722183, 722757, 723344, 723851, 724286, 724683, 725065, 726004, 726333, 726656, 726930, 727172, 727642, 728023, 728271, 728486, 728706, 728920, 729678, 729883, 730070, 730255, 730413, 730838, 731082, 731229, 732990]
+'PO6 4EZ': [710858, 713162, 713676, 714466, 715188, 716217, 716705, 717172, 717582, 718015, 718412, 719027, 719416, 719798, 720146, 720477, 720775, 721090, 721372, 721637, 721901, 722175, 722738, 723067, 723336, 723843, 724068, 724278, 724478, 724677, 724872, 725059, 725544, 725811, 725997, 726170, 727624]
+'SE13 5EA': [712019, 712039, 712259, 712363, 734108, 734247, 734338, 734455, 734632, 735090, 735154, 735215, 735278, 735389, 735436, 735527, 735571, 735646, 735847, 735895, 735940, 735988, 736026, 736143, 736171, 736210, 736265, 736448, 736486, 736550, 736575, 736606, 736665, 736689, 736766, 737538, 738069]
+'CR0 4FD': [712585, 726863, 727108, 727961, 728208, 728432, 728658, 728861, 729627, 729834, 730016, 730208, 730367, 731043, 731198, 731321, 733946, 733955, 733965, 733978, 733980, 734086, 734090, 734092, 734096, 734098, 734215, 737774, 737970, 737993, 738017, 738039, 738050, 738201, 738212, 738222, 738234, 738244]
+'CT5 1ND': [740263, 740292, 740319, 740343, 740361, 740384, 740406, 740427, 740449, 740470, 740489, 740519, 740537, 740554, 740569, 740582, 740595, 740608, 740621, 740634, 740646, 740659, 740686, 740700, 740711, 740721, 740730, 740739, 740748, 740756, 740764, 740771, 740803, 740858, 740898, 740935, 740964, 740993]
+'N7 9ET': [711407, 712881, 713890, 713954, 714241, 716516, 717413, 718267, 719656, 720327, 720945, 721519, 722054, 722431, 723739, 724186, 724968, 725917, 726576, 726865, 727344, 727963, 728210, 728434, 728545, 728659, 729628, 730209, 730368, 730573, 731044, 731199, 731555, 732189, 732392, 732729, 733237, 733381]
+'PO18 8AG': [740243, 740272, 740300, 740327, 740368, 740391, 740413, 740456, 740476, 740497, 740649, 740664, 740691, 740702, 740713, 740722, 740731, 740740, 740749, 740757, 740765, 740772, 740782, 740807, 740813, 740816, 740818, 740820, 740822, 740824, 740826, 740828, 740830, 740836, 740876, 740914, 740942, 740972]
+'PO19 7LG': [720184, 735002, 735422, 735601, 735886, 735928, 735981, 736015, 736094, 736203, 736230, 736481, 736510, 736544, 736661, 736684, 736717, 739556, 739591, 739615, 739636, 739660, 739680, 739699, 739716, 739733, 739750, 739791, 739808, 739837, 739850, 740096, 740139, 740170, 740197, 740226, 740265, 740688]
+'RH10 1AH': [711965, 712124, 712255, 712266, 712273, 712331, 733735, 733918, 734066, 734196, 734290, 734515, 734608, 734679, 734748, 734808, 735000, 735201, 735267, 735319, 735374, 735421, 735473, 735515, 735561, 735600, 735781, 735885, 735926, 735979, 736066, 736093, 736201, 736885, 737292, 737638, 737927, 738167]
+'SE11 5SB': [713187, 713694, 714482, 715203, 715709, 716719, 717595, 718030, 718427, 719430, 719809, 720155, 720487, 720785, 721386, 722185, 722763, 723078, 723624, 723855, 724077, 724287, 724487, 724685, 724883, 725069, 725565, 725818, 726005, 726334, 726502, 726657, 726806, 726931, 727059, 727647, 730843, 732008]
+'SE13 6QX': [733726, 740290, 740317, 740341, 740382, 740404, 740425, 740447, 740468, 740487, 740517, 740535, 740552, 740567, 740580, 740593, 740606, 740619, 740632, 740644, 740657, 740684, 740698, 740709, 740719, 740728, 740737, 740746, 740754, 740762, 740769, 740776, 740811, 740856, 740896, 740933, 740962, 740991]
+'SO19 0TQ': [710600, 710805, 712764, 713351, 714159, 714872, 715500, 715945, 716437, 716906, 717344, 717779, 718199, 718626, 719187, 719593, 719949, 720266, 720895, 721193, 721465, 721729, 722004, 722323, 723195, 723448, 723701, 723928, 724141, 724358, 724537, 724746, 725148, 727249, 728986, 730476, 731640, 732640]
+'SO19 0TR': [710559, 713148, 713668, 714453, 715182, 715689, 716207, 716699, 717165, 717578, 718007, 718406, 719013, 719411, 719794, 720471, 720771, 721083, 721366, 721630, 721895, 722173, 722721, 723061, 723332, 723607, 723836, 724063, 724275, 724473, 724673, 724867, 725529, 727613, 729352, 730813, 731978, 732963]
+'BN2 4QJ': [740262, 740291, 740318, 740342, 740383, 740405, 740426, 740448, 740469, 740488, 740518, 740536, 740553, 740568, 740581, 740594, 740607, 740620, 740633, 740645, 740658, 740685, 740699, 740710, 740720, 740729, 740738, 740747, 740755, 740763, 740770, 740777, 740802, 740812, 740857, 740897, 740934, 740963, 740992]
+'CT4 7LF': [711250, 711441, 711529, 711550, 721496, 724562, 725711, 725900, 726063, 726235, 726393, 726558, 726714, 726849, 726977, 727098, 727799, 728080, 728197, 728312, 728422, 728530, 728645, 728744, 728850, 729516, 729618, 729718, 729823, 729928, 730001, 730110, 730198, 730358, 731035, 731111, 731187, 731312, 731363]
+'E2 9BB': [712763, 714157, 714871, 715944, 716905, 717778, 718198, 718625, 719592, 720265, 720852, 720894, 721192, 721464, 722003, 722322, 722900, 723421, 723446, 724140, 724357, 724536, 724745, 724929, 725696, 725877, 726055, 726378, 726541, 726837, 726964, 727248, 727938, 728068, 728186, 728985, 730475, 731639, 732639]
+'ME16 0GQ': [710589, 710663, 710860, 710912, 710942, 711089, 711257, 718444, 719442, 719827, 720169, 720795, 721117, 721396, 721921, 722200, 723089, 723362, 723865, 724087, 724297, 724693, 724893, 725824, 726012, 726185, 726508, 726660, 726811, 726935, 727065, 727177, 727890, 739023, 739024, 739026, 739028, 739030, 739032]
+'N7 9LD': [714667, 714715, 715317, 715389, 715417, 715443, 715788, 715824, 715858, 715878, 715907, 716336, 716360, 716824, 716841, 716856, 717285, 717308, 717691, 717712, 718097, 718129, 718155, 718496, 718509, 718520, 718545, 719499, 719516, 719532, 719544, 719895, 719903, 720226, 720546, 720550, 720557, 720833, 720837]
+'PO18 0DQ': [712943, 713500, 714292, 715015, 716070, 716559, 717027, 717897, 718299, 718808, 719290, 719685, 720038, 720366, 720672, 721280, 721543, 721806, 722083, 723260, 723526, 723763, 723986, 724209, 724607, 725329, 725941, 726881, 727123, 727407, 727974, 728228, 728671, 728875, 729161, 729638, 730219, 731804, 732788]
+'PO20 1QL': [740253, 740281, 740308, 740334, 740375, 740397, 740418, 740440, 740461, 740480, 740508, 740529, 740546, 740562, 740576, 740589, 740602, 740615, 740628, 740640, 740653, 740675, 740695, 740706, 740716, 740725, 740734, 740743, 740751, 740759, 740767, 740774, 740793, 740809, 740847, 740887, 740925, 740953, 740982]
+'RH1 6GF': [712176, 712250, 712526, 712584, 712629, 712678, 733944, 733954, 733964, 733977, 735371, 735471, 735883, 736064, 736136, 736199, 736478, 737350, 737394, 737471, 737497, 737678, 737710, 737738, 737768, 737965, 737988, 738034, 738048, 738197, 738210, 738230, 738243, 738805, 738821, 738824, 738827, 738830, 738833]
+'SE11 5TS': [713360, 714166, 714879, 715452, 715504, 715950, 717351, 717736, 717786, 718203, 719191, 719953, 721197, 721469, 722011, 722331, 723199, 723450, 723704, 723932, 724115, 724145, 724362, 724541, 724749, 724932, 725110, 725157, 725700, 725882, 726056, 726221, 726838, 727090, 727786, 728069, 728187, 728994, 730483]
+'SE18 6TX': [723722, 723946, 724167, 724378, 724566, 724765, 724953, 725714, 725902, 726067, 726239, 726395, 726563, 726715, 726851, 726978, 727099, 727800, 727949, 728083, 728198, 728313, 728423, 728531, 733622, 733832, 733994, 734115, 734252, 734342, 734459, 734881, 735666, 736286, 736779, 737183, 737548, 737830, 738080]
+'BN3 5UD': [712025, 712258, 712661, 733686, 733881, 734040, 734160, 734274, 734375, 734494, 734582, 734665, 734794, 734949, 735122, 735187, 735245, 735308, 735359, 735416, 735463, 735510, 735552, 735594, 735736, 735872, 735920, 735967, 736009, 736087, 736126, 736158, 736190, 736224, 736356, 736468, 736846, 737245, 737604, 737889]
+'N7 8HQ': [711104, 713196, 713702, 714489, 715212, 715713, 716725, 717191, 718035, 718436, 719059, 719435, 719817, 720160, 720494, 721107, 721391, 721657, 722192, 722768, 723084, 723354, 723629, 723860, 724082, 724291, 724492, 724887, 725073, 725572, 725821, 726007, 726336, 726808, 727062, 727660, 729399, 730852, 732017, 733005]
+'PE7 3YL': [739528, 739551, 739585, 739609, 739654, 739674, 739693, 739710, 739727, 739745, 739768, 739786, 739803, 739819, 739833, 739846, 739861, 739874, 739887, 739898, 739908, 739929, 739943, 739952, 739959, 739972, 739979, 739985, 739991, 739997, 740003, 740021, 740032, 740038, 740044, 740090, 740133, 740164, 740191, 740220]
+'SE1 6JW': [720416, 720727, 721026, 721329, 721581, 721849, 722125, 723024, 723303, 723570, 723800, 724025, 724249, 724448, 724641, 724835, 725025, 725775, 725973, 726139, 726306, 733793, 733935, 734081, 734210, 735058, 735822, 736427, 736436, 736906, 736913, 737323, 737655, 737660, 737947, 737951, 738188, 741403, 741436, 741457]
+'SE5 0TN': [738794, 738803, 738818, 738845, 738859, 738867, 738875, 738881, 738887, 738892, 738899, 738915, 738921, 738924, 738925, 738927, 738928, 738929, 738932, 738934, 738937, 738942, 738955, 738961, 738964, 738967, 738969, 738971, 738973, 738975, 738977, 738979, 738981, 738997, 739002, 739019, 739048, 739071, 739089, 739101]
+'PE2 8ND': [740259, 740287, 740314, 740339, 740359, 740380, 740402, 740423, 740445, 740466, 740485, 740514, 740533, 740550, 740565, 740578, 740591, 740604, 740617, 740630, 740642, 740655, 740681, 740697, 740708, 740718, 740727, 740736, 740745, 740753, 740761, 740768, 740775, 740799, 740810, 740815, 740853, 740893, 740930, 740959, 740988]
+'SE18 2AF': [710244, 711163, 711462, 711579, 712278, 712340, 712343, 712348, 712351, 712356, 712360, 712364, 712367, 712370, 712373, 712434, 712437, 712440, 712443, 712445, 712447, 712450, 712452, 712454, 712456, 712519, 712520, 712521, 712522, 712525, 712527, 712530, 712531, 712532, 713391, 714914, 715981, 718675, 725199, 729031, 732680]
+'SW16 5PZ': [739549, 739583, 739607, 739630, 739652, 739672, 739691, 739708, 739725, 739743, 739766, 739784, 739817, 739844, 739872, 739897, 739927, 739942, 739958, 739971, 739984, 739996, 740019, 740031, 740043, 740052, 740060, 740068, 740088, 740099, 740105, 740109, 740111, 740113, 740131, 740141, 740144, 740145, 740162, 740189, 740218]
+'CR0 2AZ': [734220, 734225, 734229, 734233, 734237, 734302, 734304, 734306, 734310, 734313, 734316, 734319, 734323, 734326, 734329, 734418, 734420, 734423, 734427, 734429, 734432, 734435, 734440, 734444, 734447, 734531, 738806, 738820, 738822, 738823, 738825, 738826, 738828, 738829, 738831, 738832, 738834, 738847, 738848, 738849, 738850, 738851]
+'DA8 1DD': [709909, 710323, 710508, 710651, 710898, 710944, 711099, 711126, 711141, 711150, 711728, 714545, 715260, 715752, 716276, 716767, 717233, 718071, 718476, 719857, 720193, 720526, 720818, 721141, 721682, 721948, 722224, 723108, 723388, 723653, 723885, 724099, 724503, 724708, 724902, 725835, 726026, 726194, 726355, 726672, 726822, 727897]
+'HA1 4GH': [739221, 739230, 739242, 739251, 739260, 739269, 739278, 739287, 739296, 739305, 739312, 739321, 739329, 739339, 739346, 739353, 739360, 739366, 739372, 739377, 739381, 739385, 739390, 739397, 739400, 739403, 739406, 739408, 739410, 739412, 739414, 739416, 739418, 739423, 739429, 739431, 739433, 739438, 739447, 739456, 739465, 739474]
+'HA1 4WQ': [739226, 739235, 739247, 739256, 739265, 739274, 739283, 739292, 739301, 739309, 739316, 739326, 739333, 739343, 739350, 739357, 739363, 739369, 739374, 739378, 739382, 739386, 739395, 739398, 739401, 739404, 739407, 739409, 739411, 739413, 739415, 739417, 739419, 739428, 739430, 739432, 739434, 739443, 739452, 739461, 739470, 739479]
+'PO12 1EY': [733866, 734027, 734146, 734365, 734483, 734575, 734656, 734722, 734926, 735115, 735181, 735239, 735303, 735456, 735500, 735544, 735713, 735867, 736002, 736152, 736185, 736333, 736464, 736497, 736561, 736617, 736702, 736728, 736823, 736935, 736960, 737004, 737076, 737119, 737138, 737222, 737343, 737387, 737428, 737445, 737587, 737869]
+'SE15 2AB': [710380, 710524, 710627, 710855, 711496, 711608, 713091, 713624, 714409, 715139, 715662, 716173, 716662, 717128, 717542, 717976, 718952, 719386, 720116, 720449, 720751, 721349, 721605, 721874, 722144, 722662, 723041, 723319, 723819, 724038, 724260, 724461, 724655, 724847, 725037, 725473, 725789, 725979, 726151, 727558, 729304, 732908]
+'SW8 1BB': [739514, 739535, 739569, 739595, 739618, 739641, 739662, 739681, 739700, 739717, 739734, 739752, 739775, 739793, 739809, 739824, 739838, 739852, 739865, 739878, 739891, 739902, 739912, 739936, 739947, 739954, 739962, 739967, 739975, 739981, 739988, 739993, 740000, 740006, 740028, 740035, 740040, 740073, 740118, 740147, 740175, 740202]
+'E2 7NP': [713816, 713860, 713899, 713936, 713996, 714031, 714063, 714096, 714582, 719500, 719508, 719517, 719525, 719534, 719539, 719546, 719552, 719557, 719877, 723122, 723126, 723131, 723140, 723143, 723157, 723160, 723171, 723405, 725846, 725848, 725850, 725856, 725858, 725861, 725863, 725867, 726040, 727910, 727914, 727920, 727927, 728049, 728053]
+'SO17 2JJ': [709896, 711509, 713174, 714473, 715195, 715700, 716221, 716710, 717178, 717589, 718019, 718418, 719038, 719420, 719802, 720149, 720480, 720777, 721095, 721374, 721641, 721903, 722179, 722749, 723071, 723340, 723616, 723847, 724069, 724281, 724479, 724680, 724874, 725063, 725553, 725812, 726000, 726172, 726654, 727634, 729375, 731997, 732985]
+'CR8 2NT': [709802, 713504, 714295, 715019, 716074, 717030, 717454, 717900, 718811, 722500, 727410, 729164, 730636, 731806, 732791, 739777, 739796, 739811, 739827, 739840, 739855, 739867, 739881, 739892, 739903, 739937, 739948, 739955, 739963, 739968, 739976, 739982, 739989, 739994, 740001, 740029, 740036, 740041, 740047, 740050, 740055, 740058, 740063, 740066]
+'DA8 2PJ': [710835, 710870, 710907, 711037, 711051, 711071, 711116, 711135, 711254, 713516, 718311, 719303, 719695, 720048, 720375, 720682, 720987, 721292, 721551, 721817, 722095, 722992, 723533, 723998, 724221, 724618, 724811, 724993, 726282, 726439, 726600, 726887, 727128, 727836, 728112, 728232, 728342, 728451, 728571, 728677, 728779, 728880, 729546, 732807]
+'ME1 3QQ': [710815, 710886, 711286, 711418, 720434, 720740, 721042, 721340, 721594, 722135, 723312, 723579, 723812, 724256, 724454, 724651, 724844, 725034, 725784, 725976, 726147, 726311, 726468, 726630, 726777, 726909, 727034, 727153, 727861, 728004, 728132, 728255, 728362, 728594, 728691, 728795, 728902, 729558, 729662, 729766, 729866, 730054, 730145, 730239]
+'N7 8XL': [712846, 714217, 715998, 716490, 716953, 717395, 717834, 718247, 718700, 719231, 719637, 719988, 720306, 720620, 721224, 721501, 721758, 722400, 723219, 723949, 724169, 724381, 724570, 724956, 725228, 725718, 725905, 726070, 726241, 726854, 726981, 727101, 727314, 727803, 727952, 728085, 728315, 728532, 728649, 728748, 729055, 730547, 731706, 732702]
+'PO12 1EX': [733632, 733838, 734000, 734121, 734255, 734346, 734464, 734559, 734641, 735098, 735221, 735336, 735394, 735488, 735532, 735577, 735676, 735852, 735901, 735945, 735992, 736030, 736072, 736105, 736173, 736296, 736451, 736578, 736608, 736636, 736667, 736692, 736789, 736951, 737064, 737091, 737134, 737190, 737376, 737400, 737419, 737438, 737840, 738088]
+'SE12 9QF': [711246, 717005, 717876, 719269, 720020, 720653, 721265, 721792, 722965, 723509, 723971, 724405, 724791, 725737, 726091, 726415, 726730, 726995, 728101, 728328, 728556, 728767, 729533, 729634, 729736, 729842, 729940, 730025, 730123, 730288, 730966, 731129, 731254, 731372, 731493, 732130, 732246, 732344, 732452, 732539, 733107, 733203, 733278, 733346]
+'E2 6QH': [713050, 713596, 714371, 717101, 717516, 717956, 718356, 718915, 719359, 719742, 720093, 720420, 720731, 721032, 721333, 721585, 721855, 722128, 722617, 723028, 723573, 723806, 724029, 724645, 725779, 726143, 726308, 726624, 726773, 727031, 727150, 727517, 727857, 727999, 728129, 728359, 728469, 728591, 728688, 728794, 728897, 729259, 729556, 731891, 732873]
+'NW10 8EW': [713582, 715098, 716133, 717095, 717949, 718902, 719349, 720083, 720721, 721324, 721845, 723019, 723562, 724018, 724445, 724831, 725019, 725424, 725771, 726134, 726459, 726767, 727025, 727852, 728124, 728355, 728587, 728790, 729247, 729555, 729761, 729955, 730139, 730307, 730983, 731141, 731268, 731507, 731879, 732144, 732253, 732354, 732457, 732543, 733113]
+'DA16 1AB': [710140, 711097, 712916, 713473, 714266, 714989, 715569, 716543, 717008, 717437, 717880, 718286, 718776, 719273, 719673, 720023, 720352, 720655, 720961, 721266, 721534, 721793, 722071, 722469, 722966, 723248, 723510, 723751, 723972, 724198, 724406, 724594, 724793, 724978, 725298, 725738, 725931, 726093, 726265, 726588, 726732, 727383, 729129, 730607, 731769, 732760]
+'NW10 8LY': [711778, 711830, 711868, 711902, 711928, 711947, 711968, 711987, 712004, 712020, 712031, 712072, 712117, 712132, 712137, 712144, 712153, 712161, 712167, 712173, 712178, 712196, 712241, 712244, 712247, 712251, 712256, 712260, 712294, 712388, 712473, 712542, 712592, 712638, 721559, 722104, 723282, 723785, 724231, 724628, 726289, 726611, 726893, 727134, 727985, 728238]
+'SE26 6PA': [709914, 711531, 711542, 711559, 728456, 728578, 728679, 728784, 728885, 729552, 729645, 729751, 729850, 729950, 730037, 730134, 730226, 730303, 730384, 731057, 731208, 731263, 731328, 731444, 731503, 731565, 732140, 732196, 732251, 732300, 732353, 732397, 732456, 732502, 732542, 732582, 733112, 733159, 733208, 733241, 733284, 733314, 733349, 733386, 733428, 733458]
+'SE8 3EJ': [710679, 710908, 711147, 713533, 714317, 715049, 715608, 716096, 716579, 717052, 717474, 717914, 718319, 718849, 719314, 719704, 720056, 720384, 720693, 721302, 721554, 722101, 722533, 723278, 723542, 724006, 724817, 725000, 725364, 725757, 726116, 726287, 726754, 726891, 727015, 727444, 727841, 727982, 728115, 728348, 729194, 731832, 732818, 741350, 741352, 741363]
+'SO31 8JB': [710668, 710922, 711240, 711736, 713299, 714562, 715766, 716781, 717652, 718490, 719870, 720540, 721152, 722237, 722863, 723401, 723895, 724325, 725098, 726035, 726363, 726680, 726951, 727193, 728047, 728290, 728504, 728718, 728937, 729694, 729895, 730082, 730266, 730422, 730926, 731093, 731237, 731352, 731467, 731592, 732219, 732322, 732425, 732524, 732602, 733084]
+'SW4 6QW': [712966, 713527, 714313, 715042, 716091, 716575, 717047, 717471, 717910, 718316, 718842, 719310, 720054, 720379, 720690, 720993, 721301, 721822, 722099, 722525, 723276, 723539, 724004, 724224, 724431, 724816, 725954, 726114, 726285, 726445, 726607, 726753, 726890, 727438, 727981, 728114, 728235, 728453, 728576, 728782, 728882, 729188, 729550, 729643, 729749, 730660]
+'E14 7JF': [713557, 713934, 713995, 714030, 714062, 714095, 714336, 714580, 714643, 715075, 719524, 719533, 719545, 719551, 719556, 719876, 719883, 719884, 723156, 723159, 723168, 723170, 723407, 723409, 725394, 725852, 725855, 725857, 725860, 725862, 725866, 726037, 726039, 726041, 727471, 727913, 727919, 727923, 727926, 727929, 728048, 728050, 728052, 729219, 730688, 731852, 732841]
+'N1 7FG': [714882, 715952, 716912, 717788, 719192, 719954, 720586, 721198, 721733, 722906, 727258, 728997, 730438, 733620, 733831, 733834, 733993, 734114, 734251, 734341, 734458, 734555, 734635, 734703, 734767, 734879, 735094, 735157, 735218, 735281, 735333, 735391, 735438, 735485, 735529, 735573, 735663, 735850, 735898, 735943, 735990, 736283, 736776, 737181, 737546, 737829, 738078]
+'SE14 5HQ': [713027, 713579, 714356, 715096, 715636, 716130, 716616, 717093, 717506, 717946, 718349, 718895, 719346, 719732, 720081, 720410, 720717, 721017, 721322, 721576, 721842, 722118, 722594, 723017, 723297, 723560, 723796, 724239, 724443, 724635, 724829, 725015, 725417, 725769, 725966, 726132, 726299, 726457, 726615, 726765, 726898, 727023, 727499, 729242, 730717, 731874, 732862]
+'SW4 6QN': [712949, 715593, 716076, 716565, 718303, 718818, 719297, 719686, 720041, 720370, 720675, 720978, 721284, 721545, 722087, 722507, 723264, 723529, 723766, 723991, 724212, 724419, 724612, 724805, 725751, 725944, 726105, 726432, 726595, 726747, 726882, 727124, 727416, 727831, 727976, 728231, 728339, 728568, 728674, 728774, 728877, 729170, 729640, 729745, 730641, 731809, 732796]
+'BN2 8BT': [711858, 712029, 712233, 712246, 712272, 712281, 712330, 712514, 712578, 733734, 734065, 734195, 734289, 734401, 734514, 734607, 734678, 734807, 734999, 735135, 735200, 735266, 735318, 735373, 735420, 735472, 735514, 735560, 735599, 735884, 735978, 736014, 736065, 736092, 736138, 736200, 736479, 736508, 736542, 736570, 736601, 736628, 736660, 736683, 736716, 736884, 737926, 738166]
+'ME2 2GZ': [710275, 710615, 710783, 710820, 710859, 711075, 711139, 711282, 711295, 711533, 711567, 711621, 713179, 713688, 714477, 715197, 716224, 716713, 717591, 718023, 718422, 719044, 719424, 720151, 721378, 721904, 724072, 724483, 724878, 725558, 725815, 726496, 726803, 727639, 727883, 728148, 728813, 729381, 729579, 729784, 729971, 730160, 730324, 730834, 731155, 731284, 731396, 732988]
+'N1 7FL': [712756, 712759, 713341, 713344, 713416, 714148, 714151, 714863, 714865, 715492, 715494, 715936, 715938, 716431, 716433, 716898, 717338, 717340, 717770, 717772, 718193, 718195, 718616, 718618, 719183, 719590, 719943, 719944, 720260, 720261, 720579, 720580, 720888, 720889, 721188, 722313, 722316, 725139, 725142, 727239, 727242, 728977, 730467, 730470, 731630, 731633, 732633, 732636]
+'NW10 8RS': [713293, 714559, 715762, 716779, 717651, 718172, 718179, 718185, 718186, 718188, 718189, 718190, 718191, 718489, 719869, 720539, 721151, 721691, 722235, 722860, 723399, 724323, 724717, 725096, 725662, 726033, 726361, 726678, 726949, 727190, 727755, 728045, 728289, 728502, 729692, 729893, 730080, 730264, 730428, 730430, 730432, 730433, 730434, 730435, 730436, 730437, 730923, 733081]
+'NW10 8RX': [717241, 719568, 719574, 719579, 719581, 719583, 719584, 719585, 719586, 719587, 719588, 720200, 720826, 721424, 721954, 723116, 723661, 724106, 724510, 724908, 725841, 726201, 726525, 726826, 727904, 728172, 728398, 728628, 728829, 729597, 729801, 729982, 730180, 730184, 730185, 730186, 730187, 730188, 730189, 730190, 730338, 730342, 730344, 730345, 730346, 730347, 730348, 730349]
+'PO12 1FN': [735860, 735906, 735951, 735996, 736038, 736076, 736112, 736148, 736178, 736216, 736456, 736492, 736523, 736555, 736584, 736611, 736643, 736669, 736698, 736723, 736930, 736954, 736976, 736996, 737023, 737045, 737069, 737093, 737112, 737136, 737337, 737359, 737379, 737401, 737422, 737439, 737458, 737475, 737488, 737503, 737666, 737682, 737695, 737715, 737728, 737743, 737757, 737775]
+'SE18 2PD': [710517, 710624, 710699, 710833, 711170, 712873, 713432, 714231, 714950, 715546, 716013, 716506, 716972, 717405, 717848, 718259, 718734, 719240, 719998, 720320, 720627, 721240, 721511, 721769, 722422, 722942, 723490, 723957, 724391, 724776, 725253, 725725, 726076, 726403, 729082, 730561, 731196, 731320, 731429, 731553, 732185, 732295, 732390, 732497, 732578, 732719, 733150, 733235]
+'SW4 6TF': [713175, 713685, 714474, 715702, 716222, 716711, 717179, 718021, 718420, 719041, 719421, 720481, 721643, 722752, 723072, 723341, 723617, 723848, 724070, 724282, 724480, 724875, 725064, 725555, 726001, 726330, 726493, 726800, 726927, 727636, 727881, 728021, 728484, 728610, 728703, 728811, 728918, 729377, 729577, 729676, 729782, 729881, 730068, 730159, 730252, 730832, 730999, 731998]
+'DA9 9JE': [713106, 715151, 715669, 716183, 716674, 717140, 717550, 717985, 718386, 718969, 719393, 719774, 720122, 720454, 720755, 721059, 721352, 721608, 721879, 722151, 722679, 723045, 723322, 723591, 723822, 724042, 724264, 724464, 724662, 724852, 725043, 725487, 725792, 725984, 726637, 726784, 726915, 727042, 727158, 727574, 729320, 730779, 731943, 733922, 734069, 736545, 736571, 736602, 738172]
+'HA9 0RB': [738366, 738382, 738399, 738408, 738420, 738428, 738438, 738467, 738483, 738492, 738501, 738511, 738519, 738526, 738533, 738540, 738547, 738571, 738582, 738585, 738589, 738595, 738600, 738620, 738624, 738628, 738634, 738638, 738642, 738645, 738649, 738652, 738655, 738665, 738667, 738669, 738675, 738678, 738681, 738692, 738734, 738764, 738809, 738854, 738905, 738958, 738962, 738986, 739000]
+'SE6 2AW': [713663, 715177, 716202, 717161, 718004, 719000, 719407, 720138, 720767, 721364, 721891, 723058, 723605, 724058, 724471, 724866, 725517, 725806, 726165, 726486, 726795, 727050, 727875, 728142, 728377, 728607, 728808, 729344, 729573, 729778, 729969, 730154, 730320, 730995, 731150, 731279, 731391, 731517, 731971, 732152, 732260, 732362, 732465, 732550, 733122, 733218, 733293, 733359, 733436]
+'BN41 2WY': [710428, 711115, 712956, 713515, 714304, 715034, 716085, 716572, 717041, 717465, 717906, 718310, 719302, 719694, 720047, 720374, 720681, 720986, 721291, 721550, 721816, 722094, 722516, 722991, 723272, 723532, 723774, 723997, 724220, 724424, 724617, 724810, 724992, 725348, 725754, 725949, 726109, 726281, 726438, 726599, 726886, 727010, 727127, 727426, 727835, 727977, 729179, 730651, 731815, 732806]
+'CT1 1HS': [733649, 733851, 734011, 734132, 734259, 734354, 734472, 734565, 734649, 734714, 734779, 734910, 735107, 735173, 735231, 735293, 735345, 735402, 735449, 735494, 735538, 735581, 735695, 735862, 735908, 735954, 735998, 736042, 736078, 736115, 736149, 736180, 736217, 736315, 736459, 736493, 736526, 736556, 736586, 736612, 736645, 736670, 736699, 736724, 736807, 736931, 737207, 737570, 737853, 738102]
+'NW10 8RY': [715612, 716586, 717479, 718325, 719710, 720389, 721000, 721560, 722105, 722543, 723283, 723786, 724232, 724629, 725004, 725958, 726290, 726612, 726894, 727135, 727452, 727986, 728239, 728457, 729646, 729851, 730038, 730227, 730385, 731058, 731209, 731329, 731445, 731566, 732197, 732301, 732426, 732429, 732430, 732431, 732432, 732433, 732434, 732824, 738904, 738945, 738985, 739037, 739060, 739082]
+'PE3 7LF': [739541, 739576, 739600, 739623, 739645, 739666, 739685, 739703, 739720, 739738, 739758, 739779, 739798, 739813, 739828, 739857, 739869, 739883, 739894, 739905, 739919, 739939, 739949, 739956, 739964, 739969, 739977, 739983, 739990, 739995, 740002, 740012, 740030, 740037, 740042, 740048, 740051, 740056, 740059, 740064, 740067, 740070, 740080, 740098, 740101, 740104, 740123, 740154, 740181, 740210]
+'PE4 6GW': [710361, 710459, 711043, 711225, 711624, 713191, 713698, 714485, 715208, 715712, 716230, 716723, 717189, 717598, 718431, 719432, 719814, 720157, 720491, 720787, 721104, 721389, 721653, 721912, 722188, 722766, 723082, 723350, 723626, 723858, 724079, 724289, 724489, 724687, 724884, 725072, 725569, 726006, 726177, 726335, 726503, 726658, 726807, 726932, 727061, 727173, 727886, 728025, 729395, 730847, 733001]
+'HA3 9TF': [738360, 738376, 738386, 738393, 738403, 738411, 738442, 738459, 738470, 738495, 738505, 738514, 738543, 738567, 738574, 738586, 738590, 738593, 738596, 738601, 738610, 738625, 738630, 738635, 738640, 738643, 738647, 738650, 738671, 738673, 738679, 738684, 738689, 738703, 738705, 738708, 738709, 738711, 738712, 738713, 738725, 738729, 738730, 738747, 738749, 738751, 738756, 738758, 738761, 738923, 739074, 739076, 739079]
+'PE4 5EA': [713724, 739533, 739590, 739614, 739635, 739659, 739679, 739698, 739715, 739732, 739749, 739773, 739790, 739807, 739822, 739836, 739849, 739864, 739876, 739889, 739900, 739910, 739934, 739945, 739953, 739960, 739966, 739973, 739980, 739986, 739992, 739998, 740004, 740026, 740033, 740039, 740045, 740049, 740053, 740057, 740061, 740065, 740069, 740071, 740095, 740100, 740103, 740106, 740108, 740138, 740169, 740196, 740225]
+'SW4 6SS': [712912, 713467, 714986, 715566, 716048, 717875, 718282, 718772, 719672, 720349, 720959, 721531, 721791, 722069, 722466, 722964, 723749, 723970, 724404, 724976, 725291, 725736, 725929, 726090, 726263, 726585, 726729, 726872, 726994, 727378, 727816, 727969, 728100, 728441, 728555, 728664, 728766, 728867, 729633, 729735, 729939, 730024, 730122, 730215, 730287, 730374, 731051, 731128, 731760, 738347, 738350, 738351, 738352]
+'E2 6LT': [712863, 713422, 714223, 715539, 716497, 716963, 717400, 718254, 718720, 719237, 719642, 720314, 720623, 720931, 721232, 721507, 721766, 722041, 722414, 722935, 723225, 723482, 723728, 724385, 724575, 724772, 724960, 725243, 725909, 726244, 726401, 726568, 726721, 726857, 726983, 727106, 727327, 727806, 727957, 728087, 728204, 728317, 728536, 728654, 728752, 728857, 729070, 729624, 729722, 729832, 729932, 730557, 731718, 732711]
+'N7 8HZ': [713142, 713666, 714450, 715685, 717574, 718005, 719009, 719409, 720140, 720769, 721079, 721365, 721626, 721893, 722168, 722717, 723059, 723328, 724061, 724671, 725054, 725527, 725992, 727051, 727165, 727607, 727876, 728015, 728143, 728378, 728480, 728915, 729574, 729673, 729779, 729877, 730065, 730155, 730321, 730809, 730996, 731151, 731226, 731280, 731340, 731392, 731518, 731580, 732208, 732261, 732313, 732411, 732466, 732958]
+'SE26 6PB': [711052, 712979, 713540, 714322, 715055, 715611, 716103, 716585, 717061, 717478, 717919, 718324, 718858, 719319, 719709, 720061, 720388, 720696, 720999, 721304, 721558, 721827, 722103, 722542, 723001, 723281, 723544, 723784, 724007, 724230, 724435, 724627, 724819, 725003, 725373, 725761, 726119, 726288, 726449, 726610, 726757, 726892, 727018, 727133, 727450, 727844, 727984, 728118, 728237, 728350, 729203, 730672, 731839, 732823]
+'SW10 0JU': [713320, 713323, 713325, 713327, 713328, 713329, 713331, 713333, 719163, 719166, 719168, 719170, 719172, 719174, 719175, 719177, 722881, 722882, 722884, 722885, 722887, 722889, 722891, 722893, 725680, 725682, 725684, 725686, 725688, 725690, 725692, 725693, 727772, 727774, 727776, 727778, 727779, 727781, 727782, 727783, 729495, 729496, 729497, 729498, 729499, 729500, 729501, 730938, 730939, 730940, 730941, 730942, 730943, 730944]
+'SE16 4AS': [711416, 713781, 713812, 713857, 713896, 713933, 727842, 727983, 728116, 728236, 728349, 728455, 728577, 728678, 728783, 728884, 729551, 729644, 729750, 729849, 730036, 730133, 730225, 730302, 730383, 730979, 731056, 731138, 731443, 731502, 731564, 733348, 733385, 733427, 733457, 738724, 738726, 738727, 738728, 738748, 738750, 738752, 738754, 738755, 738757, 738759, 738760, 738762, 738763, 738775, 738776, 738777, 738778, 738779, 738780]
+'SW4 6RY': [713025, 713577, 714354, 715093, 715634, 716127, 717504, 717944, 718892, 719730, 720408, 720715, 721320, 721575, 722117, 722590, 723296, 723559, 724016, 724238, 724634, 724828, 725013, 726130, 726298, 726456, 726614, 726764, 726897, 727022, 727141, 727497, 727992, 728123, 728244, 728354, 728461, 728585, 728788, 728891, 729239, 729655, 729760, 729857, 729953, 730045, 730138, 730233, 730713, 731066, 731140, 731267, 731506, 731870, 732859]
+'CR0 4GP': [739127, 739128, 739129, 739130, 739131, 739132, 739133, 739134, 739135, 739136, 739137, 739138, 739139, 739140, 739141, 739142, 739143, 739144, 739145, 739146, 739147, 739148, 739149, 739150, 739151, 739152, 739153, 739154, 739155, 739156, 739157, 739158, 739162, 739163, 739164, 739165, 739166, 739167, 739168, 739169, 739170, 739171, 739172, 739173, 739174, 739175, 739176, 739177, 739178, 739179, 739180, 739181, 739182, 739183, 739184, 739185]
+'NW10 8EF': [713819, 713903, 713965, 714035, 714099, 714403, 714611, 714671, 714719, 714767, 714806, 715357, 715391, 715444, 715658, 716655, 717538, 718377, 719765, 720445, 721052, 721603, 722143, 723317, 723817, 724259, 724654, 725036, 725978, 726313, 726633, 726911, 728006, 728257, 728473, 728693, 728904, 729868, 730057, 730241, 730403, 731072, 731219, 731338, 731452, 731574, 732204, 732309, 732406, 732510, 732587, 733164, 733247, 733323, 733391, 733465]
+'RH17 7GA': [709887, 711255, 713107, 714422, 715152, 716184, 716675, 717141, 717551, 717986, 718388, 718970, 722680, 725488, 727575, 729321, 731944, 732924, 738472, 738480, 738488, 738498, 738509, 738516, 738524, 738530, 738537, 738545, 738562, 738569, 738575, 738580, 738583, 738587, 738591, 738594, 738597, 738603, 738618, 738623, 738627, 738632, 738637, 738641, 738644, 738648, 738651, 738654, 738664, 738668, 738672, 738674, 738677, 738680, 738685, 738687]
+'SW4 6TD': [713203, 714496, 715719, 716234, 717195, 718039, 718438, 719066, 719439, 719821, 720163, 721110, 721393, 721659, 721915, 722194, 723087, 723356, 723631, 724084, 724293, 724493, 724889, 725075, 725822, 726008, 726180, 726337, 726659, 726809, 726933, 727063, 727174, 727667, 727887, 728026, 728151, 728272, 728384, 728488, 728612, 728707, 728815, 728922, 729405, 729583, 729788, 729885, 729973, 730071, 730163, 730257, 730415, 730857, 731004, 732023]
+'E2 6LU': [713779, 713804, 713846, 713885, 713924, 713952, 713986, 714019, 714056, 714085, 714601, 714635, 714661, 714710, 714736, 714759, 714782, 714797, 715289, 715312, 715336, 715384, 715400, 715415, 715427, 715439, 715774, 730013, 730114, 730205, 730282, 730959, 731040, 731118, 731193, 731250, 731317, 731369, 731550, 732122, 732182, 732238, 732291, 732338, 732388, 732445, 732495, 732532, 732576, 733148, 733198, 733233, 733309, 733344, 733378, 733422, 733449]
+'ME20 7GD': [710127, 710130, 710176, 710230, 710284, 710478, 710541, 712263, 712274, 712339, 712529, 713347, 714868, 715862, 716314, 716340, 716369, 716398, 716788, 716809, 716829, 716864, 716902, 717775, 718621, 721726, 725145, 728981, 731635, 733941, 736028, 736517, 736576, 736634, 736690, 736923, 736968, 737017, 737062, 737109, 737332, 737374, 737417, 737665, 737727, 737755, 737784, 737956, 737980, 738003, 738027, 738045, 738194, 738206, 738216, 738226, 738242]
+'PO12 4TR': [733658, 733947, 733957, 733961, 733967, 733973, 734020, 734266, 734361, 734479, 734570, 734919, 735177, 735236, 735299, 735349, 735452, 735704, 735911, 735957, 736000, 736045, 736080, 736118, 736495, 736529, 736558, 736590, 736614, 736647, 736956, 736979, 736999, 737026, 737048, 737073, 737383, 737403, 737426, 737441, 737461, 737684, 737697, 737730, 737745, 737759, 737973, 737983, 737996, 738006, 738018, 738029, 738202, 738208, 738217, 738224, 738227]
+'BN2 9WR': [710659, 710893, 710919, 710940, 711293, 713135, 713658, 714444, 715173, 715681, 716199, 716687, 717158, 717568, 718001, 718397, 718998, 719402, 719786, 720136, 720462, 720765, 721073, 721361, 721888, 722160, 722707, 723055, 723325, 723603, 723829, 724056, 724864, 725515, 725805, 725990, 726163, 726322, 726484, 726644, 726793, 726924, 727048, 727163, 727597, 727874, 728014, 728140, 728261, 728375, 728478, 728699, 728807, 728911, 729342, 730804, 731968, 732953]
+'PO19 7BN': [711795, 711843, 711877, 711909, 711953, 711972, 711992, 712006, 712022, 712032, 712088, 712118, 712128, 712133, 712138, 712147, 712155, 712162, 712168, 712174, 712179, 712210, 712242, 712245, 712248, 712252, 712257, 712261, 712264, 712268, 712275, 712279, 712307, 712341, 712344, 712349, 712353, 712357, 712361, 712365, 712368, 712371, 712374, 712404, 712435, 712438, 712441, 712444, 712446, 712448, 712451, 712453, 712455, 712457, 712488, 712554, 712604, 712653]
+'SE8 3DG': [711398, 713784, 713817, 713861, 726307, 726463, 726621, 726772, 726905, 727030, 727148, 727856, 727998, 728126, 728251, 728358, 728467, 728589, 728687, 728792, 728896, 729763, 729862, 729958, 730049, 730143, 730236, 730311, 730398, 730986, 731069, 731143, 731216, 731270, 731334, 731383, 731450, 731510, 732147, 732201, 732256, 732307, 732357, 732401, 732459, 732506, 732545, 732585, 733115, 733162, 733212, 733245, 733288, 733320, 733351, 733390, 733431, 733464]
+'SW9 9JH': [712818, 713390, 715524, 715980, 716468, 716938, 717381, 717816, 718228, 718674, 719213, 719621, 720293, 720603, 720920, 721210, 721747, 722030, 722371, 722918, 723214, 723465, 723717, 723941, 724160, 724372, 724557, 724758, 724947, 725198, 725709, 726060, 726230, 726390, 726554, 726709, 726848, 727095, 727287, 727795, 728078, 728195, 728309, 728419, 728527, 728643, 728742, 728848, 729514, 729616, 729716, 729822, 729925, 730000, 730108, 730197, 730277, 730517, 732679]
+'E1 2QS': [713795, 713834, 713871, 713945, 713979, 714006, 714047, 714071, 714108, 714593, 714617, 714652, 714680, 714699, 714728, 714752, 714777, 714813, 715303, 715331, 715346, 715363, 715377, 715395, 715411, 715422, 715434, 715447, 715782, 715794, 715806, 715832, 715851, 715860, 715871, 715882, 715897, 731236, 731295, 731351, 731403, 731527, 731591, 732164, 732218, 732321, 732372, 732424, 732476, 732523, 732560, 732601, 733129, 733179, 733224, 733258, 733296, 733365, 733406, 733441, 733478]
+'PE4 6ZA': [710227, 710234, 710285, 710333, 710538, 713832, 713916, 713977, 714107, 714615, 714678, 714727, 714774, 714810, 715328, 715362, 715393, 715421, 715446, 715792, 715828, 715909, 716310, 716364, 716387, 716805, 716846, 717275, 717300, 717311, 717668, 717680, 717696, 717715, 718100, 718112, 718133, 718143, 718499, 718512, 718524, 718539, 718546, 719503, 719520, 719536, 719548, 719891, 731349, 731465, 731588, 732214, 732318, 732422, 732520, 732599, 733177, 733256, 733332, 733405, 733477]
+'CR0 4FE': [713145, 714451, 715688, 716697, 717576, 718404, 719792, 720469, 721081, 721628, 722170, 722718, 723329, 723834, 724274, 724672, 725055, 725993, 726324, 726647, 727610, 730811, 732960, 733898, 734180, 734389, 734596, 734742, 734977, 735131, 735259, 735367, 735468, 735556, 735880, 735974, 736062, 736133, 736197, 736379, 736475, 736539, 736597, 736656, 736713, 736944, 736988, 737036, 737083, 737125, 737268, 737348, 737391, 737433, 737469, 737496, 737676, 737709, 737737, 737766, 737792, 737908, 737964]
+'N1 7FR': [712589, 712893, 713446, 714248, 714967, 715557, 716031, 716525, 716986, 717420, 717859, 718272, 719255, 719660, 720011, 720336, 720640, 720949, 721255, 721522, 721779, 722057, 722444, 722954, 723240, 723500, 723743, 724190, 724587, 724972, 725269, 725924, 726257, 726581, 726867, 727110, 727357, 727966, 728214, 728436, 728661, 728864, 729100, 729630, 729838, 730020, 730211, 730370, 730582, 731047, 731200, 731322, 731434, 731741, 732735, 733579, 734841, 735629, 736250, 736753, 737161, 737529, 738062]
+'PO19 8HB': [740252, 740279, 740306, 740332, 740373, 740396, 740417, 740439, 740460, 740479, 740506, 740528, 740545, 740561, 740575, 740588, 740601, 740614, 740627, 740639, 740652, 740673, 740694, 740705, 740715, 740724, 740733, 740742, 740750, 740758, 740766, 740773, 740791, 740808, 740814, 740817, 740819, 740821, 740823, 740825, 740827, 740829, 740831, 740845, 740862, 740863, 740864, 740865, 740866, 740867, 740868, 740869, 740870, 740871, 740885, 740902, 740903, 740904, 740905, 740906, 740907, 740908, 740909, 740923, 740951, 740980]
+'SE10 9FF': [733660, 733860, 733943, 733958, 733963, 733968, 733975, 733979, 734023, 734142, 734268, 734362, 734480, 734572, 734654, 734720, 734785, 734920, 735113, 735179, 735237, 735301, 735351, 735408, 735454, 735498, 735542, 735585, 735707, 735865, 735912, 735958, 736001, 736046, 736081, 736119, 736151, 736184, 736219, 736327, 736463, 736496, 736530, 736559, 736591, 736615, 736818, 737001, 737027, 737050, 737074, 737095, 737116, 737216, 737491, 737507, 737581, 737671, 737700, 737717, 737863, 737997, 738008, 738019, 738031, 738041, 738046, 738113, 738245]
+'E1 2QR': [713289, 713765, 714555, 715271, 715760, 716281, 716776, 717239, 717648, 718077, 718485, 719139, 719478, 719867, 720198, 720536, 720824, 721148, 721423, 721689, 721952, 722232, 723114, 723396, 723659, 723892, 724104, 724321, 724509, 724715, 724907, 725094, 725658, 725840, 726031, 726200, 726359, 726524, 726677, 726824, 726947, 727078, 727188, 727750, 727903, 728043, 728171, 728287, 728397, 728500, 728627, 728828, 728934, 729480, 729596, 729690, 729800, 729892, 729981, 730078, 730173, 730262, 730333, 730421, 730920, 731012, 731091, 731165, 732095, 733077]
+'SE8 4HS': [712169, 712249, 712254, 712271, 712347, 731036, 731113, 733688, 733882, 734041, 734161, 734275, 734495, 734583, 734666, 734730, 734795, 735123, 735188, 735246, 735309, 735360, 735417, 735464, 735553, 735595, 735738, 735874, 736057, 736089, 736128, 736192, 736226, 736470, 736534, 736565, 736595, 736622, 736652, 736678, 736706, 736732, 736848, 736938, 736961, 737008, 737032, 737055, 737079, 737100, 737122, 737141, 737247, 737345, 737367, 737389, 737409, 737430, 737447, 737466, 737479, 737493, 737511, 737606, 737891, 738134, 739022, 741417, 741424, 741469]
+'SE14 5FB': [725833, 726021, 726191, 726352, 726518, 726671, 726820, 726944, 727073, 727184, 727896, 728037, 728166, 728285, 733741, 733923, 734070, 734199, 734292, 734405, 734520, 734612, 734681, 734751, 734811, 735008, 735137, 735202, 735269, 735321, 735376, 735425, 735475, 735516, 735563, 735603, 735787, 735889, 735930, 736018, 736067, 736096, 736139, 736165, 736205, 736232, 736408, 736891, 737039, 737059, 737086, 737104, 737127, 737146, 737298, 737353, 737371, 737397, 737414, 737435, 737451, 737473, 737484, 737499, 737514, 737643, 737679, 737692, 737712, 737933, 738173]
+'SE10 9FH': [730329, 731008, 731161, 731290, 731525, 732161, 732268, 733672, 733872, 734030, 734151, 734221, 734227, 734231, 734235, 734238, 734270, 734303, 734305, 734308, 734312, 734315, 734318, 734320, 734325, 734328, 734330, 734369, 734419, 734421, 734425, 734428, 734430, 734433, 734437, 734442, 734445, 734448, 734489, 734532, 734535, 734536, 734578, 734660, 734725, 734790, 734935, 735117, 735183, 735240, 735305, 735354, 735410, 735458, 735502, 735545, 735589, 735722, 735868, 735915, 735961, 736005, 736049, 736083, 736120, 736155, 736187, 736221, 736341, 736832, 737233, 737594, 737876, 738122]
+'SE14 5AE': [713799, 713881, 717378, 718226, 719618, 720291, 720916, 721490, 722027, 723212, 723715, 724157, 724555, 725894, 726228, 726551, 726846, 727094, 727947, 728194, 728418, 728641, 728847, 729614, 729820, 729998, 730356, 731033, 731184, 731309, 731422, 732282, 732382, 732490, 732570, 733139, 733227, 733305, 733373, 733447, 733598, 733613, 733619, 733822, 733830, 733987, 733992, 734106, 734113, 734245, 734858, 734872, 734878, 735644, 735656, 735662, 736263, 736276, 736282, 736764, 736772, 736775, 737170, 737176, 737180, 737536, 737542, 737545, 737817, 737825, 737828, 738067, 738075, 738077]
+'SE10 9FE': [733655, 733857, 734018, 734139, 734264, 734359, 734477, 734568, 734652, 734718, 734783, 734916, 735111, 735176, 735235, 735298, 735348, 735406, 735451, 735496, 735540, 735584, 735702, 735864, 735910, 735956, 735999, 736044, 736323, 736462, 736528, 736557, 736589, 736646, 736671, 736700, 736725, 736814, 736932, 736955, 736978, 736998, 737025, 737047, 737072, 737094, 737115, 737137, 737213, 737340, 737360, 737382, 737402, 737425, 737440, 737460, 737476, 737490, 737504, 737577, 737668, 737683, 737696, 737716, 737729, 737744, 737758, 737776, 737786, 737797, 737859, 737958, 737972, 737982, 737995, 738005, 738109]
+'PO12 1GS': [733752, 733931, 734077, 734206, 734410, 734526, 734615, 734684, 734753, 734816, 735016, 735140, 735207, 735273, 735325, 735381, 735431, 735480, 735521, 735567, 735609, 735798, 735891, 735934, 735985, 736022, 736069, 736100, 736142, 736169, 736207, 736235, 736416, 736484, 736513, 736546, 736573, 736604, 736629, 736662, 736685, 736719, 736736, 736900, 736947, 736966, 736991, 737012, 737040, 737060, 737087, 737105, 737128, 737147, 737306, 737354, 737372, 737398, 737415, 737436, 737452, 737474, 737485, 737500, 737515, 737652, 737680, 737693, 737713, 737726, 737741, 737754, 737771, 737783, 737794, 737801, 737941, 738183]
+
+Total postcodes: 4050, total properties: 31773
\ No newline at end of file
diff --git a/scripts/query_failed_modelling_e2e.py b/scripts/query_failed_modelling_e2e.py
new file mode 100644
index 000000000..db684023c
--- /dev/null
+++ b/scripts/query_failed_modelling_e2e.py
@@ -0,0 +1,125 @@
+"""Query failed modelling_e2e subtasks and write a markdown report.
+
+Joins sub_task → tasks, pulls property_ids from the inputs JSON, then looks up
+UPRNs from the property table.
+
+Hit Run — output written to scripts/failed_modelling_e2e.md
+"""
+
+from __future__ import annotations
+
+import json
+import sys
+from pathlib import Path
+from typing import Any, cast
+
+_REPO_ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(_REPO_ROOT))
+
+from sqlalchemy import text  # noqa: E402
+
+from scripts.e2e_common import ENV_PATH, build_engine, load_env  # noqa: E402
+
+_OUTPUT = _REPO_ROOT / "scripts" / "failed_modelling_e2e.md"
+
+load_env(ENV_PATH)
+engine = build_engine()
+
+with engine.connect() as conn:
+    subtask_rows = conn.execute(text("""
+        SELECT
+            st.id          AS subtask_id,
+            st.task_id,
+            st.inputs,
+            st.outputs,
+            st.updated_at
+        FROM sub_task st
+        JOIN tasks t ON t.id = st.task_id
+        WHERE t.task_source = 'modelling_e2e'
+          AND st.status = 'failed'
+        ORDER BY st.updated_at DESC
+    """)).fetchall()
+
+    if not subtask_rows:
+        print("No failed modelling_e2e subtasks found.")
+        _OUTPUT.write_text(
+            "# Failed modelling_e2e Subtasks\n\nNone found.\n", encoding="utf-8"
+        )
+        exit(0)
+
+    def _error_text(outputs_raw: object) -> str:
+        """Pull the persisted failure reason out of the subtask outputs JSON."""
+        try:
+            outputs: Any = (
+                json.loads(outputs_raw)
+                if isinstance(outputs_raw, str)
+                else (outputs_raw or {})
+            )
+        except Exception:
+            return str(outputs_raw or "")
+        if isinstance(outputs, dict):
+            return str(cast("dict[str, Any]", outputs).get("error", ""))
+        return ""
+
+    # Collect all property_ids across all rows
+    all_property_ids: list[int] = []
+    parsed: list[tuple[str, str, list[int], str, str, str]] = []
+    for subtask_id, task_id, inputs_raw, outputs_raw, updated_at in subtask_rows:
+        try:
+            inputs: Any = (
+                json.loads(inputs_raw)
+                if isinstance(inputs_raw, str)
+                else (inputs_raw or {})
+            )
+            raw_ids = cast("list[Any]", cast("dict[str, Any]", inputs).get("property_ids") or [])
+            property_ids: list[int] = [int(p) for p in raw_ids]
+        except Exception:
+            property_ids = []
+        parsed.append(
+            (
+                str(subtask_id),
+                str(task_id),
+                property_ids,
+                str(updated_at),
+                inputs_raw or "",
+                _error_text(outputs_raw),
+            )
+        )
+        all_property_ids.extend(property_ids)
+
+    # Look up UPRNs
+    uprn_map: dict[int, int] = {}
+    if all_property_ids:
+        uprn_rows = conn.execute(
+            text("SELECT id, uprn FROM property WHERE id = ANY(:ids)"),
+            {"ids": all_property_ids},
+        ).fetchall()
+        uprn_map = {int(r[0]): int(r[1]) for r in uprn_rows}
+
+def _cell(value: str) -> str:
+    """Escape table-breaking characters so multi-line errors stay on one row."""
+    return value.replace("|", "\\|").replace("\n", "<br>")
+
+
+lines: list[str] = [
+    "# Failed modelling_e2e Subtasks\n",
+    f"| Subtask ID | Task ID | Updated At | Property ID | UPRN | Error | Inputs |",
+    f"|-----------|---------|------------|-------------|------|-------|--------|",
+]
+
+for subtask_id, task_id, property_ids, updated_at, inputs_raw, error in parsed:
+    inputs_cell = _cell(inputs_raw or "")
+    error_cell = _cell(error or "")
+    if property_ids:
+        for pid in property_ids:
+            uprn = uprn_map.get(pid, "unknown")
+            lines.append(
+                f"| {subtask_id} | {task_id} | {updated_at} | {pid} | {uprn} | {error_cell} | {inputs_cell} |"
+            )
+    else:
+        lines.append(
+            f"| {subtask_id} | {task_id} | {updated_at} | — | — | {error_cell} | {inputs_cell} |"
+        )
+
+_OUTPUT.write_text("\n".join(lines) + "\n", encoding="utf-8")
+print(f"Written {len(parsed)} failed subtasks → {_OUTPUT}")
diff --git a/scripts/resolve_uprns_for_finaliser.py b/scripts/resolve_uprns_for_finaliser.py
new file mode 100644
index 000000000..c01a55ed4
--- /dev/null
+++ b/scripts/resolve_uprns_for_finaliser.py
@@ -0,0 +1,328 @@
+"""Resolve a CSV of addresses to UPRNs, ready to feed the bulk-upload finaliser.
+
+Takes a CSV with `Address 1/2/3` + `postcode` columns and, per row, resolves a
+UPRN by trying — in order — the new EPC API (address2uprn), the historic EPC S3
+dataset, then the Ordnance Survey Places API as a fallback. Whichever source
+wins, the result is written into the SAME three columns the finaliser reads
+(`bulk_upload_finaliser_orchestrator`):
+
+    address2uprn_uprn        UPRN integer (empty when unresolved)
+    address2uprn_address     the matched address
+    address2uprn_lexiscore   the match score in [0, 1]
+
+A `resolution_source` diagnostic column (epc / epc_historic / ordnance_survey /
+none) is appended too — the finaliser ignores unknown columns. All original
+columns are preserved in their original order, so the output CSV drops straight
+into the finaliser.
+
+    python -m scripts.resolve_uprns_for_finaliser input.csv -o resolved.csv
+
+    # OS-only / EPC-only, custom postcode column, custom OS score threshold
+    python -m scripts.resolve_uprns_for_finaliser in.csv -o out.csv --no-epc
+    python -m scripts.resolve_uprns_for_finaliser in.csv -o out.csv --postcode-col Postcode --os-threshold 0.6
+
+Keys are read from backend/.env: OPEN_EPC_API_TOKEN (EPC) and
+ORDNANCE_SURVEY_API_KEY (OS Places). Run from the worktree root (import trap).
+
+The module-level functions (`load_keys`, `read_rows`, `resolve_row`, `process`,
+`write_rows`) are written to be driven line-by-line from a REPL as well as via
+the CLI.
+"""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import os
+import sys
+from pathlib import Path
+from typing import Optional
+
+import pandas as pd
+from dotenv import load_dotenv
+
+_REPO_ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
+
+from backend.address2UPRN.main import (  # noqa: E402
+    get_epc_data_with_postcode,
+    get_uprn_from_historic_epc,
+    get_uprn_with_epc_df,
+)
+from backend.ordnanceSurvey.helpers import (  # noqa: E402
+    lookup_os_places,
+    os_places_results_to_dataframe,
+)
+from backend.utils.addressMatch import AddressMatch  # noqa: E402
+
+# Columns the finaliser reads (bulk_upload_finaliser_orchestrator).
+UPRN_COL = "address2uprn_uprn"
+MATCHED_ADDRESS_COL = "address2uprn_address"
+LEXISCORE_COL = "address2uprn_lexiscore"
+SOURCE_COL = "resolution_source"
+_RESULT_COLS = (UPRN_COL, MATCHED_ADDRESS_COL, LEXISCORE_COL, SOURCE_COL)
+
+# A resolved hit: (uprn, matched_address, lexiscore, source).
+Resolution = tuple[str, str, float, str]
+
+
+def load_keys() -> tuple[Optional[str], Optional[str]]:
+    """Load (epc_token, os_api_key) from backend/.env (and the process env)."""
+    load_dotenv(_REPO_ROOT / "backend" / ".env")
+    epc_token = os.environ.get("OPEN_EPC_API_TOKEN")
+    os_api_key = os.environ.get("ORDNANCE_SURVEY_API_KEY")
+    return epc_token, os_api_key
+
+
+def read_rows(path: Path) -> tuple[list[dict[str, str]], list[str]]:
+    """Read a CSV into (rows, fieldnames). Preserves column order."""
+    with path.open(newline="", encoding="utf-8-sig") as fh:
+        reader = csv.DictReader(fh)
+        fieldnames = list(reader.fieldnames or [])
+        rows = [dict(row) for row in reader]
+    return rows, fieldnames
+
+
+def clean_postcode(postcode: str) -> str:
+    """Sanitise to the no-space upper form the EPC/OS lookups expect (e.g. E84SQ)."""
+    return postcode.upper().replace(" ", "").strip()
+
+
+def build_address(row: dict[str, str]) -> str:
+    """Concatenate Address 1/2/3 the same way the address2uprn lambda does."""
+    return " ".join(
+        str(row.get(col, "") or "").strip() for col in ("Address 1", "Address 2", "Address 3")
+    ).strip()
+
+
+def resolve_epc(
+    address: str, postcode_clean: str, epc_cache: dict[str, pd.DataFrame]
+) -> Optional[Resolution]:
+    """Resolve via the new EPC API (cached per postcode), then historic EPC S3.
+
+    `epc_cache` is mutated to memoise one EPC API call per postcode — pass the
+    same dict across rows so a postcode is only fetched once.
+    """
+    epc_df = epc_cache.get(postcode_clean)
+    if epc_df is None:
+        epc_df = get_epc_data_with_postcode(postcode=postcode_clean)
+        epc_cache[postcode_clean] = epc_df
+
+    result = get_uprn_with_epc_df(
+        user_inputed_address=address, epc_df=epc_df, verbose=True
+    )
+    if isinstance(result, tuple):
+        uprn, matched, score = result
+        return str(uprn), str(matched), float(score), "epc"
+
+    historic = get_uprn_from_historic_epc(
+        user_inputed_address=address, postcode=postcode_clean
+    )
+    if historic is not None:
+        uprn, matched, score = historic
+        return str(uprn), str(matched), float(score), "epc_historic"
+
+    return None
+
+
+def resolve_os(
+    address: str,
+    postcode_clean: str,
+    os_api_key: str,
+    os_cache: dict[str, pd.DataFrame],
+    threshold: float,
+) -> Optional[Resolution]:
+    """Resolve via the OS Places API: best-scoring address above `threshold`.
+
+    `os_cache` memoises one OS Places call per postcode.
+    """
+    places_df = os_cache.get(postcode_clean)
+    if places_df is None:
+        response = lookup_os_places(postcode_clean, os_api_key)
+        if response.get("status") != 200 or "data" not in response:
+            places_df = pd.DataFrame()
+        else:
+            places_df = os_places_results_to_dataframe(response["data"])
+        os_cache[postcode_clean] = places_df
+
+    if places_df.empty or "ADDRESS" not in places_df.columns:
+        return None
+
+    # Iterate plain records — avoids pandas' partially-unknown indexing types.
+    records: list[dict[str, object]] = places_df.to_dict(orient="records")
+    best: Optional[Resolution] = None
+    for rec in records:
+        candidate = str(rec.get("ADDRESS", ""))
+        score = AddressMatch.score(address, candidate)
+        if score >= threshold and (best is None or score > best[2]):
+            best = (str(rec.get("UPRN", "")), candidate, score, "ordnance_survey")
+    return best
+
+
+def resolve_row(
+    row: dict[str, str],
+    *,
+    epc_token: Optional[str],
+    os_api_key: Optional[str],
+    epc_cache: dict[str, pd.DataFrame],
+    os_cache: dict[str, pd.DataFrame],
+    postcode_col: str,
+    use_epc: bool,
+    use_os: bool,
+    os_threshold: float,
+    validate_postcode: bool,
+) -> dict[str, str]:
+    """Resolve one row in place and return it with the finaliser columns filled.
+
+    Tries EPC (new + historic) first, then OS Places. On no match the three
+    result columns are written empty and `resolution_source` is "none".
+    """
+    address = build_address(row)
+    postcode_clean = clean_postcode(str(row.get(postcode_col, "") or ""))
+
+    def write(res: Optional[Resolution]) -> dict[str, str]:
+        if res is None:
+            row[UPRN_COL] = ""
+            row[MATCHED_ADDRESS_COL] = ""
+            row[LEXISCORE_COL] = ""
+            row[SOURCE_COL] = "none"
+        else:
+            uprn, matched, score, source = res
+            row[UPRN_COL] = uprn
+            row[MATCHED_ADDRESS_COL] = matched
+            row[LEXISCORE_COL] = str(score)
+            row[SOURCE_COL] = source
+        return row
+
+    if not address or not postcode_clean:
+        return write(None)
+
+    if validate_postcode and not AddressMatch.is_valid_postcode(postcode_clean):
+        return write(None)
+
+    if use_epc and epc_token:
+        try:
+            res = resolve_epc(address, postcode_clean, epc_cache)
+            if res is not None:
+                return write(res)
+        except Exception as exc:  # keep going on a per-row API/lookup failure
+            print(f"  EPC lookup failed for {address!r} / {postcode_clean}: {exc}")
+
+    if use_os and os_api_key:
+        try:
+            res = resolve_os(address, postcode_clean, os_api_key, os_cache, os_threshold)
+            if res is not None:
+                return write(res)
+        except Exception as exc:
+            print(f"  OS lookup failed for {address!r} / {postcode_clean}: {exc}")
+
+    return write(None)
+
+
+def process(
+    rows: list[dict[str, str]],
+    *,
+    epc_token: Optional[str],
+    os_api_key: Optional[str],
+    postcode_col: str = "postcode",
+    use_epc: bool = True,
+    use_os: bool = True,
+    os_threshold: float = 0.5,
+    validate_postcode: bool = True,
+) -> list[dict[str, str]]:
+    """Resolve every row, printing a per-row line so REPL/CLI progress is visible."""
+    epc_cache: dict[str, pd.DataFrame] = {}
+    os_cache: dict[str, pd.DataFrame] = {}
+    for i, row in enumerate(rows, start=1):
+        resolve_row(
+            row,
+            epc_token=epc_token,
+            os_api_key=os_api_key,
+            epc_cache=epc_cache,
+            os_cache=os_cache,
+            postcode_col=postcode_col,
+            use_epc=use_epc,
+            use_os=use_os,
+            os_threshold=os_threshold,
+            validate_postcode=validate_postcode,
+        )
+        print(
+            f"[{i}/{len(rows)}] {build_address(row)!r} -> "
+            f"{row[UPRN_COL] or '(no match)'} ({row[SOURCE_COL]})"
+        )
+    return rows
+
+
+def write_rows(rows: list[dict[str, str]], path: Path, fieldnames: list[str]) -> None:
+    """Write rows to CSV, preserving input columns and appending the result columns."""
+    out_fields = list(fieldnames)
+    for col in _RESULT_COLS:
+        if col not in out_fields:
+            out_fields.append(col)
+    with path.open("w", newline="", encoding="utf-8") as fh:
+        writer = csv.DictWriter(fh, fieldnames=out_fields, extrasaction="ignore")
+        writer.writeheader()
+        writer.writerows(rows)
+
+
+def _parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("input", type=Path, help="input CSV (Address 1/2/3 + postcode)")
+    parser.add_argument(
+        "-o", "--out", type=Path, required=True, help="output CSV for the finaliser"
+    )
+    parser.add_argument("--postcode-col", default="postcode", help="postcode column name")
+    parser.add_argument("--no-epc", action="store_true", help="skip EPC resolution")
+    parser.add_argument("--no-os", action="store_true", help="skip Ordnance Survey fallback")
+    parser.add_argument(
+        "--os-threshold", type=float, default=0.5, help="min OS match score (default 0.5)"
+    )
+    parser.add_argument(
+        "--no-validate-postcode",
+        action="store_true",
+        help="skip the postcodes.io validity check (one HTTP call per postcode)",
+    )
+    parser.add_argument("--limit", type=int, default=None, help="process only the first N rows")
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = _parse_args()
+    epc_token, os_api_key = load_keys()
+
+    use_epc = not args.no_epc
+    use_os = not args.no_os
+    if use_epc and not epc_token:
+        print("OPEN_EPC_API_TOKEN not set (backend/.env) — EPC resolution disabled")
+        use_epc = False
+    if use_os and not os_api_key:
+        print("ORDNANCE_SURVEY_API_KEY not set (backend/.env) — OS fallback disabled")
+        use_os = False
+    if not use_epc and not use_os:
+        print("No resolver enabled (missing keys or both --no-* flags). Nothing to do.")
+        return 2
+
+    rows, fieldnames = read_rows(args.input)
+    if args.limit is not None:
+        rows = rows[: args.limit]
+    print(f"Loaded {len(rows)} rows from {args.input}")
+
+    process(
+        rows,
+        epc_token=epc_token,
+        os_api_key=os_api_key,
+        postcode_col=args.postcode_col,
+        use_epc=use_epc,
+        use_os=use_os,
+        os_threshold=args.os_threshold,
+        validate_postcode=not args.no_validate_postcode,
+    )
+
+    write_rows(rows, args.out, fieldnames)
+    matched = sum(1 for r in rows if r.get(UPRN_COL))
+    print(f"\nResolved {matched}/{len(rows)} rows. Wrote {args.out}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/run_modelling_e2e.py b/scripts/run_modelling_e2e.py
index 644be17fa..1a1964cec 100644
--- a/scripts/run_modelling_e2e.py
+++ b/scripts/run_modelling_e2e.py
@@ -9,7 +9,12 @@ from S3, and fetches Google Solar — then runs the Modelling stage (every
 Recommendation Generator → the Optimiser → a costed, attributed Plan). The same
 local computation runs whether or not you store the result: by default it
 persists **nothing** (the run is for inspecting recommendations); pass
-`--persist` to write the inputs + the Plan to the DB.
+`--persist` to write the inputs + the Plan to the DB. With `--persist`, a
+lodged-EPC Property **also** gets its Baseline Performance row written (lodged
+vs calculator-effective SAP + the bill block) via the same orchestrator the
+first-run pipeline uses — run per Property so one bad cert does not abort the
+batch. A predicted (EPC-less) Property has no lodged figures, so it gets a Plan
+but no baseline row.
 
 To keep the inspected recommendations identical to what gets stored, **both
 modes price against the live ``material`` catalogue (read-only)** and model
@@ -21,12 +26,9 @@ the run synthesises an Increasing-EPC-to-``--goal`` Scenario with no exclusions.
 `--measures` / `--exclude-measures` are optional overlays layered on top of the
 Scenario's own exclusions.
 
-KNOWN GOTCHA: the live ``material.type`` enum does not yet carry
-``secondary_heating_removal``, so a Property with a lodged secondary heater
-crashes the catalogue read for that measure. Until the catalogue stocks it, pass
-``--exclude-measures secondary_heating_removal`` (an ASHP row is also absent, but
-ASHP is priced off the rate sheet so it degrades to ``material_id=None`` rather
-than crashing — no flag needed).
+``secondary_heating_removal`` is priced from the committed off-catalogue JSON
+overlay (the live ``material.type`` enum cannot carry it), so no exclusion flag
+is needed. ASHP is priced off the rate sheet (``material_id=None``), also fine.
 
 Config: loads `backend/.env` for the DB creds (`DB_*`), the EPC API token
 (`OPEN_EPC_API_TOKEN` — the Bearer token for the new gov API), the Google Solar
@@ -55,8 +57,9 @@ from __future__ import annotations
 import argparse
 import os
 import sys
+import time
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, Callable, Optional
 
 _REPO_ROOT = Path(__file__).resolve().parents[1]
 sys.path.insert(0, str(_REPO_ROOT))  # worktree root first — avoid the import trap
@@ -72,6 +75,16 @@ from repositories.property.landlord_override_overlays import (  # noqa: E402
 from repositories.property.property_overrides_postgres_reader import (  # noqa: E402
     PropertyOverridesPostgresReader,
 )
+from domain.epc_prediction.comparable_properties import (  # noqa: E402
+    ComparableProperty,
+    select_comparables,
+)
+from domain.epc_prediction.epc_prediction import EpcPrediction  # noqa: E402
+from domain.epc_prediction.prediction_target import (  # noqa: E402
+    PredictionTarget,
+    build_prediction_target,
+)
+from domain.geospatial.coordinates import Coordinates  # noqa: E402
 from domain.geospatial.planning_restrictions import PlanningRestrictions  # noqa: E402
 from domain.geospatial.spatial_reference import SpatialReference  # noqa: E402
 from domain.modelling.considered_measures import (  # noqa: E402
@@ -84,17 +97,37 @@ from domain.modelling.scenario import Scenario  # noqa: E402
 from harness.console import candidate_recommendations, run_modelling  # noqa: E402
 from harness.plan_table import format_plan_table  # noqa: E402
 from infrastructure.epc_client.epc_client_service import EpcClientService  # noqa: E402
+from infrastructure.postcodes_io.postcodes_io_client import (  # noqa: E402
+    PostcodesIoClient,
+)
 from infrastructure.solar.google_solar_api_client import (  # noqa: E402
     BuildingInsightsNotFoundError,
     GoogleSolarApiClient,
 )
+from repositories.comparable_properties.epc_comparable_properties_repository import (  # noqa: E402
+    EpcComparablePropertiesRepository,
+)
 from repositories.geospatial.geospatial_s3_repository import (  # noqa: E402
     GeospatialS3Repository,
 )
-from repositories.product.product_postgres_repository import (  # noqa: E402
-    ProductPostgresRepository,
+from repositories.product.composite_product_repository import (  # noqa: E402
+    catalogue_with_off_catalogue_overrides,
+)
+from repositories.product.product_repository import ProductRepository  # noqa: E402
+from repositories.property.override_backed_prediction_attributes_reader import (  # noqa: E402
+    OverrideBackedPredictionAttributesReader,
 )
 from repositories.postgres_unit_of_work import PostgresUnitOfWork  # noqa: E402
+from orchestration.property_baseline_orchestrator import (  # noqa: E402
+    PropertyBaselineOrchestrator,
+)
+from domain.property_baseline.calculator_rebaseliner import (  # noqa: E402
+    CalculatorRebaseliner,
+)
+from domain.sap10_calculator.calculator import Sap10Calculator  # noqa: E402
+from repositories.fuel_rates.fuel_rates_static_file_repository import (  # noqa: E402
+    FuelRatesStaticFileRepository,
+)
 from repositories.scenario.scenario_postgres_repository import (  # noqa: E402
     ScenarioPostgresRepository,
 )
@@ -138,6 +171,10 @@ def _solar_insights_for(
         )
     except BuildingInsightsNotFoundError:
         return None  # no Google solar coverage at this point — model without it
+    # A transient Solar failure (timeout/reset) is NOT swallowed: it propagates so
+    # the property is marked ERROR and the wrapper's retry sweep re-runs it later
+    # when Solar recovers. We must not silently model a coverage-having property
+    # without its solar leg.
 
 
 def _uprns_for(engine: Engine, property_ids: list[int]) -> dict[int, Optional[int]]:
@@ -150,6 +187,18 @@ def _uprns_for(engine: Engine, property_ids: list[int]) -> dict[int, Optional[in
     return {int(pid): (int(uprn) if uprn is not None else None) for pid, uprn in rows}
 
 
+def _postcodes_for(engine: Engine, property_ids: list[int]) -> dict[int, str]:
+    """Read each Property's postcode from the DB (read-only). Needed to find the
+    EPC-Prediction cohort (the postcode's other lodged certs) and to seed the
+    PredictionTarget when a Property has no EPC."""
+    with engine.connect() as conn:
+        rows = conn.execute(
+            text("SELECT id, postcode FROM property WHERE id = ANY(:ids)"),
+            {"ids": property_ids},
+        ).fetchall()
+    return {int(pid): (postcode or "") for pid, postcode in rows}
+
+
 def _dump_overrides(engine: Engine, property_ids: list[int]) -> None:
     """Print each target Property's ``property_overrides`` rows (read-only), so the
     Landlord Overrides folded into the Effective EPC are visible before modelling."""
@@ -304,16 +353,19 @@ def _persist(
     uprn: int,
     portfolio_id: int,
     scenario: Scenario,
-    epc: EpcPropertyData,
+    epc: Optional[EpcPropertyData],
     spatial: Optional[SpatialReference],
     solar_insights: Optional[dict[str, Any]],
     plan: Plan,
 ) -> None:
     """Write the run's inputs (EPC + spatial + solar) and the computed Plan to
     the DB in one Unit of Work, then commit. ``PlanPostgresRepository`` replaces
-    any existing Plan for ``(property_id, scenario.id)`` (idempotent re-run)."""
+    any existing Plan for ``(property_id, scenario.id)`` (idempotent re-run). A
+    predicted Property has no lodged EPC to store (``epc is None``), so only the
+    spatial/solar inputs and the Plan are persisted for it."""
     with PostgresUnitOfWork(lambda: Session(engine)) as uow:
-        uow.epc.save(epc, property_id=property_id, portfolio_id=portfolio_id)
+        if epc is not None:
+            uow.epc.save(epc, property_id=property_id, portfolio_id=portfolio_id)
         if spatial is not None:
             uow.spatial.save(uprn, spatial)
         # The live `solar` table is keyed by UPRN and needs the fetch's
@@ -343,6 +395,206 @@ def _persist(
         uow.commit()
 
 
+def _predict_epc(
+    *,
+    property_id: int,
+    uprn: int,
+    postcode: str,
+    portfolio_id: int,
+    attributes_reader: OverrideBackedPredictionAttributesReader,
+    coordinates: Optional[Coordinates],
+    cohort_for: Callable[[str], list[ComparableProperty]],
+    broaden: Callable[[PredictionTarget], list[ComparableProperty]],
+    predictor: EpcPrediction,
+) -> Optional[EpcPropertyData]:
+    """Synthesise an EpcPropertyData for an EPC-less Property from its postcode
+    cohort (EPC Prediction Path 3, ADR-0031), or None when the Property is
+    ineligible (``property_type`` unresolvable) or no comparable neighbours exist.
+
+    The cohort is found by POSTCODE, so a wrong postcode on the property row
+    yields the wrong neighbours — a prediction is only as good as the postcode it
+    is given. When the own postcode holds no same-type comparables, the cohort is
+    broadened to the real unit postcodes physically nearest it (``broaden``)."""
+    attributes = attributes_reader.attributes_for(property_id)
+    identity = PropertyIdentity(
+        portfolio_id=portfolio_id, postcode=postcode, address="", uprn=uprn
+    )
+    target = build_prediction_target(identity, coordinates, attributes)
+    if target is None:
+        return None  # property_type unresolvable — gated out of prediction
+    comparables = select_comparables(target, cohort_for(target.postcode))
+    if not comparables.members:
+        # Sparse own postcode — reach out to the nearest real postcodes.
+        comparables = select_comparables(target, broaden(target))
+    if not comparables.members:
+        return None  # no comparable neighbours nearby either
+    predicted = predictor.predict(target, comparables)
+    # The calculator needs a MAIN building part; a cohort whose template carries
+    # none (e.g. a malformed flat record) yields an unscoreable picture, so reject
+    # it as not-predictable rather than letting the calculator StopIteration.
+    if not any(
+        part.identifier is BuildingPartIdentifier.MAIN
+        for part in predicted.sap_building_parts
+    ):
+        return None
+    return predicted
+
+
+def _run_from_db(
+    args: argparse.Namespace,
+    *,
+    engine: Engine,
+    products: ProductRepository,
+    scenario: Optional[Scenario],
+    considered: Optional[frozenset[MeasureType]],
+    baseline_orchestrator: Optional[PropertyBaselineOrchestrator],
+    md_path: Path,
+    csv_path: Path,
+    candidates_path: Path,
+    target: str,
+    measures_note: str,
+) -> None:
+    """Re-model from already-persisted inputs — **zero gov-API calls**.
+
+    Reads each Property's Effective EPC (lodged-or-predicted, overrides folded),
+    planning protections and solar straight from the DB (a prior ``--persist``
+    ingestion must have stored them), runs the same modelling, and — with
+    ``--persist`` — re-writes the Plan and, for lodged-EPC Properties, the
+    Baseline. A predicted Property has no lodged figures, so it gets no baseline
+    row (same rule as the live path). One bad property is logged and skipped.
+    """
+    md_lines: list[str] = [f"# Modelling recommendations ({target}, {measures_note})\n"]
+    csv_rows: list[str] = [
+        "property_id,uprn,api_sap,baseline_sap,sap_delta,post_sap,measures,"
+        "measure_types,cost_of_works"
+    ]
+    candidate_csv_rows: list[str] = [
+        "property_id,uprn,surface,measure_type,cost_total,contingency_rate,"
+        "selected,description"
+    ]
+    total = len(args.property_ids)
+    run_start = time.monotonic()
+    errors = 0
+    for index, property_id in enumerate(args.property_ids, start=1):
+        elapsed = time.monotonic() - run_start
+        eta = (elapsed / (index - 1)) * (total - index + 1) if index > 1 else 0.0
+        print(
+            f"[{index}/{total}] · {errors} err · elapsed {elapsed / 60:.1f}m "
+            f"· ETA {eta / 60:.1f}m · property {property_id} (from DB)",
+            flush=True,
+        )
+        try:
+            with PostgresUnitOfWork(lambda: Session(engine)) as uow:
+                prop = uow.property.get(property_id)
+                effective_epc: EpcPropertyData = prop.effective_epc
+                restrictions: PlanningRestrictions = prop.planning_restrictions
+                uprn: Optional[int] = prop.identity.uprn
+                epc: Optional[EpcPropertyData] = prop.epc
+                solar_insights: Optional[dict[str, Any]] = (
+                    uow.solar.get(uprn) if uprn is not None else None
+                )
+            predicted = epc is None
+            plan: Plan = run_modelling(
+                effective_epc,
+                goal_band=args.goal,
+                planning_restrictions=restrictions,
+                solar_insights=solar_insights,
+                considered_measures=considered,
+                products=products,
+                scenario=scenario,
+                print_table=False,
+            )
+            candidates: list[Recommendation] = candidate_recommendations(
+                epc if epc is not None else effective_epc,
+                planning_restrictions=restrictions,
+                solar_insights=solar_insights,
+                considered_measures=considered,
+                products=products,
+            )
+            if args.persist:
+                assert scenario is not None  # guaranteed by the --persist guard
+                with PostgresUnitOfWork(lambda: Session(engine)) as uow:
+                    uow.plan.save(
+                        plan,
+                        property_id=property_id,
+                        scenario_id=scenario.id,
+                        portfolio_id=args.portfolio_id,
+                        is_default=scenario.is_default,
+                    )
+                    uow.property.mark_modelled(
+                        property_id, has_recommendations=bool(plan.measures)
+                    )
+                    uow.commit()
+                # Lodged EPC also gets its Baseline Performance re-established from
+                # the persisted EPC; predicted Properties have no lodged figures.
+                if epc is not None:
+                    assert baseline_orchestrator is not None
+                    baseline_orchestrator.run([property_id])
+        except Exception as error:  # noqa: BLE001 — one bad property must not stop the run
+            errors += 1
+            line = f"property {property_id}: ERROR — {type(error).__name__}: {error}"
+            print(line + "\n")
+            md_lines.append(f"## Property {property_id}\n\n`{line}`\n")
+            csv_rows.append(f"{property_id},,,,,,,ERROR,")
+            continue
+
+        measure_types = [m.measure_type for m in plan.measures]
+        selected: set[MeasureType] = {m.measure_type for m in plan.measures}
+        flags = [
+            name
+            for name, on in (
+                ("conservation", restrictions.in_conservation_area),
+                ("listed", restrictions.is_listed),
+                ("heritage", restrictions.is_heritage),
+            )
+            if on
+        ]
+        context = (
+            f"{', '.join(flags) if flags else 'unrestricted'}; "
+            f"{'solar ✓' if solar_insights is not None else 'no solar'}"
+        )
+        source_tag = " · ⚠ PREDICTED (no lodged EPC)" if predicted else ""
+        candidate_lines = _candidate_lines(candidates, selected)
+        print(
+            f"=== Property {property_id} (uprn {uprn}) === "
+            f"SAP {plan.baseline.sap_continuous:.1f} -> {plan.post_sap_continuous:.1f} "
+            f"· {len(plan.measures)} measure(s) · £{plan.cost_of_works:,.0f} "
+            f"· {context}{source_tag}"
+        )
+        print(format_plan_table(plan))
+        md_lines.append(f"## Property {property_id} (uprn {uprn}){source_tag}\n")
+        md_lines.append(
+            f"SAP {plan.baseline.sap_continuous:.1f} → {plan.post_sap_continuous:.1f} "
+            f"· {len(plan.measures)} measure(s) · cost £{plan.cost_of_works:,.0f} "
+            f"· {context}\n"
+        )
+        md_lines.append("**Selected Plan**\n")
+        md_lines.extend(_measure_summary(m) for m in plan.measures)
+        md_lines.append("")
+        md_lines.append("**All candidate measures (cost per measure)**\n")
+        md_lines.extend(candidate_lines)
+        md_lines.append("")
+        api_sap: Optional[int] = epc.energy_rating_current if epc is not None else None
+        calc_sap: float = plan.baseline.sap_continuous
+        api_cell = "" if api_sap is None else str(api_sap)
+        delta_cell = "" if api_sap is None else f"{calc_sap - api_sap:.2f}"
+        csv_rows.append(
+            f"{property_id},{uprn},{api_cell},{calc_sap:.2f},{delta_cell},"
+            f"{plan.post_sap_continuous:.2f},{len(plan.measures)},"
+            f"{'|'.join(measure_types)},{plan.cost_of_works:.0f}"
+        )
+        candidate_csv_rows.extend(
+            _candidate_csv_rows(property_id, uprn, candidates, selected)
+        )
+
+    md_path.write_text("\n".join(md_lines) + "\n", encoding="utf-8")
+    csv_path.write_text("\n".join(csv_rows) + "\n", encoding="utf-8")
+    candidates_path.write_text("\n".join(candidate_csv_rows) + "\n", encoding="utf-8")
+    print(f"wrote {md_path.resolve()}")
+    print(f"wrote {csv_path.resolve()}")
+    print(f"wrote {candidates_path.resolve()}")
+
+
 def main() -> None:
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument(
@@ -384,11 +636,41 @@ def main() -> None:
         action="store_true",
         help="skip the live Google Solar fetch (no Solar PV Options)",
     )
+    parser.add_argument(
+        "--out-prefix",
+        default=None,
+        help="write outputs to <prefix>.md / <prefix>.csv / <prefix>_candidates.csv "
+        "(parent dirs created) instead of ./modelling_e2e.*; lets batched runs "
+        "keep separate, durable output files",
+    )
+    parser.add_argument(
+        "--from-db",
+        action="store_true",
+        default=False,
+        help="re-model from already-persisted inputs: read each Property's "
+        "Effective EPC + planning protections + solar from the DB and skip the "
+        "live EPC/spatial/solar fetch entirely (zero gov-API calls). Requires a "
+        "prior --persist ingestion run; with --persist it re-writes the Plan "
+        "(and Baseline for lodged-EPC Properties) without re-fetching.",
+    )
     args = parser.parse_args()
 
     if args.persist and (args.scenario_id is None or args.portfolio_id is None):
         parser.error("--persist requires --scenario-id and --portfolio-id")
 
+    if args.out_prefix:
+        _base = Path(args.out_prefix)
+        _base.parent.mkdir(parents=True, exist_ok=True)
+        md_path = _base.with_suffix(".md")
+        csv_path = _base.with_suffix(".csv")
+        candidates_path = _base.parent / f"{_base.name}_candidates.csv"
+    else:
+        md_path, csv_path, candidates_path = (
+            _MARKDOWN_PATH,
+            _CSV_PATH,
+            _CANDIDATES_CSV_PATH,
+        )
+
     load_env(ENV_PATH)
     # The new gov EPC API (Bearer) authenticates with OPEN_EPC_API_TOKEN — the
     # name is misleading; EPC_AUTH_TOKEN is dead (403). Verified against the
@@ -401,14 +683,62 @@ def main() -> None:
         _parse_measures(args.measures), _parse_measures(args.exclude_measures)
     )
     uprns = _uprns_for(engine, args.property_ids)
+    postcodes = _postcodes_for(engine, args.property_ids)
     # Landlord Overrides are read from property_overrides and folded onto the lodged
     # EPC to form the Effective EPC the calculator scores (ADR-0032).
     overrides_reader = PropertyOverridesPostgresReader(lambda: Session(engine))
     _dump_overrides(engine, args.property_ids)
+    # EPC Prediction (Path 3, ADR-0031): when a Property has no lodged EPC, an
+    # EpcPropertyData is synthesised from its postcode cohort. The cohort comes
+    # from the live EPC API (search-by-postcode + per-cert fetch), memoised per
+    # postcode so co-located missing Properties don't refetch the same cohort.
+    prediction_attributes = OverrideBackedPredictionAttributesReader(overrides_reader)
+    comparables_repo = EpcComparablePropertiesRepository(
+        epc_client, geospatial, nearby_postcodes=PostcodesIoClient()
+    )
+    predictor = EpcPrediction()
+    _cohort_cache: dict[str, list[ComparableProperty]] = {}
+    _nearby_cohort_cache: dict[tuple[str, str], list[ComparableProperty]] = {}
+
+    def cohort_for(postcode: str) -> list[ComparableProperty]:
+        if postcode not in _cohort_cache:
+            _cohort_cache[postcode] = (
+                comparables_repo.candidates_for(postcode) if postcode else []
+            )
+        return _cohort_cache[postcode]
+
+    def broaden(target: PredictionTarget) -> list[ComparableProperty]:
+        # Broadened cohort for a gated-out target: the nearest real postcodes,
+        # walked until enough same-type comparables surface (ADR-0034). Memoised
+        # per (postcode, property_type).
+        key = (target.postcode, target.property_type)
+        if key not in _nearby_cohort_cache:
+            _nearby_cohort_cache[key] = (
+                comparables_repo.candidates_near(
+                    target.postcode,
+                    target.coordinates,
+                    enough=lambda c: c.epc.property_type == target.property_type,
+                )
+                if target.postcode
+                else []
+            )
+        return _nearby_cohort_cache[key]
     # One read-only session for the live `material` catalogue, reused across the
     # batch so both store and no-store runs price against the same DB rows.
     catalogue_session = Session(engine)
-    products = ProductPostgresRepository(catalogue_session)
+    products = catalogue_with_off_catalogue_overrides(catalogue_session)
+    # When persisting, a lodged-EPC Property also gets a Baseline Performance row
+    # via the production orchestrator (lodged-vs-calculator SAP, the bill block) —
+    # the same establish-and-persist the first-run pipeline runs, here per Property
+    # so one bad cert doesn't abort the batch. Predicted Properties have no lodged
+    # figures, so they are skipped below.
+    baseline_orchestrator: Optional[PropertyBaselineOrchestrator] = None
+    if args.persist:
+        baseline_orchestrator = PropertyBaselineOrchestrator(
+            unit_of_work=lambda: PostgresUnitOfWork(lambda: Session(engine)),
+            rebaseliner=CalculatorRebaseliner(Sap10Calculator()),
+            fuel_rates=FuelRatesStaticFileRepository(),
+        )
     scenario: Optional[Scenario] = (
         _scenario_for(catalogue_session, args.scenario_id)
         if args.scenario_id is not None
@@ -428,56 +758,144 @@ def main() -> None:
     )
     measures_note = ",".join(sorted(considered)) if considered else "all measures"
     mode = "PERSISTING to DB" if args.persist else "no DB writes"
+    source = "persisted DB inputs" if args.from_db else "live EPC/solar"
     print(
         f"modelling {len(args.property_ids)} propertie(s) · {target} · {measures_note} · "
-        f"{mode} (DB material catalogue, live EPC/solar)...\n"
+        f"{mode} (DB material catalogue, {source})...\n"
     )
 
+    if args.from_db:
+        # Read inputs from the DB and skip every live fetcher (no gov-API calls).
+        # Self-contained loop + file writing; the live path below is left as-is.
+        _run_from_db(
+            args,
+            engine=engine,
+            products=products,
+            scenario=scenario,
+            considered=considered,
+            baseline_orchestrator=baseline_orchestrator,
+            md_path=md_path,
+            csv_path=csv_path,
+            candidates_path=candidates_path,
+            target=target,
+            measures_note=measures_note,
+        )
+        catalogue_session.close()
+        return
+
     md_lines: list[str] = [f"# Modelling recommendations ({target}, {measures_note})\n"]
     csv_rows: list[str] = [
-        "property_id,uprn,baseline_sap,post_sap,measures,measure_types,cost_of_works"
+        "property_id,uprn,api_sap,baseline_sap,sap_delta,post_sap,measures,"
+        "measure_types,cost_of_works"
     ]
     candidate_csv_rows: list[str] = [
         "property_id,uprn,surface,measure_type,cost_total,contingency_rate,"
         "selected,description"
     ]
 
-    for property_id in args.property_ids:
+    total = len(args.property_ids)
+    run_start = time.monotonic()
+    errors = 0
+    for index, property_id in enumerate(args.property_ids, start=1):
+        elapsed = time.monotonic() - run_start
+        rate = elapsed / (index - 1) if index > 1 else 0.0
+        eta = rate * (total - index + 1)
+        bar_done = int(28 * (index - 1) / total)
+        bar = "#" * bar_done + "-" * (28 - bar_done)
+        print(
+            f"[{bar}] {index}/{total} ({100 * (index - 1) / total:.1f}%) "
+            f"· {errors} err · elapsed {elapsed / 60:.1f}m · ETA {eta / 60:.1f}m "
+            f"· property {property_id}",
+            flush=True,
+        )
         uprn = uprns.get(property_id)
         try:
             if uprn is None:
                 raise ValueError("no UPRN on the property row")
-            epc: Optional[EpcPropertyData] = epc_client.get_by_uprn(uprn)
-            if epc is None:
-                raise ValueError(f"no EPC found for UPRN {uprn}")
-            # Fold any Landlord Overrides onto the lodged EPC; with none, the
-            # Effective EPC is the lodged EPC unchanged (ADR-0032).
-            overlaid_property = Property(
-                identity=PropertyIdentity(
-                    portfolio_id=args.portfolio_id or 0,
-                    postcode="",
-                    address="",
-                    uprn=uprn,
-                ),
-                epc=epc,
-                landlord_overrides=overlays_from(
-                    overrides_reader.overrides_for(property_id)
-                ),
-            )
-            effective_epc: EpcPropertyData = overlaid_property.effective_epc
-            lodged_wall = _main_wall_summary(epc)
-            effective_wall = _main_wall_summary(effective_epc)
-            if lodged_wall != effective_wall:
-                print(
-                    f"  overlay moved the main wall: lodged [{lodged_wall}] "
-                    f"-> effective [{effective_wall}]"
-                )
-            else:
-                print(f"  overlay no-op on main wall: [{lodged_wall}]")
+            postcode = postcodes.get(property_id, "")
+            # Resolve the spatial reference once: its planning protections gate
+            # measures, and its coordinates both drive solar AND distance-weight
+            # the EPC-Prediction cohort, so resolve before the EPC branch.
             spatial: Optional[SpatialReference] = _spatial_for(geospatial, uprn)
             restrictions: PlanningRestrictions = (
                 spatial.restrictions if spatial is not None else PlanningRestrictions()
             )
+            coordinates: Optional[Coordinates] = (
+                spatial.coordinates if spatial is not None else None
+            )
+            overrides = overlays_from(overrides_reader.overrides_for(property_id))
+            epc: Optional[EpcPropertyData] = epc_client.get_by_uprn(uprn)
+            predicted = False
+            if epc is not None:
+                # Lodged EPC: fold any Landlord Overrides onto it; with none, the
+                # Effective EPC is the lodged EPC unchanged (ADR-0032).
+                overlaid_property = Property(
+                    identity=PropertyIdentity(
+                        portfolio_id=args.portfolio_id or 0,
+                        postcode=postcode,
+                        address="",
+                        uprn=uprn,
+                    ),
+                    epc=epc,
+                    landlord_overrides=overrides,
+                )
+                effective_epc: EpcPropertyData = overlaid_property.effective_epc
+                lodged_wall = _main_wall_summary(epc)
+                effective_wall = _main_wall_summary(effective_epc)
+                if lodged_wall != effective_wall:
+                    print(
+                        f"  overlay moved the main wall: lodged [{lodged_wall}] "
+                        f"-> effective [{effective_wall}]"
+                    )
+                else:
+                    print(f"  overlay no-op on main wall: [{lodged_wall}]")
+            else:
+                # No lodged EPC: synthesise one from the postcode cohort
+                # (EPC Prediction Path 3, ADR-0031).
+                predicted_epc = _predict_epc(
+                    property_id=property_id,
+                    uprn=uprn,
+                    postcode=postcode,
+                    portfolio_id=args.portfolio_id or 0,
+                    attributes_reader=prediction_attributes,
+                    coordinates=coordinates,
+                    cohort_for=cohort_for,
+                    broaden=broaden,
+                    predictor=predictor,
+                )
+                if predicted_epc is None:
+                    raise ValueError(
+                        f"no EPC for UPRN {uprn} and not predictable "
+                        f"(unresolved property_type, or no same-type "
+                        f"comparables in or near '{postcode}')"
+                    )
+                # Property.effective_epc folds any Landlord Overrides onto the
+                # synthesised EPC (cohort fills the unknown fields, the landlord's
+                # known facts correct them) — same overlay the lodged path applies.
+                effective_epc = Property(
+                    identity=PropertyIdentity(
+                        portfolio_id=args.portfolio_id or 0,
+                        postcode=postcode,
+                        address="",
+                        uprn=uprn,
+                    ),
+                    epc=None,
+                    predicted_epc=predicted_epc,
+                    landlord_overrides=overrides,
+                ).effective_epc
+                predicted = True
+                synth_wall = _main_wall_summary(predicted_epc)
+                effective_wall = _main_wall_summary(effective_epc)
+                if synth_wall != effective_wall:
+                    print(
+                        f"  no lodged EPC -> synthesised from '{postcode}' cohort; "
+                        f"overlay moved wall [{synth_wall}] -> [{effective_wall}]"
+                    )
+                else:
+                    print(
+                        f"  no lodged EPC -> synthesised from '{postcode}' cohort "
+                        f"(overlay no-op on wall) [{synth_wall}]"
+                    )
             solar_insights: Optional[dict[str, Any]] = (
                 None if args.no_solar else _solar_insights_for(solar_client, spatial)
             )
@@ -492,9 +910,10 @@ def main() -> None:
                 print_table=False,
             )
             # The full candidate menu (every Generator Option + its cost), so
-            # measures the Optimiser did not select are still visible.
+            # measures the Optimiser did not select are still visible. A predicted
+            # Property has no lodged cert, so the synthesised Effective EPC is used.
             candidates: list[Recommendation] = candidate_recommendations(
-                epc,
+                epc if epc is not None else effective_epc,
                 planning_restrictions=restrictions,
                 solar_insights=solar_insights,
                 considered_measures=considered,
@@ -513,6 +932,12 @@ def main() -> None:
                     solar_insights=solar_insights,
                     plan=plan,
                 )
+                # A lodged EPC also gets its Baseline Performance persisted
+                # (reads the EPC just saved above). Predicted Properties have no
+                # lodged figures to baseline, so they are skipped.
+                if epc is not None:
+                    assert baseline_orchestrator is not None
+                    baseline_orchestrator.run([property_id])
         except (
             Exception
         ) as error:  # noqa: BLE001 — one bad property must not stop the run
@@ -521,20 +946,25 @@ def main() -> None:
             # subsequent property reports `InFailedSqlTransaction` and masks its
             # own real error. Reset so each property surfaces what's wrong.
             catalogue_session.rollback()
+            errors += 1
             line = f"property {property_id} (uprn {uprn}): ERROR — {type(error).__name__}: {error}"
             print(line + "\n")
             md_lines.append(f"## Property {property_id}\n\n`{line}`\n")
-            csv_rows.append(f"{property_id},{uprn or ''},,,,ERROR,")
+            csv_rows.append(f"{property_id},{uprn or ''},,,,,,ERROR,")
             continue
 
         measure_types = [m.measure_type for m in plan.measures]
         selected: set[MeasureType] = {m.measure_type for m in plan.measures}
         context = _context_summary(spatial, solar_insights)
+        # Flag EPC-Prediction properties so a synthesised SAP is never mistaken
+        # for one scored off a lodged cert.
+        source_tag = " · ⚠ PREDICTED (no lodged EPC)" if predicted else ""
         candidate_lines = _candidate_lines(candidates, selected)
         header = (
             f"=== Property {property_id} (uprn {uprn}) === "
             f"SAP {plan.baseline.sap_continuous:.1f} -> {plan.post_sap_continuous:.1f} "
             f"· {len(plan.measures)} measure(s) · £{plan.cost_of_works:,.0f} · {context}"
+            f"{source_tag}"
         )
         print(header)
         print(format_plan_table(plan))
@@ -543,7 +973,7 @@ def main() -> None:
             print(candidate_line)
         print()
 
-        md_lines.append(f"## Property {property_id} (uprn {uprn})\n")
+        md_lines.append(f"## Property {property_id} (uprn {uprn}){source_tag}\n")
         md_lines.append(
             f"SAP {plan.baseline.sap_continuous:.1f} → {plan.post_sap_continuous:.1f} "
             f"· {len(plan.measures)} measure(s) · cost £{plan.cost_of_works:,.0f} "
@@ -555,8 +985,16 @@ def main() -> None:
         md_lines.append("**All candidate measures (cost per measure)**\n")
         md_lines.extend(candidate_lines)
         md_lines.append("")
+        # api_sap is the lodged/register SAP (off the cert); a predicted Property
+        # has none, so it and the delta are left blank. baseline_sap is the
+        # calculator's score on the Effective EPC — the two whose divergence the
+        # run is for reviewing (mirrors lodged vs effective in the baseline table).
+        api_sap: Optional[int] = epc.energy_rating_current if epc is not None else None
+        calc_sap: float = plan.baseline.sap_continuous
+        api_sap_cell = "" if api_sap is None else str(api_sap)
+        sap_delta_cell = "" if api_sap is None else f"{calc_sap - api_sap:.2f}"
         csv_rows.append(
-            f"{property_id},{uprn},{plan.baseline.sap_continuous:.2f},"
+            f"{property_id},{uprn},{api_sap_cell},{calc_sap:.2f},{sap_delta_cell},"
             f"{plan.post_sap_continuous:.2f},{len(plan.measures)},"
             f"{'|'.join(measure_types)},{plan.cost_of_works:.0f}"
         )
@@ -565,14 +1003,14 @@ def main() -> None:
         )
 
     catalogue_session.close()
-    _MARKDOWN_PATH.write_text("\n".join(md_lines) + "\n", encoding="utf-8")
-    _CSV_PATH.write_text("\n".join(csv_rows) + "\n", encoding="utf-8")
-    _CANDIDATES_CSV_PATH.write_text(
+    md_path.write_text("\n".join(md_lines) + "\n", encoding="utf-8")
+    csv_path.write_text("\n".join(csv_rows) + "\n", encoding="utf-8")
+    candidates_path.write_text(
         "\n".join(candidate_csv_rows) + "\n", encoding="utf-8"
     )
-    print(f"wrote {_MARKDOWN_PATH.resolve()}")
-    print(f"wrote {_CSV_PATH.resolve()}")
-    print(f"wrote {_CANDIDATES_CSV_PATH.resolve()}")
+    print(f"wrote {md_path.resolve()}")
+    print(f"wrote {csv_path.resolve()}")
+    print(f"wrote {candidates_path.resolve()}")
 
 
 if __name__ == "__main__":
diff --git a/scripts/summary_to_sap.py b/scripts/summary_to_sap.py
new file mode 100644
index 000000000..f8f30790a
--- /dev/null
+++ b/scripts/summary_to_sap.py
@@ -0,0 +1,94 @@
+"""Elmhurst Summary PDF -> EpcPropertyData -> Sap10Calculator, with a dump of
+our SAP score + per-end-use kWh + the `intermediate` worksheet trail, for
+diffing against the accompanying Elmhurst worksheet PDF.
+
+Usage:
+    python -m scripts.summary_to_sap "<path to Summary_*.pdf>"
+
+Reuses the exact preprocessing the Summary->EpcPropertyData chain test uses
+(`backend/documents_parser/tests/test_summary_pdf_mapper_chain.py`):
+`pdftotext -layout` -> Textract-style label/value stream -> extractor ->
+`from_elmhurst_site_notes` mapper.
+"""
+
+from __future__ import annotations
+
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+from backend.documents_parser.elmhurst_extractor import ElmhurstSiteNotesExtractor
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+from domain.sap10_calculator.calculator import Sap10Calculator
+from domain.sap10_calculator.rdsap.cert_to_inputs import cert_to_inputs
+
+
+def _summary_pdf_to_textract_style_pages(pdf_path: Path) -> list[str]:
+    info = subprocess.run(
+        ["pdfinfo", str(pdf_path)], capture_output=True, text=True, check=True
+    ).stdout
+    m = re.search(r"Pages:\s+(\d+)", info)
+    if m is None:
+        raise RuntimeError(f"Could not parse page count from {pdf_path}")
+    page_count = int(m.group(1))
+    pages: list[str] = []
+    for i in range(1, page_count + 1):
+        layout = subprocess.run(
+            ["pdftotext", "-layout", "-f", str(i), "-l", str(i), str(pdf_path), "-"],
+            capture_output=True, text=True, check=True,
+        ).stdout
+        tokens: list[str] = []
+        for line in layout.splitlines():
+            if not line.strip():
+                tokens.append("")
+                continue
+            tokens.extend(p for p in re.split(r"\s{2,}", line.strip()) if p)
+        pages.append("\n".join(tokens))
+    return pages
+
+
+def main(pdf: str) -> None:
+    pdf_path = Path(pdf)
+    pages = _summary_pdf_to_textract_style_pages(pdf_path)
+    survey = ElmhurstSiteNotesExtractor(pages).extract()
+    epc = EpcPropertyDataMapper.from_elmhurst_site_notes(survey)
+    inp = cert_to_inputs(epc)
+    r = Sap10Calculator().calculate(epc)
+    p = epc.sap_building_parts[0] if epc.sap_building_parts else None
+
+    print(f"=== {pdf_path.name} ===")
+    print(f"dwelling_type={epc.dwelling_type!r} property_type={epc.property_type!r} "
+          f"age_band={p.construction_age_band if p else None} TFA={epc.total_floor_area_m2}")
+    print(f"OUR SAP = {r.sap_score} ({r.sap_score_continuous:.4f})  "
+          f"CO2={r.co2_kg_per_yr/1000:.3f} t/yr  PEUI={r.primary_energy_kwh_per_m2:.1f}")
+    print("--- per end use (kWh/yr) ---")
+    print(f"  space_heating useful = {r.space_heating_kwh_per_yr:.1f}")
+    print(f"  main_heating fuel    = {r.main_heating_fuel_kwh_per_yr:.1f}")
+    print(f"  secondary fuel       = {r.secondary_heating_fuel_kwh_per_yr:.1f}")
+    print(f"  hot_water            = {r.hot_water_kwh_per_yr:.1f}")
+    print(f"  lighting             = {r.lighting_kwh_per_yr:.1f}")
+    print(f"  pumps_fans           = {r.pumps_fans_kwh_per_yr:.1f}")
+    print(f"  delivered fuel total = {r.intermediate.get('delivered_fuel_kwh_per_yr', float('nan')):.1f}")
+    print("--- costs / rating ---")
+    for k in ("main_heating_cost_gbp", "secondary_heating_cost_gbp", "hot_water_cost_gbp",
+              "pumps_fans_cost_gbp", "lighting_cost_gbp", "ecf"):
+        print(f"  {k:28s} {r.intermediate.get(k, float('nan')):.4f}")
+    print(f"  is_off_peak={r.is_off_peak_meter} main_hrf={r.main_heating_high_rate_fraction} "
+          f"hw_hrf={r.hot_water_high_rate_fraction:.4f} other_hrf={r.other_electricity_high_rate_fraction}")
+    print(f"  space £/kWh={inp.space_heating_fuel_cost_gbp_per_kwh} "
+          f"hw £/kWh={inp.hot_water_fuel_cost_gbp_per_kwh} other £/kWh={inp.other_fuel_cost_gbp_per_kwh}")
+    print("--- heat balance (intermediate) ---")
+    for k in ("heat_transfer_coefficient_w_per_k", "heat_loss_parameter_w_per_m2k",
+              "walls_w_per_k", "roof_w_per_k", "floor_w_per_k", "party_walls_w_per_k",
+              "windows_w_per_k", "doors_w_per_k", "thermal_bridging_w_per_k",
+              "infiltration_w_per_k", "infiltration_ach", "internal_gains_annual_avg_w",
+              "mean_internal_temp_annual_avg_c", "useful_space_heating_kwh_per_yr"):
+        print(f"  {k:38s} {r.intermediate.get(k, float('nan')):.4f}")
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print(__doc__)
+        sys.exit(2)
+    main(sys.argv[1])
diff --git a/scripts/trigger_modelling_e2e_sqs.py b/scripts/trigger_modelling_e2e_sqs.py
new file mode 100644
index 000000000..a4c6a4df1
--- /dev/null
+++ b/scripts/trigger_modelling_e2e_sqs.py
@@ -0,0 +1,186 @@
+"""Enqueue one SQS message per postcode group for the modelling_e2e Lambda.
+
+Reads postcode → property ID groups from the file produced by
+list_properties_by_postcode.py, queries the DB for already-completed
+property IDs, then sends one SQS message per postcode batch containing only
+the properties that still need processing.
+
+Edit the CONFIG block below, then hit Run.
+AWS creds come from the ambient ~/.aws profile.
+"""
+
+from __future__ import annotations
+
+import ast
+import json
+import sys
+from datetime import datetime, timedelta, timezone
+from pathlib import Path
+from typing import Any, cast
+
+from utilities.logger import setup_logger
+
+# ---------------------------------------------------------------------------
+# CONFIG — edit these before running
+# ---------------------------------------------------------------------------
+PORTFOLIO_ID: int = 796
+SCENARIO_ID: int = 1268
+SQS_QUEUE_NAME: str = "modelling_e2e-queue-dev"
+
+# Max number of properties to process this run (cost cap).
+PROPERTIES_LIMIT: int = 32000
+
+# Number of properties bundled into each SQS message / Lambda invocation.
+BATCH_SIZE: int = 50
+
+# Skip properties whose modelling_e2e sub_task completed at or after this time.
+# Set to None to disable the filter and process all properties.
+COMPLETED_SINCE: datetime | None = datetime(
+    2026, 6, 24, 12, 27, 54, 34000, tzinfo=timezone(timedelta(hours=1))
+)
+
+# True → Lambda runs the full pipeline but skips all DB writes (safe for testing).
+DRY_RUN: bool = False
+
+# False → Lambda skips the Google Solar fetch (re-uses stored Solar data).
+REFETCH_SOLAR: bool = False
+
+# False → use stored lodged EPC for properties that have one; properties with no
+# stored lodged EPC are treated as EPC-less and routed to prediction (no API call).
+REFETCH_EPC: bool = False
+
+# False → use stored predicted EPC for EPC-less properties that have one; live
+# prediction still runs when no stored predicted EPC exists for the property.
+REPREDICT_EPC: bool = False
+# ---------------------------------------------------------------------------
+
+_REPO_ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(_REPO_ROOT))
+
+import boto3  # noqa: E402
+from sqlalchemy import text  # noqa: E402
+
+from scripts.e2e_common import ENV_PATH, build_engine, load_env  # noqa: E402
+
+logger = setup_logger()
+
+_POSTCODES_FILE = _REPO_ROOT / "scripts" / f"properties_by_postcode_{PORTFOLIO_ID}.txt"
+
+
+def _load_postcode_map() -> dict[str, list[int]]:
+    if not _POSTCODES_FILE.exists():
+        raise FileNotFoundError(
+            f"{_POSTCODES_FILE} not found — run list_properties_by_postcode.py first"
+        )
+    result: dict[str, list[int]] = {}
+    for line in _POSTCODES_FILE.read_text(encoding="utf-8").splitlines():
+        line = line.strip()
+        if not line or line.startswith("Total"):
+            continue
+        postcode_repr, ids_repr = line.split(": ", 1)
+        result[ast.literal_eval(postcode_repr)] = ast.literal_eval(ids_repr)
+    return result
+
+
+def _completed_property_ids(since: datetime, scenario_id: int) -> set[int]:
+    """Return property IDs with a completed modelling_e2e sub_task for *scenario_id* on or after *since*."""
+    load_env(ENV_PATH)
+    engine = build_engine()
+    with engine.connect() as conn:
+        rows = conn.execute(
+            text("""
+                SELECT DISTINCT ((st.inputs::jsonb)->>'property_id')::int AS property_id
+                FROM sub_task st
+                JOIN tasks t ON t.id = st.task_id
+                WHERE t.task_source = 'modelling_e2e'
+                AND st.status = 'complete'
+                AND st.job_completed >= :since
+                AND (st.inputs::jsonb) ? 'property_id'
+                AND ((st.inputs::jsonb)->>'scenario_id')::int = :scenario_id
+            """),
+            {"since": since, "scenario_id": scenario_id},
+        ).fetchall()
+    return {int(r[0]) for r in rows}
+
+
+def main() -> None:
+    postcode_map = _load_postcode_map()
+
+    completed: set[int] = set()
+    if COMPLETED_SINCE is not None:
+        completed = _completed_property_ids(COMPLETED_SINCE, SCENARIO_ID)
+        logger.info(
+            f"skipping {len(completed)} properties already completed since {COMPLETED_SINCE}"
+        )
+
+    # Filter to pending IDs, keeping postcode grouping intact.
+    pending: list[tuple[str, list[int]]] = [
+        (pc, [i for i in ids if i not in completed])
+        for pc, ids in postcode_map.items()
+        if any(i not in completed for i in ids)
+    ]
+
+    # Apply PROPERTIES_LIMIT: skip whole postcodes that would exceed the cap.
+    selected: list[tuple[str, list[int]]] = []
+    property_count = 0
+    for postcode, ids in pending:
+        if property_count + len(ids) > PROPERTIES_LIMIT:
+            continue
+        selected.append((postcode, ids))
+        property_count += len(ids)
+
+    # Pack postcodes into batches of ~BATCH_SIZE, never splitting a postcode.
+    # A postcode larger than BATCH_SIZE becomes its own oversized message.
+    batches: list[list[int]] = []
+    current: list[int] = []
+    for _postcode, ids in selected:
+        if current and len(current) + len(ids) > BATCH_SIZE:
+            batches.append(current)
+            current = list(ids)
+        else:
+            current.extend(ids)
+    if current:
+        batches.append(current)
+
+    if not batches:
+        logger.info("Nothing left to process.")
+        return
+
+    logger.info(
+        f"selected {property_count} properties across {len(batches)} batches of ~{BATCH_SIZE} "
+        f"(limit {PROPERTIES_LIMIT})"
+    )
+
+    sqs: Any = cast(
+        Any, boto3.client("sqs", region_name="eu-west-2")
+    )  # pyright: ignore[reportUnknownMemberType]
+    sqs_url: str = sqs.get_queue_url(QueueName=SQS_QUEUE_NAME)["QueueUrl"]
+
+    logger.info(
+        f"sending {len(batches)} messages "
+        f"(portfolio={PORTFOLIO_ID}, scenario={SCENARIO_ID}, "
+        f"dry_run={DRY_RUN}, refetch_solar={REFETCH_SOLAR}, "
+        f"refetch_epc={REFETCH_EPC}, repredict_epc={REPREDICT_EPC}) → {sqs_url}"
+    )
+
+    for batch in batches:
+        sqs.send_message(
+            QueueUrl=sqs_url,
+            MessageBody=json.dumps(
+                {
+                    "property_ids": batch,
+                    "portfolio_id": PORTFOLIO_ID,
+                    "scenario_id": SCENARIO_ID,
+                    "refetch_solar": REFETCH_SOLAR,
+                    "refetch_epc": REFETCH_EPC,
+                    "repredict_epc": REPREDICT_EPC,
+                    "dry_run": DRY_RUN,
+                }
+            ),
+        )
+        logger.info(f"  sent batch: {batch}")
+
+    logger.info(f"\ndone — {len(batches)} messages enqueued")
+
+
+main()
diff --git a/tests/applications/landlord_description_overrides/__init__.py b/tests/applications/landlord_description_overrides/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/applications/landlord_description_overrides/test_build_columns.py b/tests/applications/landlord_description_overrides/test_build_columns.py
new file mode 100644
index 000000000..0e47ed8d9
--- /dev/null
+++ b/tests/applications/landlord_description_overrides/test_build_columns.py
@@ -0,0 +1,79 @@
+"""The landlord-description-overrides handler's column wiring (`_build_columns`).
+
+A `column_mapping` entry of ``{category -> source header}`` must produce a
+ClassifiableColumn that reads the named header and classifies into the
+category's enum. This pins the main_fuel category onto the wiring.
+"""
+
+from __future__ import annotations
+
+from typing import cast
+
+from applications.landlord_description_overrides.handler import _build_columns  # pyright: ignore[reportPrivateUsage]
+from infrastructure.chatgpt.chatgpt import ChatGPT
+
+
+def test_build_columns_wires_a_main_fuel_classifier_column() -> None:
+    # Arrange — the factory only stores the injected collaborators, so a bare
+    # object stands in for the (I/O-bound) ChatGPT client and the DB session.
+    chat_gpt = cast(ChatGPT, object())
+
+    # Act
+    columns = _build_columns({"main_fuel": "Main Fuel"}, chat_gpt, None)
+
+    # Assert — one column, named main_fuel, reading the "Main Fuel" header.
+    assert len(columns) == 1
+    assert columns[0].name == "main_fuel"
+    assert columns[0].source_column == "Main Fuel"
+
+
+def test_build_columns_wires_a_glazing_classifier_column() -> None:
+    # Arrange
+    chat_gpt = cast(ChatGPT, object())
+
+    # Act
+    columns = _build_columns({"glazing": "Glazing"}, chat_gpt, None)
+
+    # Assert — one column, named glazing, reading the "Glazing" header.
+    assert len(columns) == 1
+    assert columns[0].name == "glazing"
+    assert columns[0].source_column == "Glazing"
+
+
+def test_build_columns_wires_a_construction_age_band_classifier_column() -> None:
+    # Arrange
+    chat_gpt = cast(ChatGPT, object())
+
+    # Act
+    columns = _build_columns({"construction_age_band": "Age"}, chat_gpt, None)
+
+    # Assert — one column, named construction_age_band, reading the "Age" header.
+    assert len(columns) == 1
+    assert columns[0].name == "construction_age_band"
+    assert columns[0].source_column == "Age"
+
+
+def test_build_columns_wires_a_water_heating_classifier_column() -> None:
+    # Arrange
+    chat_gpt = cast(ChatGPT, object())
+
+    # Act
+    columns = _build_columns({"water_heating": "Hot Water"}, chat_gpt, None)
+
+    # Assert
+    assert len(columns) == 1
+    assert columns[0].name == "water_heating"
+    assert columns[0].source_column == "Hot Water"
+
+
+def test_build_columns_wires_a_main_heating_system_classifier_column() -> None:
+    # Arrange
+    chat_gpt = cast(ChatGPT, object())
+
+    # Act
+    columns = _build_columns({"main_heating_system": "Heating"}, chat_gpt, None)
+
+    # Assert
+    assert len(columns) == 1
+    assert columns[0].name == "main_heating_system"
+    assert columns[0].source_column == "Heating"
diff --git a/tests/applications/modelling_e2e/__init__.py b/tests/applications/modelling_e2e/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/applications/modelling_e2e/test_handler.py b/tests/applications/modelling_e2e/test_handler.py
new file mode 100644
index 000000000..a09fe266a
--- /dev/null
+++ b/tests/applications/modelling_e2e/test_handler.py
@@ -0,0 +1,1552 @@
+"""Tests for the modelling_e2e Lambda handler.
+
+Tests exercise the handler's external behaviour through handler.__wrapped__,
+patching I/O boundaries (EPC client, DB reads, UoW) so no real DB or network
+is needed. One test per distinct behaviour path.
+"""
+
+from __future__ import annotations
+
+from contextlib import ExitStack
+from typing import Any, Iterator, Optional
+from unittest.mock import MagicMock, call, patch
+from uuid import UUID, uuid4
+
+import pytest
+from pydantic import ValidationError
+
+from applications.modelling_e2e.modelling_e2e_trigger_body import (
+    ModellingE2ETriggerBody,
+)
+from domain.tasks.subtasks import SubTask
+from repositories.epc.epc_postgres_repository import EpcSaveRequest
+
+PROPERTY_ID = 12345
+UPRN = 987654321
+POSTCODE = "SW1A 1AA"
+PORTFOLIO_ID = 100
+SCENARIO_ID = 200
+
+_ENV = {
+    "OPEN_EPC_API_TOKEN": "test-token",
+    "DATA_BUCKET": "test-bucket",
+    "GOOGLE_SOLAR_API_KEY": "test-solar-key",
+}
+
+_BODY = {
+    "property_ids": [PROPERTY_ID],
+    "portfolio_id": PORTFOLIO_ID,
+    "scenario_id": SCENARIO_ID,
+    "refetch_solar": False,
+    "dry_run": False,
+}
+
+
+def _mock_orchestrator() -> MagicMock:
+    """Mock TaskOrchestrator whose run_subtasks creates one SubTask per input and
+    runs work for each, isolating per-item failures (mirroring the real method)."""
+    mock = MagicMock()
+
+    def _run_subtasks(
+        parent_task_id: UUID,
+        inputs_per_subtask: list[dict[str, Any]],
+        work: Any,
+        **kwargs: Any,
+    ) -> list[Any]:
+        results: list[Any] = []
+        for inputs in inputs_per_subtask:
+            subtask = SubTask.create(task_id=parent_task_id, inputs=inputs)
+            try:
+                results.append(work(subtask))
+            except Exception:  # noqa: BLE001 — siblings continue, as in real impl
+                results.append(None)
+        return results
+
+    mock.run_subtasks.side_effect = _run_subtasks
+    return mock
+
+
+def _call_handler(
+    body: dict[str, Any], orchestrator: Optional[MagicMock] = None
+) -> Any:
+    from applications.modelling_e2e.handler import handler
+
+    orch = orchestrator if orchestrator is not None else _mock_orchestrator()
+    return handler.__wrapped__(body, None, orch, uuid4())  # type: ignore[attr-defined]
+
+
+def _engine_mock(
+    property_ids: list[int],
+    uprns: list[int],
+    postcodes: list[str],
+) -> MagicMock:
+    """Mock engine whose connect() returns one (id, uprn, postcode) row set —
+    the handler reads all three columns in a single query."""
+    mock_engine = MagicMock()
+    mock_conn = mock_engine.connect.return_value.__enter__.return_value
+
+    property_result = MagicMock()
+    property_result.fetchall.return_value = list(
+        zip(property_ids, uprns, postcodes)
+    )
+
+    mock_conn.execute.return_value = property_result
+    return mock_engine
+
+
+def _plan_mock() -> MagicMock:
+    plan = MagicMock()
+    plan.measures = []
+    plan.cost_of_works = 0.0
+    return plan
+
+
+# ---------------------------------------------------------------------------
+# Fixture: clear module-level cohort cache between tests
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture(autouse=True)
+def _clear_cohort_cache() -> None:
+    import applications.modelling_e2e.handler as h
+
+    h._cohort_cache.clear()
+    h._nearby_cohort_cache.clear()
+
+
+@pytest.fixture(autouse=True)
+def _baseline_orchestrator() -> Iterator[MagicMock]:
+    """Patch the Baseline orchestrator for every test — construction stays cheap
+    and ``.run`` is a no-op mock the baseline tests assert against."""
+    with patch(
+        "applications.modelling_e2e.handler.PropertyBaselineOrchestrator"
+    ) as orchestrator:
+        yield orchestrator
+
+
+# ---------------------------------------------------------------------------
+# Solar throttle: per-container call gap resolved from env (quota/N safety)
+# ---------------------------------------------------------------------------
+
+
+def test_solar_min_request_interval_falls_back_to_32_wide_default() -> None:
+    # Arrange — env var absent: the Lambda must still self-protect at the 32-wide
+    # gap so a missed terraform wiring can't reopen the 600 QPM over-quota storm.
+    from applications.modelling_e2e.handler import (
+        _DEFAULT_SOLAR_MIN_REQUEST_INTERVAL_SECONDS,
+        _solar_min_request_interval_seconds,
+    )
+
+    with patch.dict("os.environ", {}, clear=True):
+        # Act
+        result = _solar_min_request_interval_seconds()
+
+    # Assert
+    assert result == _DEFAULT_SOLAR_MIN_REQUEST_INTERVAL_SECONDS
+
+
+def test_solar_min_request_interval_reads_env_when_set() -> None:
+    # Arrange — terraform injects the computed gap (e.g. a smaller N → smaller gap).
+    from applications.modelling_e2e.handler import (
+        _solar_min_request_interval_seconds,
+    )
+
+    with patch.dict(
+        "os.environ", {"SOLAR_MIN_REQUEST_INTERVAL_SECONDS": "2.0"}, clear=True
+    ):
+        # Act
+        result = _solar_min_request_interval_seconds()
+
+    # Assert
+    assert result == 2.0
+
+
+# ---------------------------------------------------------------------------
+# Trigger body validation
+# ---------------------------------------------------------------------------
+
+
+def test_trigger_body_requires_property_ids() -> None:
+    """property_ids (plural) must be provided and must be a list of ints."""
+    # Arrange
+    body = {
+        "property_ids": [1, 2],
+        "portfolio_id": PORTFOLIO_ID,
+        "scenario_id": SCENARIO_ID,
+    }
+
+    # Act
+    result = ModellingE2ETriggerBody.model_validate(body)
+
+    # Assert
+    assert result.property_ids == [1, 2]
+
+
+def test_trigger_body_rejects_missing_property_ids() -> None:
+    with pytest.raises(ValidationError):
+        ModellingE2ETriggerBody.model_validate(
+            {"portfolio_id": PORTFOLIO_ID, "scenario_id": SCENARIO_ID}
+        )
+
+
+def test_trigger_body_new_flags_default_to_true() -> None:
+    """refetch_epc, repredict_epc, and refetch_solar all default True so that
+    existing callers that omit them get current behaviour (live fetches)."""
+    # Arrange
+    body = {
+        "property_ids": [PROPERTY_ID],
+        "portfolio_id": PORTFOLIO_ID,
+        "scenario_id": SCENARIO_ID,
+    }
+
+    # Act
+    result = ModellingE2ETriggerBody.model_validate(body)
+
+    # Assert
+    assert result.refetch_epc is True
+    assert result.repredict_epc is True
+    assert result.refetch_solar is True
+
+
+# ---------------------------------------------------------------------------
+# Child SubTask creation
+# ---------------------------------------------------------------------------
+
+
+def test_handler_creates_one_child_subtask_per_property_id() -> None:
+    """Handler creates exactly N child SubTasks, one per property in the batch,
+    each recording its property_id in inputs."""
+    # Arrange
+    pid1, pid2, pid3 = 111, 222, 333
+    mock_engine = _engine_mock(
+        [pid1, pid2, pid3], [1001, 1002, 1003], [POSTCODE, POSTCODE, POSTCODE]
+    )
+    mock_orch = _mock_orchestrator()
+    task_id = uuid4()
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = MagicMock()
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.run_modelling", return_value=_plan_mock())
+        )
+        MockUoW = stack.enter_context(patch("applications.modelling_e2e.handler.PostgresUnitOfWork"))
+        mock_uow = MagicMock()
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        from applications.modelling_e2e.handler import handler
+        handler.__wrapped__(  # type: ignore[attr-defined]
+            {"property_ids": [pid1, pid2, pid3], "portfolio_id": PORTFOLIO_ID,
+             "scenario_id": SCENARIO_ID, "refetch_solar": False, "dry_run": False},
+            None, mock_orch, task_id,
+        )
+
+    # Assert — the batch is fanned out in ONE run_subtasks call, with one input
+    # per property (each recording its property_id) under the same parent task.
+    mock_orch.run_subtasks.assert_called_once()
+    args = mock_orch.run_subtasks.call_args.args
+    assert args[0] == task_id
+    inputs_per_subtask = args[1]
+    assert [i["property_id"] for i in inputs_per_subtask] == [pid1, pid2, pid3]
+
+
+# ---------------------------------------------------------------------------
+# Lodged EPC path
+# ---------------------------------------------------------------------------
+
+
+def test_lodged_epc_path_saves_epc_plan_and_marks_modelled(
+    _baseline_orchestrator: MagicMock,
+) -> None:
+    """When get_by_uprn returns an EPC the handler saves it, saves the plan,
+    marks the property as modelled — all inside one UoW per property — and
+    re-establishes its Baseline Performance after the plan commits."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    mock_epc = MagicMock()
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    with ExitStack() as stack:
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.os.environ", _ENV)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._get_engine",
+                return_value=mock_engine,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = mock_epc
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GeospatialS3Repository")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GoogleSolarApiClient")
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._spatial_for", return_value=None
+            )
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._solar_insights_for",
+                return_value=None,
+            )
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.overlays_from", return_value=[]
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.Session")
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.run_modelling",
+                return_value=mock_plan,
+            )
+        )
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler(_BODY)
+
+    # Assert — EPC saved (lodged path), plan saved, property marked modelled
+    mock_uow.epc.save_batch.assert_called_once_with(
+        [EpcSaveRequest(mock_epc, property_id=PROPERTY_ID, portfolio_id=PORTFOLIO_ID, source="lodged")]
+    )
+    mock_uow.plan.save_batch.assert_called_once()
+    mock_uow.property.mark_modelled.assert_called_once_with(
+        PROPERTY_ID, has_recommendations=False
+    )
+    mock_uow.commit.assert_called_once()
+    # Baseline Performance is re-established for the lodged property.
+    _baseline_orchestrator.return_value.run.assert_called_once_with([PROPERTY_ID])
+
+
+def test_skipped_cohort_certs_do_not_prevent_plan_being_saved() -> None:
+    """Cohort certs the mapper can't consume are skipped so prediction can
+    proceed — the property's plan is committed before the handler returns."""
+    from repositories.comparable_properties.epc_comparable_properties_repository import (
+        SkippedCohortCert,
+    )
+
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+    skipped = [
+        SkippedCohortCert(
+            certificate_number="8257-7539-1649-0633-4992",
+            error="ValueError: RdSapSchema17_1: missing required field 'window'",
+        )
+    ]
+
+    with ExitStack() as stack:
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.os.environ", _ENV)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._get_engine",
+                return_value=mock_engine,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = MagicMock()
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GeospatialS3Repository")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GoogleSolarApiClient")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._solar_insights_for",
+                return_value=None,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides"
+            )
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.run_modelling",
+                return_value=mock_plan,
+            )
+        )
+        # The repo accumulated a skipped (unmappable) cohort cert during the run.
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcComparablePropertiesRepository")
+        ).return_value.skipped = skipped
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act — no raise even with a skipped cert
+        _call_handler(_BODY)
+
+    # Assert — plan committed despite the skipped cert
+    mock_uow.plan.save_batch.assert_called_once()
+    mock_uow.commit.assert_called_once()
+
+
+def test_skipped_cohort_certs_are_logged_and_handler_does_not_raise() -> None:
+    """Unmappable cohort certs are logged but do not raise — the coordinator
+    SubTask completes normally and the property plan is committed."""
+    from repositories.comparable_properties.epc_comparable_properties_repository import (
+        SkippedCohortCert,
+    )
+
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+    skipped = [
+        SkippedCohortCert(
+            certificate_number="8257-7539-1649-0633-4992",
+            error="ValueError: RdSapSchema17_1: missing required field 'window'",
+        )
+    ]
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = MagicMock()
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.run_modelling", return_value=mock_plan)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcComparablePropertiesRepository")
+        ).return_value.skipped = skipped
+        MockUoW = stack.enter_context(patch("applications.modelling_e2e.handler.PostgresUnitOfWork"))
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+        mock_logger = stack.enter_context(
+            patch("applications.modelling_e2e.handler.logger")
+        )
+
+        # Act — must not raise even though cohort certs were skipped
+        _call_handler(_BODY)
+
+    # Assert — plan committed; skipped cert number surfaced in a log call
+    mock_uow.plan.save_batch.assert_called_once()
+    mock_uow.commit.assert_called_once()
+    logged_messages = " ".join(
+        str(c.args) + str(c.kwargs) for c in mock_logger.info.call_args_list
+    )
+    assert "8257-7539-1649-0633-4992" in logged_messages
+
+
+# ---------------------------------------------------------------------------
+# EPC Prediction path
+# ---------------------------------------------------------------------------
+
+
+def test_prediction_path_saves_predicted_epc_plan_and_baseline(
+    _baseline_orchestrator: MagicMock,
+) -> None:
+    """When get_by_uprn returns None the handler synthesises an EPC via
+    prediction, persists it in the predicted slot (source='predicted'), saves the
+    plan, and re-establishes the Baseline from the predicted picture."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    mock_predicted_epc = MagicMock()
+    # _predict_epc checks for a MAIN building part
+    from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
+
+    mock_part = MagicMock()
+    mock_part.identifier = BuildingPartIdentifier.MAIN
+    mock_predicted_epc.sap_building_parts = [mock_part]
+
+    mock_comparables = MagicMock()
+    mock_comparables.members = [MagicMock()]  # non-empty cohort
+
+    with ExitStack() as stack:
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.os.environ", _ENV)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._get_engine",
+                return_value=mock_engine,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = None  # no lodged EPC
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GeospatialS3Repository")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GoogleSolarApiClient")
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._spatial_for", return_value=None
+            )
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._solar_insights_for",
+                return_value=None,
+            )
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.overlays_from", return_value=[]
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        # Prediction infrastructure
+        from domain.epc_prediction.prediction_target import PredictionTargetAttributes
+
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.OverrideBackedPredictionAttributesReader"
+            )
+        ).return_value.attributes_for.return_value = PredictionTargetAttributes(
+            property_type="2"
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.select_comparables")
+        ).return_value = mock_comparables
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPrediction")
+        ).return_value.predict.return_value = mock_predicted_epc
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.EpcComparablePropertiesRepository"
+            )
+        ).return_value.candidates_for.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.Session")
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.run_modelling",
+                return_value=mock_plan,
+            )
+        )
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler(_BODY)
+
+    # Assert — predicted EPC persisted in the predicted slot, plan saved, baseline run
+    mock_uow.epc.save_batch.assert_called_once_with(
+        [EpcSaveRequest(mock_predicted_epc, property_id=PROPERTY_ID, portfolio_id=PORTFOLIO_ID, source="predicted")]
+    )
+    mock_uow.plan.save_batch.assert_called_once()
+    mock_uow.commit.assert_called_once()
+    _baseline_orchestrator.return_value.run.assert_called_once_with([PROPERTY_ID])
+
+
+# ---------------------------------------------------------------------------
+# Prediction gate-out (empty cohort)
+# ---------------------------------------------------------------------------
+
+
+def test_empty_cohort_gates_property_out_without_saving() -> None:
+    """When candidates_for returns an empty list the property cannot be predicted;
+    the failure is recorded in the child SubTask and the handler returns without
+    raising — no plan is saved."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+
+    empty_comparables = MagicMock()
+    empty_comparables.members = []  # empty cohort → gate-out
+
+    with ExitStack() as stack:
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.os.environ", _ENV)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._get_engine",
+                return_value=mock_engine,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = None
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GeospatialS3Repository")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GoogleSolarApiClient")
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._spatial_for", return_value=None
+            )
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.overlays_from", return_value=[]
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        from domain.epc_prediction.prediction_target import PredictionTargetAttributes
+
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.OverrideBackedPredictionAttributesReader"
+            )
+        ).return_value.attributes_for.return_value = PredictionTargetAttributes(
+            property_type="2"
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.select_comparables")
+        ).return_value = empty_comparables
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPrediction")
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.EpcComparablePropertiesRepository"
+            )
+        ).return_value.candidates_for.return_value = []
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+
+        # Act — no raise; child SubTask is failed, handler continues
+        _call_handler(_BODY)
+
+    # UoW never entered — the property errored before the write block
+    MockUoW.return_value.__enter__.assert_not_called()
+
+
+# ---------------------------------------------------------------------------
+# Broadened cohort — sparse own postcode falls back to nearby postcodes
+# ---------------------------------------------------------------------------
+
+
+def test_empty_own_postcode_broadens_to_nearby_and_predicts() -> None:
+    """When the property's own postcode holds no same-type comparables, the
+    handler broadens to the nearby-postcode cohort (candidates_near) and, finding
+    comparables there, synthesises the EPC and saves the plan."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    mock_predicted_epc = MagicMock()
+    from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
+
+    mock_part = MagicMock()
+    mock_part.identifier = BuildingPartIdentifier.MAIN
+    mock_predicted_epc.sap_building_parts = [mock_part]
+
+    # First select_comparables (own postcode) is empty → broaden; the second
+    # (nearby cohort) finds comparables.
+    empty_comparables = MagicMock()
+    empty_comparables.members = []
+    found_comparables = MagicMock()
+    found_comparables.members = [MagicMock()]
+
+    with ExitStack() as stack:
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.os.environ", _ENV)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._get_engine",
+                return_value=mock_engine,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = None  # no lodged EPC
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GeospatialS3Repository")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GoogleSolarApiClient")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._solar_insights_for",
+                return_value=None,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        from domain.epc_prediction.prediction_target import PredictionTargetAttributes
+
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.OverrideBackedPredictionAttributesReader"
+            )
+        ).return_value.attributes_for.return_value = PredictionTargetAttributes(
+            property_type="2"
+        )
+        MockRepo = stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.EpcComparablePropertiesRepository"
+            )
+        )
+        MockRepo.return_value.candidates_for.return_value = []
+        MockRepo.return_value.candidates_near.return_value = [MagicMock()]
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.select_comparables",
+                side_effect=[empty_comparables, found_comparables],
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPrediction")
+        ).return_value.predict.return_value = mock_predicted_epc
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides"
+            )
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.run_modelling",
+                return_value=mock_plan,
+            )
+        )
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler(_BODY)
+
+    # Assert — broadening fired, and the broadened cohort produced a saved plan
+    # with its predicted EPC persisted in the predicted slot.
+    MockRepo.return_value.candidates_near.assert_called_once()
+    mock_uow.epc.save_batch.assert_called_once_with(
+        [EpcSaveRequest(mock_predicted_epc, property_id=PROPERTY_ID, portfolio_id=PORTFOLIO_ID, source="predicted")]
+    )
+    mock_uow.plan.save_batch.assert_called_once()
+    mock_uow.commit.assert_called_once()
+
+
+# ---------------------------------------------------------------------------
+# Partial batch failure — per-property isolation
+# ---------------------------------------------------------------------------
+
+
+def test_per_property_failure_fails_child_subtask_and_siblings_continue() -> None:
+    """Two properties: property 1 succeeds, property 2 fails during modelling.
+    The handler does not raise; both properties are run in the one batched
+    run_subtasks pass, and property 1's write is still committed."""
+    # Arrange
+    pid1, pid2 = 111, 222
+    mock_engine = _engine_mock([pid1, pid2], [1001, 1002], [POSTCODE, POSTCODE])
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+    call_count = {"n": 0}
+
+    def _run_modelling_side_effect(*args: Any, **kwargs: Any) -> Any:
+        call_count["n"] += 1
+        if call_count["n"] == 2:
+            raise ValueError("modelling exploded")
+        return mock_plan
+
+    mock_orch = _mock_orchestrator()
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = MagicMock()
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.run_modelling",
+                side_effect=_run_modelling_side_effect,
+            )
+        )
+        MockUoW = stack.enter_context(patch("applications.modelling_e2e.handler.PostgresUnitOfWork"))
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act — must not raise even though pid2 fails
+        _call_handler(
+            {"property_ids": [pid1, pid2], "portfolio_id": PORTFOLIO_ID,
+             "scenario_id": SCENARIO_ID, "refetch_solar": False, "dry_run": False},
+            orchestrator=mock_orch,
+        )
+
+    # Both properties run in one batched run_subtasks pass; pid1 still committed
+    # (the failed pid2 is isolated and simply never queued for write).
+    mock_orch.run_subtasks.assert_called_once()
+    assert len(mock_orch.run_subtasks.call_args.args[1]) == 2
+    mock_uow.commit.assert_called_once()
+
+
+# ---------------------------------------------------------------------------
+# End-of-batch write — one transaction for the whole batch
+# ---------------------------------------------------------------------------
+
+
+def test_batch_persists_in_one_transaction_and_one_baseline_run(
+    _baseline_orchestrator: MagicMock,
+) -> None:
+    """Three properties model independently but persist together: every Plan is
+    saved, yet the write Unit of Work commits exactly once and the Baseline
+    orchestrator runs once for the whole batch (the RDS-CPU win)."""
+    # Arrange
+    pid1, pid2, pid3 = 111, 222, 333
+    mock_engine = _engine_mock(
+        [pid1, pid2, pid3], [1001, 1002, 1003], [POSTCODE, POSTCODE, POSTCODE]
+    )
+    mock_uow = MagicMock()
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = MagicMock()
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.run_modelling", return_value=_plan_mock())
+        )
+        MockUoW = stack.enter_context(patch("applications.modelling_e2e.handler.PostgresUnitOfWork"))
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler(
+            {"property_ids": [pid1, pid2, pid3], "portfolio_id": PORTFOLIO_ID,
+             "scenario_id": SCENARIO_ID, "refetch_solar": False, "dry_run": False}
+        )
+
+    # Assert — all three Plans saved in one batch call, but a single shared transaction:
+    mock_uow.plan.save_batch.assert_called_once()
+    assert len(mock_uow.plan.save_batch.call_args[0][0]) == 3
+    assert mock_uow.property.mark_modelled.call_count == 3
+    mock_uow.commit.assert_called_once()
+    # One write Unit of Work opened for the whole batch, not one per property.
+    MockUoW.return_value.__enter__.assert_called_once()
+    # Baseline re-established once, for every written property together.
+    _baseline_orchestrator.return_value.run.assert_called_once_with([pid1, pid2, pid3])
+
+
+# ---------------------------------------------------------------------------
+# Cohort cache hit
+# ---------------------------------------------------------------------------
+
+
+def test_cohort_cache_prevents_duplicate_candidates_for_calls() -> None:
+    """Two properties sharing a postcode: candidates_for is fetched once and
+    cached — EpcComparablePropertiesRepository.candidates_for called once."""
+    # Arrange
+    pid1, pid2 = 301, 302
+    mock_engine = _engine_mock(
+        [pid1, pid2], [3001, 3002], [POSTCODE, POSTCODE]
+    )
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    mock_predicted_epc = MagicMock()
+    from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
+
+    mock_part = MagicMock()
+    mock_part.identifier = BuildingPartIdentifier.MAIN
+    mock_predicted_epc.sap_building_parts = [mock_part]
+
+    mock_comparables = MagicMock()
+    mock_comparables.members = [MagicMock()]
+
+    with ExitStack() as stack:
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.os.environ", _ENV)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._get_engine",
+                return_value=mock_engine,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = None  # force prediction path
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GeospatialS3Repository")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GoogleSolarApiClient")
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._spatial_for", return_value=None
+            )
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.overlays_from", return_value=[]
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        from domain.epc_prediction.prediction_target import PredictionTargetAttributes
+
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.OverrideBackedPredictionAttributesReader"
+            )
+        ).return_value.attributes_for.return_value = PredictionTargetAttributes(
+            property_type="2"
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.select_comparables")
+        ).return_value = mock_comparables
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPrediction")
+        ).return_value.predict.return_value = mock_predicted_epc
+        MockCandidates = stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.EpcComparablePropertiesRepository"
+            )
+        )
+        MockCandidates.return_value.candidates_for.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.run_modelling",
+                return_value=mock_plan,
+            )
+        )
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler(
+            {
+                "property_ids": [pid1, pid2],
+                "portfolio_id": PORTFOLIO_ID,
+                "scenario_id": SCENARIO_ID,
+                "refetch_solar": False,
+                "dry_run": False,
+            }
+        )
+
+    # Assert — cohort fetched exactly once despite two properties
+    MockCandidates.return_value.candidates_for.assert_called_once_with(POSTCODE)
+
+
+# ---------------------------------------------------------------------------
+# refetch_epc flag
+# ---------------------------------------------------------------------------
+
+
+def test_refetch_epc_false_with_stored_epc_skips_api_call() -> None:
+    """refetch_epc=False + stored lodged EPC present: EpcClientService.get_by_uprn
+    is never called; the stored EPC is used and reaches run_modelling."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    stored_epc = MagicMock()
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        mock_epc_client = stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value
+        mock_epc_client.get_by_uprn.return_value = MagicMock()  # would be called if flag ignored
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        mock_run_modelling = stack.enter_context(
+            patch("applications.modelling_e2e.handler.run_modelling", return_value=mock_plan)
+        )
+        # Bulk-read of stored lodged EPCs returns the stored EPC for this property
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPostgresRepository")
+        ).return_value.get_for_properties.return_value = {PROPERTY_ID: stored_epc}
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler({**_BODY, "refetch_epc": False})
+
+    # Assert — API not called; stored EPC flows into run_modelling
+    mock_epc_client.get_by_uprn.assert_not_called()
+    mock_run_modelling.assert_called_once()
+    # Stored EPC is NOT re-saved — it was read from DB unchanged (PR #1353)
+    mock_uow.epc.save_batch.assert_not_called()
+
+
+def test_refetch_epc_false_without_stored_epc_skips_api_and_goes_to_prediction() -> None:
+    """refetch_epc=False + no stored lodged EPC: the EPC API is not called;
+    the property is treated as EPC-less and prediction runs instead."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    mock_predicted_epc = MagicMock()
+    from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
+
+    mock_part = MagicMock()
+    mock_part.identifier = BuildingPartIdentifier.MAIN
+    mock_predicted_epc.sap_building_parts = [mock_part]
+
+    mock_comparables = MagicMock()
+    mock_comparables.members = [MagicMock()]
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        mock_epc_client = stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value
+        mock_epc_client.get_by_uprn.return_value = MagicMock()  # would be called if flag ignored
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        from domain.epc_prediction.prediction_target import PredictionTargetAttributes
+
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.OverrideBackedPredictionAttributesReader")
+        ).return_value.attributes_for.return_value = PredictionTargetAttributes(
+            property_type="2"
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.select_comparables")
+        ).return_value = mock_comparables
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPrediction")
+        ).return_value.predict.return_value = mock_predicted_epc
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcComparablePropertiesRepository")
+        ).return_value.candidates_for.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.run_modelling", return_value=mock_plan)
+        )
+        # No stored lodged EPC
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPostgresRepository")
+        ).return_value.get_for_properties.return_value = {}
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler({**_BODY, "refetch_epc": False})
+
+    # Assert — API was NOT called; prediction ran and its output was persisted
+    mock_epc_client.get_by_uprn.assert_not_called()
+    mock_uow.epc.save_batch.assert_called_once_with(
+        [EpcSaveRequest(mock_predicted_epc, property_id=PROPERTY_ID, portfolio_id=PORTFOLIO_ID, source="predicted")]
+    )
+
+
+def test_refetch_epc_true_always_calls_api_even_if_stored_epc_exists() -> None:
+    """refetch_epc=True (default): EpcClientService.get_by_uprn is called even
+    when a stored lodged EPC exists — existing behaviour is preserved."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    live_epc = MagicMock()
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        mock_epc_client = stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value
+        mock_epc_client.get_by_uprn.return_value = live_epc
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.run_modelling", return_value=mock_plan)
+        )
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act — default refetch_epc=True (not setting the flag at all)
+        _call_handler(_BODY)
+
+    # Assert — API was called regardless
+    mock_epc_client.get_by_uprn.assert_called_once_with(UPRN)
+
+
+# ---------------------------------------------------------------------------
+# Dry-run
+# ---------------------------------------------------------------------------
+
+
+# ---------------------------------------------------------------------------
+# repredict_epc flag
+# ---------------------------------------------------------------------------
+
+
+def test_repredict_epc_false_with_stored_predicted_epc_skips_prediction() -> None:
+    """repredict_epc=False + stored predicted EPC present: EpcPrediction.predict
+    is not called; the stored predicted EPC reaches run_modelling."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    stored_predicted = MagicMock()
+    from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
+
+    mock_part = MagicMock()
+    mock_part.identifier = BuildingPartIdentifier.MAIN
+    stored_predicted.sap_building_parts = [mock_part]
+
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = None  # no lodged EPC → prediction path
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.run_modelling", return_value=mock_plan)
+        )
+        mock_predictor = stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPrediction")
+        ).return_value
+        # Stored predicted EPC is present
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPostgresRepository")
+        ).return_value.get_predicted_for_properties.return_value = {
+            PROPERTY_ID: stored_predicted
+        }
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler({**_BODY, "repredict_epc": False})
+
+    # Assert — EpcPrediction.predict never called; stored predicted EPC NOT re-saved (PR #1353)
+    mock_predictor.predict.assert_not_called()
+    mock_uow.epc.save_batch.assert_not_called()
+
+
+def test_repredict_epc_false_without_stored_predicted_epc_falls_back_to_live_prediction() -> None:
+    """repredict_epc=False + no stored predicted EPC: handler falls back to live
+    prediction so the property is not silently skipped."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+    mock_plan = _plan_mock()
+    mock_uow = MagicMock()
+
+    mock_predicted_epc = MagicMock()
+    from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
+
+    mock_part = MagicMock()
+    mock_part.identifier = BuildingPartIdentifier.MAIN
+    mock_predicted_epc.sap_building_parts = [mock_part]
+
+    mock_comparables = MagicMock()
+    mock_comparables.members = [MagicMock()]
+
+    with ExitStack() as stack:
+        stack.enter_context(patch("applications.modelling_e2e.handler.os.environ", _ENV))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._get_engine", return_value=mock_engine)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = None  # no lodged EPC
+        stack.enter_context(patch("applications.modelling_e2e.handler.GeospatialS3Repository"))
+        stack.enter_context(patch("applications.modelling_e2e.handler.GoogleSolarApiClient"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._spatial_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler._solar_insights_for", return_value=None)
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.overlays_from", return_value=[])
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        from domain.epc_prediction.prediction_target import PredictionTargetAttributes
+
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.OverrideBackedPredictionAttributesReader")
+        ).return_value.attributes_for.return_value = PredictionTargetAttributes(
+            property_type="2"
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.select_comparables")
+        ).return_value = mock_comparables
+        mock_predictor = stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPrediction")
+        ).return_value
+        mock_predictor.predict.return_value = mock_predicted_epc
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcComparablePropertiesRepository")
+        ).return_value.candidates_for.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.run_modelling", return_value=mock_plan)
+        )
+        # No stored predicted EPC
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcPostgresRepository")
+        ).return_value.get_predicted_for_properties.return_value = {}
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+        MockUoW.return_value.__enter__.return_value = mock_uow
+        MockUoW.return_value.__exit__.return_value = False
+
+        # Act
+        _call_handler({**_BODY, "repredict_epc": False})
+
+    # Assert — live prediction was used as fallback
+    mock_predictor.predict.assert_called_once()
+    mock_uow.epc.save_batch.assert_called_once_with(
+        [EpcSaveRequest(mock_predicted_epc, property_id=PROPERTY_ID, portfolio_id=PORTFOLIO_ID, source="predicted")]
+    )
+
+
+# ---------------------------------------------------------------------------
+# Dry-run
+# ---------------------------------------------------------------------------
+
+
+def test_dry_run_skips_all_db_writes() -> None:
+    """dry_run=True: run_modelling executes but PostgresUnitOfWork is never
+    entered — no DB writes occur for any property in the batch."""
+    # Arrange
+    mock_engine = _engine_mock([PROPERTY_ID], [UPRN], [POSTCODE])
+
+    with ExitStack() as stack:
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.os.environ", _ENV)
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._get_engine",
+                return_value=mock_engine,
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.EpcClientService")
+        ).return_value.get_by_uprn.return_value = MagicMock()
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GeospatialS3Repository")
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.GoogleSolarApiClient")
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._spatial_for", return_value=None
+            )
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler._solar_insights_for",
+                return_value=None,
+            )
+        )
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.overlays_from", return_value=[]
+            )
+        )
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.PropertyOverridesPostgresReader")
+        ).return_value.overrides_for_many.return_value = {}
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.ScenarioPostgresRepository")
+        ).return_value.get_many.return_value = [MagicMock()]
+        stack.enter_context(
+            patch("applications.modelling_e2e.handler.catalogue_snapshot_with_off_catalogue_overrides")
+        )
+        stack.enter_context(patch("applications.modelling_e2e.handler.Session"))
+        stack.enter_context(
+            patch(
+                "applications.modelling_e2e.handler.run_modelling",
+                return_value=_plan_mock(),
+            )
+        )
+        MockUoW = stack.enter_context(
+            patch("applications.modelling_e2e.handler.PostgresUnitOfWork")
+        )
+
+        # Act
+        _call_handler({**_BODY, "dry_run": True})
+
+    # Assert — UoW never entered
+    MockUoW.return_value.__enter__.assert_not_called()
diff --git a/tests/applications/modelling_e2e/test_predict_epc_errors.py b/tests/applications/modelling_e2e/test_predict_epc_errors.py
new file mode 100644
index 000000000..715da6212
--- /dev/null
+++ b/tests/applications/modelling_e2e/test_predict_epc_errors.py
@@ -0,0 +1,147 @@
+"""Behaviour of ``_predict_epc``'s failure modes: an EPC-less Property that
+cannot be predicted must fail loudly with a *specific*, debuggable exception
+(carrying the Property's identity + the cause), not a single generic
+"not predictable" string. The per-property handler records ``str(exc)`` in the
+SubTask output, so these messages are the operator's only debugging signal.
+"""
+
+from typing import Callable, Optional, cast
+from unittest.mock import MagicMock
+
+import pytest
+
+from applications.modelling_e2e.errors import (
+    DegeneratePredictionError,
+    NoSameTypeComparablesError,
+    UnresolvedPropertyTypeError,
+)
+from applications.modelling_e2e.handler import (
+    _predict_epc,  # pyright: ignore[reportPrivateUsage]
+)
+from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
+    EpcPropertyData,
+    SapBuildingPart,
+)
+from domain.epc_prediction.comparable_properties import ComparableProperty
+from domain.epc_prediction.epc_prediction import EpcPrediction
+from domain.epc_prediction.prediction_target import (
+    PredictionTarget,
+    PredictionTargetAttributes,
+)
+from repositories.property.override_backed_prediction_attributes_reader import (
+    OverrideBackedPredictionAttributesReader,
+)
+
+
+class _FixedAttributesReader:
+    """An attributes reader that returns one fixed PredictionTargetAttributes."""
+
+    def __init__(self, attributes: PredictionTargetAttributes) -> None:
+        self._attributes = attributes
+
+    def attributes_for(self, property_id: int) -> PredictionTargetAttributes:
+        return self._attributes
+
+
+def _reader(
+    attributes: PredictionTargetAttributes,
+) -> OverrideBackedPredictionAttributesReader:
+    return cast(
+        OverrideBackedPredictionAttributesReader, _FixedAttributesReader(attributes)
+    )
+
+
+def _no_cohort() -> Callable[[str], list[ComparableProperty]]:
+    return lambda _postcode: []
+
+
+def _no_broaden() -> Callable[[PredictionTarget], list[ComparableProperty]]:
+    return lambda _target: []
+
+
+def _epc(property_type: Optional[str]) -> EpcPropertyData:
+    epc: EpcPropertyData = object.__new__(EpcPropertyData)
+    epc.property_type = property_type
+    return epc
+
+
+def test_unresolved_property_type_raises_with_property_identity() -> None:
+    # Arrange — no resolvable property_type (the contradictory/missing-override
+    # case): build_prediction_target gates the Property out before any cohort.
+    reader = _reader(PredictionTargetAttributes(property_type=None))
+
+    # Act / Assert
+    with pytest.raises(UnresolvedPropertyTypeError) as excinfo:
+        _predict_epc(
+            property_id=733290,
+            uprn=100021987320,
+            postcode="SE4 1DX",
+            portfolio_id=796,
+            attributes_reader=reader,
+            coordinates=None,
+            cohort_for=_no_cohort(),
+            broaden=_no_broaden(),
+            predictor=EpcPrediction(),
+        )
+
+    message = str(excinfo.value)
+    assert "733290" in message
+    assert "100021987320" in message
+    assert "SE4 1DX" in message
+    assert "796" in message
+
+
+def test_resolved_type_but_empty_cohort_raises_no_same_type_comparables() -> None:
+    # Arrange — property_type resolves, but neither the own postcode nor the
+    # broadened cohort yields a same-type comparable.
+    reader = _reader(PredictionTargetAttributes(property_type="2"))
+
+    # Act / Assert
+    with pytest.raises(NoSameTypeComparablesError) as excinfo:
+        _predict_epc(
+            property_id=723681,
+            uprn=100021935228,
+            postcode="SE13 5RT",
+            portfolio_id=796,
+            attributes_reader=reader,
+            coordinates=None,
+            cohort_for=_no_cohort(),
+            broaden=_no_broaden(),
+            predictor=EpcPrediction(),
+        )
+
+    assert excinfo.value.property_type == "2"
+    assert excinfo.value.broadened is True
+    assert "SE13 5RT" in str(excinfo.value)
+
+
+def test_cohort_found_but_prediction_has_no_main_part_raises_degenerate() -> None:
+    # Arrange — a same-type cohort exists, but the synthesised EPC carries no
+    # MAIN building part (the template was lodged with a null part identifier).
+    reader = _reader(PredictionTargetAttributes(property_type="2"))
+    cohort = [ComparableProperty(epc=_epc("2"), certificate_number="c1")]
+
+    no_main: EpcPropertyData = object.__new__(EpcPropertyData)
+    part: SapBuildingPart = object.__new__(SapBuildingPart)
+    part.identifier = BuildingPartIdentifier.OTHER
+    no_main.sap_building_parts = [part]
+    predictor = MagicMock()
+    predictor.predict.return_value = no_main
+
+    # Act / Assert
+    with pytest.raises(DegeneratePredictionError) as excinfo:
+        _predict_epc(
+            property_id=712977,
+            uprn=100061743824,
+            postcode="LS6 1AA",
+            portfolio_id=796,
+            attributes_reader=reader,
+            coordinates=None,
+            cohort_for=lambda _postcode: cohort,
+            broaden=_no_broaden(),
+            predictor=cast(EpcPrediction, predictor),
+        )
+
+    assert excinfo.value.cohort_size == 1
+    assert "100061743824" in str(excinfo.value)
diff --git a/tests/datatypes/epc/domain/test_building_part_identifier.py b/tests/datatypes/epc/domain/test_building_part_identifier.py
new file mode 100644
index 000000000..d792f45a0
--- /dev/null
+++ b/tests/datatypes/epc/domain/test_building_part_identifier.py
@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier
+
+
+def test_main_dwelling_maps_to_main() -> None:
+    assert BuildingPartIdentifier.from_api_string("Main Dwelling") == (
+        BuildingPartIdentifier.MAIN
+    )
+
+
+def test_extension_string_maps_to_numbered_extension() -> None:
+    assert BuildingPartIdentifier.from_api_string("Extension 2") == (
+        BuildingPartIdentifier.EXTENSION_2
+    )
+
+
+def test_none_falls_to_other() -> None:
+    assert BuildingPartIdentifier.from_api_string(None) == BuildingPartIdentifier.OTHER
+
+
+def test_non_string_identifier_falls_to_other_not_crash() -> None:
+    # Some SAP-16.x certs lodge a bare int building-part identifier (e.g. the
+    # second part as `1` after "Main Dwelling"). This previously raised
+    # `TypeError: expected string or bytes-like object, got 'int'` and failed
+    # the whole property — now it falls to OTHER like any unrecognised value.
+    assert BuildingPartIdentifier.from_api_string(1) == BuildingPartIdentifier.OTHER
diff --git a/tests/datatypes/epc/domain/test_mapper_glazing_label.py b/tests/datatypes/epc/domain/test_mapper_glazing_label.py
new file mode 100644
index 000000000..8430d76eb
--- /dev/null
+++ b/tests/datatypes/epc/domain/test_mapper_glazing_label.py
@@ -0,0 +1,26 @@
+"""Mapper boundary: the Elmhurst §11 "Double between 2002" glazing label.
+
+The full RdSAP-Schema-21 label is "Double between 2002 and 2021" (SAP 10.2
+Table 24 code 3 — double glazing installed 2002-2021). When the Elmhurst
+Summary PDF wraps the trailing "and 2021" into an adjacent table cell the
+extractor joins away, the surfaced label truncates to "Double between 2002"
+(the same artifact already handled for "Triple post or during"). Before this
+was mapped the truncated form raised `UnmappedElmhurstLabel`, blocking the
+whole Summary (surfaced on the simulated-case-46 multi-attribute worksheet).
+"""
+
+from datatypes.epc.domain.mapper import (
+    _elmhurst_glazing_type_code,  # pyright: ignore[reportPrivateUsage]
+)
+
+
+def test_truncated_double_between_2002_maps_to_code_3() -> None:
+    # Arrange — the year-truncated form of "Double between 2002 and 2021".
+
+    # Act
+    code = _elmhurst_glazing_type_code("Double between 2002")
+    full = _elmhurst_glazing_type_code("Double between 2002 and 2021")
+
+    # Assert — both resolve to SAP 10.2 Table 24 code 3 (DG 2002-2021).
+    assert code == 3
+    assert full == 3
diff --git a/tests/datatypes/epc/domain/test_mapper_roof_window_classification.py b/tests/datatypes/epc/domain/test_mapper_roof_window_classification.py
new file mode 100644
index 000000000..fc0c8a856
--- /dev/null
+++ b/tests/datatypes/epc/domain/test_mapper_roof_window_classification.py
@@ -0,0 +1,89 @@
+"""Mapper boundary: Elmhurst §11 window vs roof window classification.
+
+`_is_elmhurst_roof_window` must NOT route a vertical window (lodged Location
+"External wall") to `sap_roof_windows` when the building part's roof is a
+PARTY ceiling — "A Another dwelling above" / "NR Non-residential space above"
+/ "S Same dwelling above". A party ceiling has no external roof structure, so
+it cannot host a rooflight (RdSAP 10 §3.7.1: a rooflight is glazing in a roof;
+party codes carry no heat-loss roof per `_ELMHURST_PARTY_ROOF_CODES`).
+
+Surfaced by "simulated case 53" (cert 000565 re-keyed as a mid-floor electric-
+storage flat, roof "A Another dwelling above"): its one External-wall window
+(U 2.00) was mis-routed to `sap_roof_windows`, so the window area was never
+deducted from the wall (wall over-counted ~7 W/K) and it was priced as a roof
+window — our SAP 74.0 vs Elmhurst worksheet 75. Elmhurst's own entry lodges it
+Type "Window", Location "External wall".
+"""
+
+from datatypes.epc.surveys.elmhurst_site_notes import (
+    RoofDetails,
+    Window as ElmhurstWindow,
+)
+from datatypes.epc.surveys.elmhurst_site_notes import ElmhurstSiteNotes
+from datatypes.epc.domain.mapper import (
+    _is_elmhurst_roof_window,  # pyright: ignore[reportPrivateUsage]
+)
+
+
+def _external_wall_window(*, glazing: str, u_value: float) -> ElmhurstWindow:
+    return ElmhurstWindow(
+        width_m=15.14,
+        height_m=1.0,
+        area_m2=15.14,
+        glazing_type=glazing,
+        frame_factor=0.7,
+        building_part="Main",
+        location="External wall",
+        orientation="North",
+        data_source="Manufacturer",
+        u_value=u_value,
+        g_value=0.72,
+        draught_proofed=True,
+        permanent_shutters="None",
+        frame_type="PVC",
+    )
+
+
+def _survey_with_main_roof(roof_type: str) -> ElmhurstSiteNotes:
+    """Partial `ElmhurstSiteNotes` carrying only what the roof-window
+    classifier reads: `roof`, `room_in_roof`, `extensions`."""
+    survey = object.__new__(ElmhurstSiteNotes)
+    survey.roof = RoofDetails(
+        roof_type=roof_type, insulation="", u_value_known=False
+    )
+    survey.room_in_roof = None
+    survey.extensions = []
+    return survey
+
+
+def test_external_wall_window_on_party_ceiling_is_vertical() -> None:
+    # Arrange — mid-floor flat: Main BP roof is "Another dwelling above"
+    # (party ceiling, no external roof). Window lodged on External wall.
+    window = _external_wall_window(
+        glazing="Double between 2002 and 2021", u_value=2.0
+    )
+    survey = _survey_with_main_roof("A Another dwelling above")
+
+    # Act / Assert — vertical, not a rooflight.
+    assert _is_elmhurst_roof_window(window, survey) is False
+
+
+def test_external_wall_window_under_non_residential_space_is_vertical() -> None:
+    window = _external_wall_window(
+        glazing="Double between 2002 and 2021", u_value=2.0
+    )
+    survey = _survey_with_main_roof("NR Non-residential space above")
+
+    assert _is_elmhurst_roof_window(window, survey) is False
+
+
+def test_roof_of_room_location_still_classified_as_rooflight() -> None:
+    # Guard: an explicit "Roof of Room" location stays a rooflight
+    # (unaffected by the party-ceiling fix).
+    window = _external_wall_window(
+        glazing="Double between 2002 and 2021", u_value=2.0
+    )
+    window.location = "Roof of Room"
+    survey = _survey_with_main_roof("A Another dwelling above")
+
+    assert _is_elmhurst_roof_window(window, survey) is True
diff --git a/tests/domain/billing/test_bill_derivation.py b/tests/domain/billing/test_bill_derivation.py
index cce045eec..14efea711 100644
--- a/tests/domain/billing/test_bill_derivation.py
+++ b/tests/domain/billing/test_bill_derivation.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import pytest
 
 from domain.fuel_rates.fuel import Fuel, UnpricedFuel
-from domain.fuel_rates.fuel_rates import FuelRate, FuelRates
+from domain.fuel_rates.fuel_rates import FuelRate, FuelRates, OffPeakRate
 from domain.billing.bill import BillSection, EnergyBreakdown, EnergyLine
 from domain.billing.bill_derivation import BillDerivation
 
@@ -17,9 +17,33 @@ def _rates() -> FuelRates:
             Fuel.ELECTRICITY: FuelRate(unit_rate_p_per_kwh=24.67, standing_charge_p_per_day=57.21),
             Fuel.OIL: FuelRate(unit_rate_p_per_kwh=9.16, standing_charge_p_per_day=0.0),
         },
+        off_peak=OffPeakRate(
+            day_p_per_kwh=29.73, night_p_per_kwh=13.89, standing_charge_p_per_day=56.99
+        ),
     )
 
 
+def test_an_all_night_off_peak_heating_line_bills_at_the_night_rate() -> None:
+    # Arrange — 10,000 kWh of electric storage heating on an Off-Peak Meter,
+    # charged wholly overnight (high-rate fraction 0.0).
+    breakdown = EnergyBreakdown(
+        lines=[
+            EnergyLine(
+                section=BillSection.HEATING,
+                fuel=Fuel.ELECTRICITY_OFF_PEAK,
+                kwh=10000.0,
+                high_rate_fraction=0.0,
+            )
+        ]
+    )
+
+    # Act
+    bill = BillDerivation(_rates()).derive(breakdown)
+
+    # Assert — every kWh at the night rate: 10000 × 13.89p = £1389.
+    assert bill.sections[BillSection.HEATING].cost_gbp == pytest.approx(1389.0)
+
+
 def test_derive_prices_a_single_gas_heating_line_with_its_standing_charge() -> None:
     # Arrange — 10,000 kWh of mains-gas heating.
     breakdown = EnergyBreakdown(
diff --git a/tests/domain/billing/test_energy_breakdown.py b/tests/domain/billing/test_energy_breakdown.py
index 4c64da29d..f754bc662 100644
--- a/tests/domain/billing/test_energy_breakdown.py
+++ b/tests/domain/billing/test_energy_breakdown.py
@@ -23,6 +23,13 @@ def _sap_result(
     appliances_kwh_per_yr: float = 0.0,
     cooking_kwh_per_yr: float = 0.0,
     pv_exported_kwh_per_yr: float = 0.0,
+    is_off_peak_meter: bool = False,
+    main_heating_high_rate_fraction: float = 1.0,
+    main_2_heating_high_rate_fraction: float = 1.0,
+    secondary_heating_high_rate_fraction: float = 1.0,
+    hot_water_high_rate_fraction: float = 1.0,
+    pumps_fans_high_rate_fraction: float = 1.0,
+    other_electricity_high_rate_fraction: float = 1.0,
 ) -> SapResult:
     return SapResult(
         sap_score=72,
@@ -51,6 +58,13 @@ def _sap_result(
         primary_energy_kwh_per_m2=0.0,
         monthly=(),
         intermediate={},
+        is_off_peak_meter=is_off_peak_meter,
+        main_heating_high_rate_fraction=main_heating_high_rate_fraction,
+        main_2_heating_high_rate_fraction=main_2_heating_high_rate_fraction,
+        secondary_heating_high_rate_fraction=secondary_heating_high_rate_fraction,
+        hot_water_high_rate_fraction=hot_water_high_rate_fraction,
+        pumps_fans_high_rate_fraction=pumps_fans_high_rate_fraction,
+        other_electricity_high_rate_fraction=other_electricity_high_rate_fraction,
     )
 
 
@@ -146,3 +160,74 @@ def test_positive_heating_kwh_with_no_fuel_code_raises() -> None:
     # Act / Assert
     with pytest.raises(ValueError, match="no fuel code"):
         EnergyBreakdown.from_sap_result(result)
+
+
+def test_off_peak_heating_line_carries_its_carrier_and_high_rate_fraction() -> None:
+    # Arrange — electric storage heating on an Off-Peak Meter (7-hour low-rate
+    # code 31), charged wholly overnight (main heating high-rate fraction 0.0).
+    result = _sap_result(
+        main_heating_fuel_kwh_per_yr=9000.0,
+        main_heating_fuel_code=31,
+        is_off_peak_meter=True,
+        main_heating_high_rate_fraction=0.0,
+    )
+
+    # Act
+    breakdown = EnergyBreakdown.from_sap_result(result)
+
+    # Assert — the heating line bills on the off-peak carrier with the
+    # calculator's high-rate fraction attached for the day/night split.
+    line = breakdown.lines[0]
+    assert (line.section, line.fuel, line.kwh, line.high_rate_fraction) == (
+        BillSection.HEATING,
+        Fuel.ELECTRICITY_OFF_PEAK,
+        9000.0,
+        0.0,
+    )
+
+
+def test_off_peak_meter_routes_every_electric_use_to_the_off_peak_carrier() -> None:
+    # Arrange — a gas-heated dwelling that happens to be on an Off-Peak Meter:
+    # the gas heating stays gas, but ALL electric uses (lighting, appliances,
+    # pumps) bill on the off-peak carrier, the "other" uses sharing the
+    # ALL_OTHER_USES fraction and pumps/fans carrying their own.
+    result = _sap_result(
+        main_heating_fuel_kwh_per_yr=8000.0,
+        main_heating_fuel_code=1,  # mains gas — single-rate, unaffected
+        lighting_kwh_per_yr=400.0,
+        appliances_kwh_per_yr=1900.0,
+        pumps_fans_kwh_per_yr=200.0,
+        is_off_peak_meter=True,
+        other_electricity_high_rate_fraction=0.90,
+        pumps_fans_high_rate_fraction=0.71,
+    )
+
+    # Act
+    breakdown = EnergyBreakdown.from_sap_result(result)
+
+    # Assert
+    by_section = {line.section: line for line in breakdown.lines}
+    assert by_section[BillSection.HEATING].fuel is Fuel.MAINS_GAS
+    assert by_section[BillSection.HEATING].high_rate_fraction is None
+    assert by_section[BillSection.LIGHTING].fuel is Fuel.ELECTRICITY_OFF_PEAK
+    assert by_section[BillSection.LIGHTING].high_rate_fraction == 0.90
+    assert by_section[BillSection.APPLIANCES].fuel is Fuel.ELECTRICITY_OFF_PEAK
+    assert by_section[BillSection.APPLIANCES].high_rate_fraction == 0.90
+    assert by_section[BillSection.PUMPS_FANS].high_rate_fraction == 0.71
+
+
+def test_standard_meter_keeps_electric_uses_on_flat_rate_electricity() -> None:
+    # Arrange — electric heating on a standard meter: no day/night split anywhere.
+    result = _sap_result(
+        main_heating_fuel_kwh_per_yr=6000.0,
+        main_heating_fuel_code=30,  # standard-tariff electricity
+        lighting_kwh_per_yr=400.0,
+        is_off_peak_meter=False,
+    )
+
+    # Act
+    breakdown = EnergyBreakdown.from_sap_result(result)
+
+    # Assert — every line is flat-rate ELECTRICITY with no high-rate fraction.
+    assert all(line.fuel is Fuel.ELECTRICITY for line in breakdown.lines)
+    assert all(line.high_rate_fraction is None for line in breakdown.lines)
diff --git a/tests/domain/billing/test_off_peak_bill_integration.py b/tests/domain/billing/test_off_peak_bill_integration.py
new file mode 100644
index 000000000..69d061487
--- /dev/null
+++ b/tests/domain/billing/test_off_peak_bill_integration.py
@@ -0,0 +1,77 @@
+"""End-to-end regression for the Off-Peak Meter day/night bill split (ADR-0014
+2026-06-24 amendment).
+
+Drives a real off-peak (Economy-7) storage-heating cert through the whole chain
+— `cert_to_inputs` → `calculate_sap_from_inputs` → `EnergyBreakdown.from_sap_result`
+→ `BillDerivation.derive` against the committed Fuel Rates snapshot. Before the
+amendment this raised `UnpricedFuel` ("no rate for fuel ELECTRICITY_OFF_PEAK"),
+which aborted the `modelling_e2e` batch (e.g. property 717572). It must now price
+the dwelling day/night instead of crashing.
+"""
+
+from __future__ import annotations
+
+from dataclasses import replace
+
+from domain.sap10_ml.tests._fixtures import (
+    make_building_part,
+    make_minimal_sap10_epc,
+    make_sap_heating,
+)
+from datatypes.epc.domain.epc_property_data import EpcPropertyData, MainHeatingDetail
+from domain.sap10_calculator.calculator import calculate_sap_from_inputs
+from domain.sap10_calculator.rdsap.cert_to_inputs import cert_to_inputs
+from domain.fuel_rates.fuel import Fuel
+from domain.billing.bill import BillSection, EnergyBreakdown
+from domain.billing.bill_derivation import BillDerivation
+from repositories.fuel_rates.fuel_rates_static_file_repository import (
+    FuelRatesStaticFileRepository,
+)
+
+_TYPICAL_TFA_M2 = 60.0
+
+
+def _off_peak_storage_epc() -> EpcPropertyData:
+    # Integrated storage heaters (SAP code 408, Table 12a Grid 1 high-rate
+    # fraction 0.20) on a Dual / Economy-7 (7-hour) meter.
+    main = MainHeatingDetail(
+        has_fghrs=False,
+        main_fuel_type=29,  # electricity
+        heat_emitter_type=1,
+        emitter_temperature=1,
+        main_heating_control=2401,
+        main_heating_category=7,  # electric storage heaters
+        sap_main_heating_code=408,
+    )
+    base = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=4,
+        country_code="ENG",
+        sap_building_parts=[make_building_part(construction_age_band="E")],
+        sap_heating=make_sap_heating(main_heating_details=[main]),
+    )
+    return replace(
+        base,
+        sap_energy_source=replace(base.sap_energy_source, meter_type="1"),
+    )
+
+
+def test_off_peak_storage_dwelling_bills_heating_day_night_not_crashes() -> None:
+    # Arrange — score the off-peak cert and price it at the committed snapshot.
+    result = calculate_sap_from_inputs(cert_to_inputs(_off_peak_storage_epc()))
+    rates = FuelRatesStaticFileRepository().get_current()
+
+    # Act — the previously-crashing path: off-peak electricity reaches the bill.
+    breakdown = EnergyBreakdown.from_sap_result(result)
+    bill = BillDerivation(rates).derive(breakdown)
+
+    # Assert — heating bills on the off-peak carrier at the 0.20-day/0.80-night
+    # blend (0.20×29.73 + 0.80×13.89 = 17.058 p/kWh), not a crash and not the
+    # flat standard rate (24.67 p) or pure night rate (13.89 p).
+    heating = bill.sections[BillSection.HEATING]
+    assert heating.kwh > 0.0
+    implied_rate_p = heating.cost_gbp / heating.kwh * 100.0
+    assert abs(implied_rate_p - 17.058) <= 1e-6
+    # The off-peak meter contributes one standing charge (56.99 p/day).
+    assert any(line.fuel is Fuel.ELECTRICITY_OFF_PEAK for line in breakdown.lines)
+    assert bill.total_gbp > 0.0
diff --git a/tests/domain/billing/test_sap_fuel.py b/tests/domain/billing/test_sap_fuel.py
index ae9dd28fc..dda833a56 100644
--- a/tests/domain/billing/test_sap_fuel.py
+++ b/tests/domain/billing/test_sap_fuel.py
@@ -24,6 +24,7 @@ def test_mains_gas_code_maps_to_mains_gas() -> None:
         (12, Fuel.SMOKELESS),
         (20, Fuel.WOOD_LOGS),
         (23, Fuel.WOOD_PELLETS),
+        (10, Fuel.DUAL_FUEL_MINERAL_AND_WOOD),  # dual fuel (mineral + wood)
         (30, Fuel.ELECTRICITY),  # standard tariff
         (32, Fuel.ELECTRICITY_OFF_PEAK),  # 7-hour tariff
         (41, Fuel.HEAT_NETWORK),  # heat from electric heat pump (community)
@@ -42,6 +43,7 @@ def test_table_32_codes_map_to_their_billing_fuel(code: int, fuel: Fuel) -> None
         (0, Fuel.ELECTRICITY),  # API "electricity" -> Table 32 code 30
         (25, Fuel.HEAT_NETWORK),  # API community heat -> Table 32 code 41
         (14, Fuel.COAL),  # API house coal -> Table 32 code 11
+        (39, Fuel.ELECTRICITY),  # "electricity, any tariff" -> Table 32 code 30
     ],
 )
 def test_raw_api_fuel_codes_normalize_before_mapping(api_code: int, fuel: Fuel) -> None:
@@ -52,7 +54,8 @@ def test_raw_api_fuel_codes_normalize_before_mapping(api_code: int, fuel: Fuel)
 
 
 def test_an_unmapped_code_raises_rather_than_guessing() -> None:
-    # Arrange — code 10 (dual fuel) has no single billing fuel.
+    # Arrange — grid-export code 60 is not an end use's input fuel, so it has no
+    # billing carrier (code 10 dual fuel is now mapped — see the parametrized test).
     # Act / Assert
     with pytest.raises(UnmappedSapCode):
-        sap_code_to_fuel(10)
+        sap_code_to_fuel(60)
diff --git a/tests/domain/epc/test_construction_age_band_overlay.py b/tests/domain/epc/test_construction_age_band_overlay.py
new file mode 100644
index 000000000..5ae822e68
--- /dev/null
+++ b/tests/domain/epc/test_construction_age_band_overlay.py
@@ -0,0 +1,109 @@
+"""The Landlord-Override construction-age-band → fabric Simulation Overlay.
+
+An age-band value resolves to the RdSAP letter code the calculator's U-value
+cascades read from `SapBuildingPart.construction_age_band`; the overlay targets
+the override's building part.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
+    EpcPropertyData,
+    SapBuildingPart,
+)
+from domain.epc.property_overrides.construction_age_band import ConstructionAgeBand
+from domain.epc.property_overlays.construction_age_band_overlay import (
+    age_band_overlay_for,
+)
+from domain.modelling.scoring.overlay_applicator import apply_simulations
+from tests.domain.sap10_calculator.worksheet._elmhurst_worksheet_000490 import (
+    build_epc,
+)
+
+
+def _part(
+    epc: EpcPropertyData, identifier: BuildingPartIdentifier
+) -> SapBuildingPart:
+    return next(p for p in epc.sap_building_parts if p.identifier is identifier)
+
+
+def test_age_band_overlays_the_main_building_part() -> None:
+    # Act — band B (1900-1929) on the main building part.
+    simulation = age_band_overlay_for("B", 0)
+
+    # Assert
+    assert simulation is not None
+    overlay = simulation.building_parts[BuildingPartIdentifier.MAIN]
+    assert overlay.construction_age_band == "B"
+
+
+def test_age_band_overlay_targets_the_extension_building_part() -> None:
+    # Act — building_part 1 is the first extension.
+    simulation = age_band_overlay_for("L", 1)
+
+    # Assert
+    assert simulation is not None
+    assert BuildingPartIdentifier.EXTENSION_1 in simulation.building_parts
+    assert (
+        simulation.building_parts[BuildingPartIdentifier.EXTENSION_1]
+        .construction_age_band
+        == "L"
+    )
+
+
+def test_lowercase_age_band_is_normalised_to_its_letter_code() -> None:
+    # Act
+    simulation = age_band_overlay_for("d", 0)
+
+    # Assert — the calculator upper-cases the band; the overlay stores it upper.
+    assert simulation is not None
+    assert (
+        simulation.building_parts[BuildingPartIdentifier.MAIN].construction_age_band
+        == "D"
+    )
+
+
+@pytest.mark.parametrize("age_band_value", ["Z", "", "1900-1929", "Unknown"])
+def test_unrecognised_age_band_produces_no_overlay(age_band_value: str) -> None:
+    # Act
+    simulation = age_band_overlay_for(age_band_value, 0)
+
+    # Assert
+    assert simulation is None
+
+
+def test_age_band_override_re_dates_the_main_part_only() -> None:
+    # Arrange — baseline main + extension are both band B; the landlord corrects
+    # the main building's age band to F (1976-1982).
+    baseline = build_epc()
+    overlay = age_band_overlay_for("F", 0)
+    assert overlay is not None
+
+    # Act
+    result = apply_simulations(baseline, [overlay])
+
+    # Assert — the main part is re-dated (its U-value cascade now keys on F); the
+    # extension is left untouched.
+    assert _part(result, BuildingPartIdentifier.MAIN).construction_age_band == "F"
+    assert (
+        _part(result, BuildingPartIdentifier.EXTENSION_1).construction_age_band == "B"
+    )
+
+
+@pytest.mark.parametrize(
+    "member", [m for m in ConstructionAgeBand if m is not ConstructionAgeBand.UNKNOWN]
+)
+def test_every_resolvable_age_band_value_decodes_to_an_overlay(
+    member: ConstructionAgeBand,
+) -> None:
+    # A classifier emits a ConstructionAgeBand value; if the overlay can't decode
+    # it the override silently no-ops. Every non-UNKNOWN member must resolve.
+
+    # Act
+    simulation = age_band_overlay_for(member.value, 0)
+
+    # Assert
+    assert simulation is not None
diff --git a/tests/domain/epc/test_glazing_overlay.py b/tests/domain/epc/test_glazing_overlay.py
new file mode 100644
index 000000000..3182d79cf
--- /dev/null
+++ b/tests/domain/epc/test_glazing_overlay.py
@@ -0,0 +1,90 @@
+"""The Landlord-Override glazing → glazing Simulation Overlay mapping.
+
+A glazing value resolves to the SAP10 `glazing_type` code the calculator's
+Table-24 cascade reads; the overlay is whole-dwelling (expanded across every
+window by `_fold_glazing`).
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from domain.epc.property_overrides.glazing_type import GlazingType
+from domain.epc.property_overlays.glazing_overlay import glazing_overlay_for
+from domain.modelling.scoring.overlay_applicator import apply_simulations
+from tests.domain.sap10_calculator.worksheet._elmhurst_worksheet_000490 import (
+    build_epc,
+)
+
+
+def test_double_glazing_post_2002_overlays_its_glazing_code() -> None:
+    # Act
+    simulation = glazing_overlay_for("Double glazing, 2002 or later", 0)
+
+    # Assert — double glazing 2002-2021 is SAP10 glazing_type code 2.
+    assert simulation is not None
+    assert simulation.glazing is not None
+    assert simulation.glazing.glazing_type == 2
+
+
+@pytest.mark.parametrize(
+    ("glazing_value", "code"),
+    [
+        ("Single glazing", 1),
+        ("Double glazing, pre-2002", 3),
+        ("Triple glazing, 2002 or later", 9),
+        ("Triple glazing, pre-2002", 6),
+    ],
+)
+def test_glazing_types_decode_to_their_sap_codes(
+    glazing_value: str, code: int
+) -> None:
+    # Act
+    simulation = glazing_overlay_for(glazing_value, 0)
+
+    # Assert
+    assert simulation is not None
+    assert simulation.glazing is not None
+    assert simulation.glazing.glazing_type == code
+
+
+@pytest.mark.parametrize("glazing_value", ["Unknown", ""])
+def test_unresolvable_glazing_produces_no_overlay(glazing_value: str) -> None:
+    # Act
+    simulation = glazing_overlay_for(glazing_value, 0)
+
+    # Assert
+    assert simulation is None
+
+
+def test_glazing_override_remaps_every_window_and_clears_lodged_u() -> None:
+    # Arrange — baseline windows are double glazed (code 2, lodged U 2.8); the
+    # landlord corrects the whole dwelling to single glazing.
+    baseline = build_epc()
+    assert len(baseline.sap_windows) > 1
+    overlay = glazing_overlay_for("Single glazing", 0)
+    assert overlay is not None
+
+    # Act
+    result = apply_simulations(baseline, [overlay])
+
+    # Assert — every window flips to single (code 1) and its lodged transmission
+    # U is cleared so the Table-24 cascade re-derives U from the new type.
+    assert all(w.glazing_type == 1 for w in result.sap_windows)
+    assert all(w.window_transmission_details is None for w in result.sap_windows)
+
+
+@pytest.mark.parametrize(
+    "member", [m for m in GlazingType if m is not GlazingType.UNKNOWN]
+)
+def test_every_resolvable_glazing_value_decodes_to_a_code(
+    member: GlazingType,
+) -> None:
+    # A classifier emits a GlazingType value; if the overlay can't decode it the
+    # override silently no-ops. Every non-UNKNOWN member must resolve.
+
+    # Act
+    simulation = glazing_overlay_for(member.value, 0)
+
+    # Assert
+    assert simulation is not None
diff --git a/tests/domain/epc/test_main_fuel_overlay.py b/tests/domain/epc/test_main_fuel_overlay.py
new file mode 100644
index 000000000..7de2a5e50
--- /dev/null
+++ b/tests/domain/epc/test_main_fuel_overlay.py
@@ -0,0 +1,144 @@
+"""The Landlord-Override main-fuel → heating Simulation Overlay mapping.
+
+A main-fuel value resolves to the RdSAP `main_fuel_type` int code the calculator
+reads from the dwelling's primary heating system; the overlay is whole-dwelling.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from domain.epc.property_overrides.main_fuel_type import MainFuelType
+from domain.epc.property_overlays.main_fuel_overlay import fuel_overlay_for
+from domain.modelling.scoring.overlay_applicator import apply_simulations
+from tests.domain.sap10_calculator.worksheet._elmhurst_worksheet_000490 import (
+    build_epc,
+)
+
+
+def test_mains_gas_overlays_the_primary_fuel() -> None:
+    # Act
+    simulation = fuel_overlay_for("mains gas", 0)
+
+    # Assert — mains gas (not community) is RdSAP main_fuel code 26.
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.main_fuel_type == 26
+
+
+@pytest.mark.parametrize(
+    ("main_fuel_value", "code"),
+    [
+        ("electricity", 29),
+        ("LPG (bulk)", 27),
+        ("oil", 28),
+        ("house coal", 33),
+    ],
+)
+def test_fuels_decode_to_their_modern_not_community_codes(
+    main_fuel_value: str, code: int
+) -> None:
+    # Act
+    simulation = fuel_overlay_for(main_fuel_value, 0)
+
+    # Assert
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.main_fuel_type == code
+
+
+@pytest.mark.parametrize(
+    ("main_fuel_value", "code"),
+    [
+        ("bottled LPG", 3),
+        ("LPG special condition", 17),
+        ("electricity (community)", 25),
+        ("biomass (community)", 31),
+        ("dual fuel (mineral and wood)", 10),
+        ("smokeless coal", 15),
+    ],
+)
+def test_more_fuels_decode_to_their_codes(main_fuel_value: str, code: int) -> None:
+    # Act
+    simulation = fuel_overlay_for(main_fuel_value, 0)
+
+    # Assert
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.main_fuel_type == code
+
+
+def test_community_mains_gas_is_a_distinct_fuel_code() -> None:
+    # Act
+    simulation = fuel_overlay_for("mains gas (community)", 0)
+
+    # Assert — community mains gas is code 20, distinct from 26 (not community).
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.main_fuel_type == 20
+
+
+def test_mains_gas_fuel_sets_the_mains_gas_connection_flag() -> None:
+    # A "mains gas" fuel means the dwelling has a mains-gas connection, so the
+    # overlay must set sap_energy_source.mains_gas too — not only the fuel code.
+    # Without it the effective EPC says "fuel = mains gas" yet mains_gas=False,
+    # which suppresses the gas-boiler-upgrade path and wrongly offers HHRSH
+    # storage (the off-gas path). (Property 728513.)
+    simulation = fuel_overlay_for("mains gas", 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.mains_gas is True
+
+
+@pytest.mark.parametrize(
+    "main_fuel_value",
+    ["electricity", "LPG (bulk)", "bottled LPG", "oil", "house coal"],
+)
+def test_non_mains_gas_fuel_leaves_the_mains_gas_flag_unchanged(
+    main_fuel_value: str,
+) -> None:
+    # Only an explicit "mains gas" fuel asserts a mains-gas connection. An
+    # electric (or LPG/oil) main fuel does NOT tell us there is no gas supply
+    # (the dwelling could still have a gas hob), so the flag is left None
+    # ("leave the baseline unchanged") rather than cleared to False.
+    simulation = fuel_overlay_for(main_fuel_value, 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.mains_gas is None
+
+
+@pytest.mark.parametrize("main_fuel_value", ["Unknown", "", "no heating or hot water"])
+def test_unresolvable_fuel_produces_no_overlay(main_fuel_value: str) -> None:
+    # Act
+    simulation = fuel_overlay_for(main_fuel_value, 0)
+
+    # Assert
+    assert simulation is None
+
+
+def test_fuel_override_remaps_the_primary_systems_fuel_on_the_epc() -> None:
+    # Arrange — a landlord correction that the dwelling runs on electricity.
+    baseline = build_epc()
+    overlay = fuel_overlay_for("electricity", 0)
+    assert overlay is not None
+
+    # Act
+    result = apply_simulations(baseline, [overlay])
+
+    # Assert — the calculator reads the primary fuel from main_heating_details[0].
+    assert result.sap_heating.main_heating_details[0].main_fuel_type == 29
+
+
+@pytest.mark.parametrize(
+    "member", [m for m in MainFuelType if m is not MainFuelType.UNKNOWN]
+)
+def test_every_resolvable_fuel_value_decodes_to_a_code(member: MainFuelType) -> None:
+    # A classifier emits a MainFuelType value; if the overlay can't decode it the
+    # override silently no-ops. Every non-UNKNOWN member must resolve.
+
+    # Act
+    simulation = fuel_overlay_for(member.value, 0)
+
+    # Assert
+    assert simulation is not None
+
diff --git a/tests/domain/epc/test_main_heating_system_overlay.py b/tests/domain/epc/test_main_heating_system_overlay.py
new file mode 100644
index 000000000..e4bd544cc
--- /dev/null
+++ b/tests/domain/epc/test_main_heating_system_overlay.py
@@ -0,0 +1,322 @@
+"""The Landlord-Override main-heating-system → heating Simulation Overlay mapping.
+
+A main-heating-system value resolves to the SAP `sap_main_heating_code` the
+calculator reads from the primary system; the overlay is whole-dwelling.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from domain.epc.property_overrides.main_heating_system_type import MainHeatingSystemType
+from domain.epc.property_overlays.main_fuel_overlay import fuel_overlay_for
+from domain.epc.property_overlays.main_heating_system_overlay import (
+    _MAIN_HEATING_CODES,
+    main_heating_overlay_for,
+)
+from domain.sap10_calculator.tables.table_12a import (
+    OFF_PEAK_IMPLYING_HEATING_CODES,
+)
+from domain.epc.property_overlays.water_heating_overlay import (
+    water_heating_overlay_for,
+)
+from domain.modelling.scoring.overlay_applicator import apply_simulations
+from tests.domain.sap10_calculator.worksheet._elmhurst_worksheet_000490 import (
+    build_epc,
+)
+
+
+def test_gas_combi_overlays_the_primary_heating_code() -> None:
+    # Act
+    simulation = main_heating_overlay_for("Gas boiler, combi", 0)
+
+    # Assert — condensing combi is SAP Table 4b code 104.
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.sap_main_heating_code == 104
+
+
+@pytest.mark.parametrize(
+    ("main_heating_value", "code"),
+    [
+        ("Gas boiler, regular", 102),
+        ("Gas CPSU", 120),
+        ("Electric storage heaters, fan", 404),
+        ("Direct-acting electric", 191),
+    ],
+)
+def test_heating_archetypes_decode_to_their_sap_codes(
+    main_heating_value: str, code: int
+) -> None:
+    # Act
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+
+    # Assert
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.sap_main_heating_code == code
+
+
+@pytest.mark.parametrize(
+    ("main_heating_value", "code"),
+    [
+        ("Electric storage heaters, old", 401),
+        ("Electric storage heaters, slimline", 402),
+        ("Electric storage heaters, convector", 403),
+    ],
+)
+def test_storage_heater_subtypes_decode_to_their_codes(
+    main_heating_value: str, code: int
+) -> None:
+    # Act
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+
+    # Assert
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.sap_main_heating_code == code
+
+
+@pytest.mark.parametrize(
+    "main_heating_value",
+    [
+        "Electric storage heaters, old",
+        "Electric storage heaters, slimline",
+        "Electric storage heaters, convector",
+        "Electric storage heaters, fan",
+    ],
+)
+def test_storage_heaters_carry_an_off_peak_meter(main_heating_value: str) -> None:
+    # Storage heaters run on an Economy 7 (off-peak) tariff by design; setting
+    # only the heating code while leaving a single-rate meter bills every heating
+    # kWh at the peak rate and collapses the score (an override-set storage
+    # dwelling left on an oil donor's single meter scored SAP 13 vs ~50 on
+    # Economy 7). The overlay carries the off-peak meter, like the HHRSH measure.
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.meter_type == "Dual"
+
+
+@pytest.mark.parametrize(
+    "main_heating_value", ["Gas boiler, combi", "Direct-acting electric"]
+)
+def test_non_storage_heating_resets_to_a_single_rate_meter(
+    main_heating_value: str,
+) -> None:
+    # A single-rate system must drag a Single meter, not be left untouched: when
+    # the landlord switches OFF storage heaters the dwelling's old off-peak
+    # ("Dual") meter would otherwise bleed through and bill the new gas/direct-
+    # acting system on an Economy-7 split. Coherence is symmetric — off-peak
+    # codes synthesise Dual, every other code synthesises Single (ADR-0035).
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.meter_type == "Single"
+
+
+@pytest.mark.parametrize(
+    "main_heating_value",
+    [
+        "Electric storage heaters, old",
+        "Electric storage heaters, slimline",
+        "Electric storage heaters, convector",
+        "Electric storage heaters, fan",
+    ],
+)
+def test_storage_heaters_drag_along_conservative_manual_charge_control(
+    main_heating_value: str,
+) -> None:
+    # The landlord names the system, not its charge control. Manual charge
+    # control (Table 4e code 2401, +0.7 C MIT adjustment) is the lowest-SAP
+    # storage control, so it's the safe assumption that never over-credits.
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.main_heating_control == 2401
+
+
+def test_direct_acting_electric_does_not_drag_along_a_control() -> None:
+    # Charge control is a storage concept and full boiler controls are a wet-
+    # system concept; direct-acting electric panel heaters take neither, so the
+    # overlay leaves the control untouched.
+    simulation = main_heating_overlay_for("Direct-acting electric", 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.main_heating_control is None
+
+
+@pytest.mark.parametrize(
+    "main_heating_value", ["Gas boiler, combi", "Gas boiler, regular", "Gas CPSU"]
+)
+def test_gas_boiler_assumes_full_modern_controls(main_heating_value: str) -> None:
+    # The landlord names the boiler, not its controls. A gas boiler installed
+    # under modern Building Regs carries programmer + room thermostat + TRVs
+    # (SAP Table 4c code 2106), and the overlay already assumes the modern
+    # condensing efficiency for the boiler — so assuming modern controls is the
+    # coherent, consistent default (Khalim). It also overwrites any stale storage
+    # charge control (2401) the dwelling carried before the switch.
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.main_heating_control == 2106
+
+
+@pytest.mark.parametrize(
+    "main_heating_value", ["Gas boiler, combi", "Gas boiler, regular", "Gas CPSU"]
+)
+def test_gas_boiler_drags_a_coherent_mains_gas_system(main_heating_value: str) -> None:
+    # A gas boiler implies a mains-gas connection and a gas main fuel, a gas-
+    # boiler heating category (Table 4a cat 2), and a fanned room-sealed flue
+    # (a modern condensing boiler). Setting these on the system overlay makes a
+    # heating-system-only override self-coherent — it does not depend on a
+    # separate main_fuel override also being present.
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    heating = simulation.heating
+    assert heating.mains_gas is True
+    assert heating.main_fuel_type == 26
+    assert heating.main_heating_category == 2
+    assert heating.fan_flue_present is True
+
+
+def test_gas_combi_has_no_hot_water_cylinder() -> None:
+    # A combi heats hot water instantaneously — there is no cylinder. Elmhurst
+    # greys out the cylinder choice for a combi (Khalim). The overlay clears the
+    # cylinder + routes hot water from the main system so a storage dwelling's
+    # old electric-immersion cylinder doesn't bleed through.
+    simulation = main_heating_overlay_for("Gas boiler, combi", 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.has_hot_water_cylinder is False
+    assert simulation.heating.water_heating_code == 901
+    assert simulation.heating.water_heating_fuel == 26
+
+
+@pytest.mark.parametrize("main_heating_value", ["Gas boiler, regular", "Gas CPSU"])
+def test_regular_gas_boiler_keeps_a_hot_water_cylinder(
+    main_heating_value: str,
+) -> None:
+    # A regular boiler (and a gas CPSU) heats a hot-water cylinder from the main
+    # system. Elmhurst lets you pick a cylinder for a regular condensing boiler
+    # (Khalim).
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.has_hot_water_cylinder is True
+    assert simulation.heating.water_heating_code == 901
+    assert simulation.heating.water_heating_fuel == 26
+
+
+def test_off_peak_archetypes_drag_dual_others_drag_single() -> None:
+    # Contract (the drag-along guard): the meter is derived from the SAP code via
+    # the calculator's single off-peak classification, so any archetype whose
+    # code implies off-peak MUST synthesise a Dual meter and every other code
+    # MUST synthesise a Single meter — a system switch can never silently leave
+    # the previous system's meter in place.
+    for value, code in _MAIN_HEATING_CODES.items():
+        simulation = main_heating_overlay_for(value, 0)
+        assert simulation is not None and simulation.heating is not None
+        expected = "Dual" if code in OFF_PEAK_IMPLYING_HEATING_CODES else "Single"
+        assert simulation.heating.meter_type == expected, value
+
+
+@pytest.mark.parametrize(
+    "main_heating_value",
+    ["Unknown", "", "Air source heat pump", "Community heating"],
+)
+def test_unresolvable_or_unmodelled_heating_produces_no_overlay(
+    main_heating_value: str,
+) -> None:
+    # Heat pumps (main_heating_index_number) and community heating (community
+    # codes) don't map to a Table 4b sap_main_heating_code yet — no overlay.
+
+    # Act
+    simulation = main_heating_overlay_for(main_heating_value, 0)
+
+    # Assert
+    assert simulation is None
+
+
+def test_main_heating_override_remaps_the_primary_system_code() -> None:
+    # Arrange
+    baseline = build_epc()
+    overlay = main_heating_overlay_for("Gas boiler, regular", 0)
+    assert overlay is not None
+
+    # Act
+    result = apply_simulations(baseline, [overlay])
+
+    # Assert — the calculator reads the code off main_heating_details[0].
+    assert result.sap_heating.main_heating_details[0].sap_main_heating_code == 102
+
+
+def test_gas_boiler_override_onto_a_storage_baseline_leaves_no_stale_fields() -> None:
+    # Regression for property 728513: a landlord reclassified an electric-storage
+    # flat as a gas combi via the main_fuel + water_heating + main_heating_system
+    # overrides. Before the coherent drag-along the override set only the heating
+    # code + fuel and left the storage system's fields in place — mains_gas False,
+    # category 7, the 2401 charge control, a Dual meter, an electric-immersion
+    # cylinder — an incoherent record that gated out the gas-boiler path and made
+    # the engine read the dwelling as off-gas (offering HHRSH). The override must
+    # now overwrite ALL of them, regardless of the (undefined) overlay order.
+    baseline = build_epc()
+    overlays = [
+        fuel_overlay_for("mains gas", 0),
+        water_heating_overlay_for("From main system, mains gas", 0),
+        main_heating_overlay_for("Gas boiler, combi", 0),
+    ]
+    assert all(o is not None for o in overlays)
+
+    # Act
+    result = apply_simulations(baseline, [o for o in overlays if o is not None])
+
+    # Assert — a fully coherent mains-gas combi, no electric-storage residue.
+    main = result.sap_heating.main_heating_details[0]
+    assert main.sap_main_heating_code == 104
+    assert main.main_fuel_type == 26
+    assert main.main_heating_category == 2
+    assert main.main_heating_control == 2106
+    assert result.sap_energy_source.mains_gas is True
+    assert result.sap_energy_source.meter_type == "Single"
+    assert result.has_hot_water_cylinder is False
+    assert result.sap_heating.water_heating_code == 901
+    assert result.sap_heating.water_heating_fuel == 26
+
+
+def test_the_three_heating_overrides_compose_without_conflict() -> None:
+    # Arrange — main_fuel, water_heating and main_heating_system all fold onto one
+    # HeatingOverlay surface but set DISJOINT fields, so they compose (the
+    # field-disjoint design that makes precedence moot for these three).
+    baseline = build_epc()
+    overlays = [
+        fuel_overlay_for("electricity", 0),
+        water_heating_overlay_for("Electric immersion, electricity", 0),
+        main_heating_overlay_for("Electric storage heaters, fan", 0),
+    ]
+    assert all(o is not None for o in overlays)
+
+    # Act
+    result = apply_simulations(baseline, [o for o in overlays if o is not None])
+
+    # Assert — each override landed on its own field.
+    main = result.sap_heating.main_heating_details[0]
+    assert main.main_fuel_type == 29
+    assert main.sap_main_heating_code == 404
+    assert result.sap_heating.water_heating_code == 903
+    assert result.sap_heating.water_heating_fuel == 29
+
+
+@pytest.mark.parametrize(
+    "member",
+    [m for m in MainHeatingSystemType if m is not MainHeatingSystemType.UNKNOWN],
+)
+def test_every_resolvable_main_heating_value_decodes(
+    member: MainHeatingSystemType,
+) -> None:
+    # Act
+    simulation = main_heating_overlay_for(member.value, 0)
+
+    # Assert
+    assert simulation is not None
diff --git a/tests/domain/epc/test_override_code_mapping.py b/tests/domain/epc/test_override_code_mapping.py
index b22ad0a5d..5e462e08a 100644
--- a/tests/domain/epc/test_override_code_mapping.py
+++ b/tests/domain/epc/test_override_code_mapping.py
@@ -12,12 +12,12 @@ from typing import Optional
 
 import pytest
 
-from domain.epc.built_form_type import BuiltFormType
-from domain.epc.override_code_mapping import (
+from domain.epc.property_overrides.built_form_type import BuiltFormType
+from domain.epc.property_overrides.override_code_mapping import (
     built_form_to_code,
     property_type_to_code,
 )
-from domain.epc.property_type import PropertyType
+from domain.epc.property_overrides.property_type import PropertyType
 
 
 def test_house_maps_to_gov_code_zero() -> None:
diff --git a/tests/domain/epc/test_roof_type_overlay.py b/tests/domain/epc/test_roof_type_overlay.py
index 753feb221..050d76fa2 100644
--- a/tests/domain/epc/test_roof_type_overlay.py
+++ b/tests/domain/epc/test_roof_type_overlay.py
@@ -45,9 +45,74 @@ def test_each_loft_depth_is_parsed(roof_type_value: str, expected_mm: int) -> No
 @pytest.mark.parametrize(
     "roof_type_value",
     [
-        "Another Premises Above",
-        "Pitched, Unknown loft insulation",
         "Flat, insulated",
+        "Flat, insulated (assumed)",
+        "Flat, no insulation",
+        "Flat, no insulation (assumed)",
+        "Flat, limited insulation",
+        "Flat, limited insulation (assumed)",
+    ],
+)
+def test_flat_roof_sets_construction_type_for_age_band_default(
+    roof_type_value: str,
+) -> None:
+    # ADR-0033: a flat roof carries no loft depth, so the U-value comes from
+    # the age-band default (`_FLAT_ROOF_BY_AGE`). The calculator's flat path
+    # keys on the `roof_construction_type` string ("flat" in it), so the overlay
+    # sets that and leaves thickness None for the age band to drive.
+
+    # Act
+    simulation = roof_overlay_for(roof_type_value, 0)
+
+    # Assert
+    assert simulation is not None
+    overlay = simulation.building_parts[BuildingPartIdentifier.MAIN]
+    assert overlay.roof_construction_type == "Flat"
+    assert overlay.roof_insulation_thickness is None
+
+
+@pytest.mark.parametrize(
+    "roof_type_value",
+    ["Pitched, no insulation", "Pitched, no insulation (assumed)"],
+)
+def test_pitched_no_insulation_forces_the_uninsulated_thickness(
+    roof_type_value: str,
+) -> None:
+    # ADR-0033: a pitched "no insulation" roof is genuinely uninsulated (2.30 =
+    # Table 16 row 0). Set thickness 0 — the calculator's thickness path returns
+    # 2.30, and unlike "Unknown" a 0 *can* override a lodged numeric thickness.
+
+    # Act
+    simulation = roof_overlay_for(roof_type_value, 0)
+
+    # Assert
+    assert simulation is not None
+    overlay = simulation.building_parts[BuildingPartIdentifier.MAIN]
+    assert overlay.roof_insulation_thickness == 0
+
+
+def test_pitched_unknown_loft_drives_the_pitched_age_band_default() -> None:
+    # ADR-0033: "Pitched, Unknown loft insulation" carries no depth, so its
+    # U-value is the pitched age-band default (`_ROOF_BY_AGE`). Mirror the flat
+    # case — assert the pitched shape (so `is_flat_roof` stays False) and leave
+    # thickness None for the construction age band to drive. ~3,613 Hyde rows
+    # previously silently produced no overlay.
+
+    # Act
+    simulation = roof_overlay_for("Pitched, Unknown loft insulation", 0)
+
+    # Assert
+    assert simulation is not None
+    overlay = simulation.building_parts[BuildingPartIdentifier.MAIN]
+    assert overlay.roof_construction_type == "Pitched"
+    assert overlay.roof_insulation_thickness is None
+
+
+@pytest.mark.parametrize(
+    "roof_type_value",
+    [
+        "Another Premises Above",
+        "Roof room(s), insulated",
         "",
     ],
 )
diff --git a/tests/domain/epc/test_wall_type_overlay.py b/tests/domain/epc/test_wall_type_overlay.py
index df0edccc9..5b1cc9a82 100644
--- a/tests/domain/epc/test_wall_type_overlay.py
+++ b/tests/domain/epc/test_wall_type_overlay.py
@@ -29,6 +29,14 @@ def test_solid_brick_with_internal_insulation_overlays_main_wall() -> None:
     ("wall_type_value", "construction", "insulation"),
     [
         ("Cavity wall, as built, no insulation (assumed)", 4, 4),
+        # ADR-0033: the three "as built (assumed)" states all resolve to the
+        # as-built insulation code (4); the age band supplies the U-value, so
+        # "partial"/"insulated" need no distinct code. Elmhurst sweep confirms
+        # cavity As Built = (CAVITY,0) by age (e.g. band F → 1.0 = "partial").
+        ("Cavity wall, as built, partial insulation (assumed)", 4, 4),
+        ("Cavity wall, as built, insulated (assumed)", 4, 4),
+        ("Solid brick, as built, insulated (assumed)", 3, 4),
+        ("Cob, as built", 7, 4),
         ("Cavity wall, with internal insulation", 4, 3),
         ("Cavity wall, with external insulation", 4, 1),
         ("Cavity wall, filled cavity", 4, 2),
@@ -87,9 +95,9 @@ def test_overlay_targets_the_extension_building_part() -> None:
     "wall_type_value",
     [
         "Unknown",
-        # material maps, but the "(assumed) insulated" state is deferred (ADR-0032
-        # — its wall_insulation_type code needs Elmhurst validation), so still None.
-        "Solid brick, as built, insulated (assumed)",
+        # Basement wall is not one of the nine RdSAP materials, so it stays
+        # unresolved (handled by the calculator's basement path, not here).
+        "Basement wall, as built",
         "",
     ],
 )
diff --git a/tests/domain/epc/test_water_heating_overlay.py b/tests/domain/epc/test_water_heating_overlay.py
new file mode 100644
index 000000000..a1955aa73
--- /dev/null
+++ b/tests/domain/epc/test_water_heating_overlay.py
@@ -0,0 +1,111 @@
+"""The Landlord-Override water-heating → heating Simulation Overlay mapping.
+
+A water-heating value resolves to the SAP `water_heating_code` (system) and
+`water_heating_fuel` the calculator reads; the overlay is whole-dwelling.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from domain.epc.property_overlays.water_heating_overlay import (
+    water_heating_overlay_for,
+)
+from domain.epc.property_overrides.water_heating_type import WaterHeatingType
+from domain.modelling.scoring.overlay_applicator import apply_simulations
+from tests.domain.sap10_calculator.worksheet._elmhurst_worksheet_000490 import (
+    build_epc,
+)
+
+
+def test_from_main_system_mains_gas_overlays_water_heating() -> None:
+    # Act
+    simulation = water_heating_overlay_for("From main system, mains gas", 0)
+
+    # Assert — "from main system" is water_heating_code 901, mains gas fuel 26.
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.water_heating_code == 901
+    assert simulation.heating.water_heating_fuel == 26
+
+
+@pytest.mark.parametrize(
+    ("water_heating_value", "code", "fuel"),
+    [
+        ("From main system, electricity", 901, 29),
+        ("Electric immersion, electricity", 903, 29),
+    ],
+)
+def test_water_heating_systems_decode_to_their_codes(
+    water_heating_value: str, code: int, fuel: int
+) -> None:
+    # Act
+    simulation = water_heating_overlay_for(water_heating_value, 0)
+
+    # Assert
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.water_heating_code == code
+    assert simulation.heating.water_heating_fuel == fuel
+
+
+@pytest.mark.parametrize(
+    ("water_heating_value", "code", "fuel"),
+    [
+        ("From main system, oil", 901, 28),
+        ("From main system, LPG (bulk)", 901, 27),
+        ("From main system, bottled LPG", 901, 3),
+        ("From main system, house coal", 901, 33),
+        # "boiler/circulator for water heating only" is SAP Table 4a code 911.
+        ("Gas boiler/circulator, mains gas", 911, 26),
+    ],
+)
+def test_more_water_heating_combos_decode_to_their_codes(
+    water_heating_value: str, code: int, fuel: int
+) -> None:
+    # Act
+    simulation = water_heating_overlay_for(water_heating_value, 0)
+
+    # Assert
+    assert simulation is not None
+    assert simulation.heating is not None
+    assert simulation.heating.water_heating_code == code
+    assert simulation.heating.water_heating_fuel == fuel
+
+
+@pytest.mark.parametrize("water_heating_value", ["Unknown", ""])
+def test_unresolvable_water_heating_produces_no_overlay(
+    water_heating_value: str,
+) -> None:
+    # Act
+    simulation = water_heating_overlay_for(water_heating_value, 0)
+
+    # Assert
+    assert simulation is None
+
+
+def test_water_heating_override_remaps_the_hot_water_arrangement() -> None:
+    # Arrange — landlord correction: HW is a separate electric immersion.
+    baseline = build_epc()
+    overlay = water_heating_overlay_for("Electric immersion, electricity", 0)
+    assert overlay is not None
+
+    # Act
+    result = apply_simulations(baseline, [overlay])
+
+    # Assert — the calculator reads these off sap_heating.
+    assert result.sap_heating.water_heating_code == 903
+    assert result.sap_heating.water_heating_fuel == 29
+
+
+@pytest.mark.parametrize(
+    "member", [m for m in WaterHeatingType if m is not WaterHeatingType.UNKNOWN]
+)
+def test_every_resolvable_water_heating_value_decodes(
+    member: WaterHeatingType,
+) -> None:
+    # Act
+    simulation = water_heating_overlay_for(member.value, 0)
+
+    # Assert
+    assert simulation is not None
diff --git a/tests/domain/epc_prediction/test_component_accuracy_gate.py b/tests/domain/epc_prediction/test_component_accuracy_gate.py
index 2b0ee9fb4..cc262c17b 100644
--- a/tests/domain/epc_prediction/test_component_accuracy_gate.py
+++ b/tests/domain/epc_prediction/test_component_accuracy_gate.py
@@ -41,27 +41,42 @@ _FIXTURE = Path(__file__).parents[3] / "tests" / "fixtures" / "epc_prediction"
 # mode tipped, and it tipped entirely inside one near-tie pre-1900↔1900-29 (A↔B)
 # cohort. wall_insulation_type / floor_construction / has_hot_water_cylinder / has_pv
 # moved 3-6pp the same way. The tighten-only ratchet resumes from these new values.
+#
+# Re-baselined again under ADR-0037 (full-SAP mapper completion): full-SAP
+# (on-construction) certs previously mapped property_type=None, so the hard cohort
+# filter (comparable_properties.py — `c.epc.property_type == target.property_type`)
+# silently excluded them from EVERY cohort, as donors and as targets. Mapping
+# property_type correctly admits these real lodged EPCs as comparables — another
+# ground-truth-method change. Net effect over the n=36 fixture: **16 components
+# better, 4 worse, 6 unchanged**. The gains are concentrated in the physical /
+# geometric characteristics full-SAP certs measure accurately — window_count
+# residual 3.83->1.69, total_window_area 3.82->3.72, building_parts 0.33->0.12,
+# floor_construction 0.78->0.91, construction_age_band 0.50->0.78, modal_glazing
+# 0.56->0.84, walls/room-in-roof/heating-control all up. The 4 that fell are the
+# new-build-vs-old-stock service mismatch on 1-2 targets each (heating_main_fuel
+# 0.9722->0.9394, water_heating_fuel ->0.9495, cylinder_insulation_type 0.6667->
+# 0.3333) plus floor_area (+0.31 MAE). Tighten-only resumes from these values.
 _RATE_FLOORS: dict[str, float] = {
-    "wall_construction": 0.8889,
-    "wall_insulation_type": 0.7778,
-    "construction_age_band": 0.5000,
-    "construction_age_band_pm1": 0.8333,
+    "wall_construction": 0.9091,
+    "wall_insulation_type": 0.8687,
+    "construction_age_band": 0.7778,
+    "construction_age_band_pm1": 0.9091,
     "roof_construction": 0.7222,
-    "floor_construction": 0.7812,
-    "heating_main_fuel": 0.9722,
-    "heating_main_category": 0.9444,
-    "heating_main_control": 0.8056,
-    "water_heating_fuel": 0.9722,
-    "water_heating_code": 0.9444,
-    "has_hot_water_cylinder": 0.8333,
-    "cylinder_insulation_type": 0.5000,
+    "floor_construction": 0.9053,
+    "heating_main_fuel": 0.9394,
+    "heating_main_category": 0.9596,
+    "heating_main_control": 0.9091,
+    "water_heating_fuel": 0.9495,
+    "water_heating_code": 0.9798,
+    "has_hot_water_cylinder": 0.8687,
+    "cylinder_insulation_type": 0.3333,
     "secondary_heating_type": 0.0000,
     "roof_insulation_thickness": 0.4118,
     "roof_insulation_thickness_pm1": 0.4118,
     "floor_insulation": 0.9375,
-    "has_room_in_roof": 0.8333,
-    "modal_glazing_type": 0.5556,
-    "has_pv": 0.9444,
+    "has_room_in_roof": 0.9495,
+    "modal_glazing_type": 0.8384,
+    "has_pv": 0.9798,
     "solar_water_heating": 1.0000,
 }
 
@@ -77,11 +92,16 @@ _RATE_FLOORS: dict[str, float] = {
 # the other way as small-sample noise (one target's shift moves an n=36 MAE more
 # than that). The ceiling still pins the new deterministic value exactly, so the
 # tighten-only ratchet resumes from here.
+# total_window_area / building_parts / door_count all tightened under ADR-0037
+# (full-SAP certs admitted as donors — their measured geometry sharpens the
+# dimensional predictions); floor_area loosened 12.0378 -> 12.0586 as the one
+# physical residual that fell (1-2 targets picking a new-build donor). See the
+# _RATE_FLOORS note above.
 _RESIDUAL_CEILINGS: dict[str, float] = {
-    "floor_area": 12.0378,
-    "total_window_area": 4.4067,
-    "building_parts": 0.3333,
-    "door_count": 0.6389,
+    "floor_area": 12.0586,
+    "total_window_area": 3.7184,
+    "building_parts": 0.1212,
+    "door_count": 0.3131,
 }
 
 _TOLERANCE = 1e-3
diff --git a/tests/domain/epc_prediction/test_epc_prediction.py b/tests/domain/epc_prediction/test_epc_prediction.py
index 1f1ef42f0..c7ffbf523 100644
--- a/tests/domain/epc_prediction/test_epc_prediction.py
+++ b/tests/domain/epc_prediction/test_epc_prediction.py
@@ -9,11 +9,15 @@ from datetime import date
 from typing import Optional, Union
 
 from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
+    EnergyElement,
     EpcPropertyData,
     MainHeatingDetail,
     SapBuildingPart,
+    SapEnergySource,
     SapFloorDimension,
     SapHeating,
+    SapVentilation,
     SapWindow,
 )
 from domain.geospatial.coordinates import Coordinates
@@ -31,6 +35,7 @@ from domain.epc_prediction.prediction_target import PredictionTarget
 def _epc(
     *,
     building_parts: int = 1,
+    identifier: BuildingPartIdentifier = BuildingPartIdentifier.MAIN,
     floor_area: float = 80.0,
     wall_construction: Union[int, str] = 1,
     wall_insulation_type: Union[int, str] = 1,
@@ -47,6 +52,10 @@ def _epc(
     water_heating_code: Optional[int] = 1,
     has_hot_water_cylinder: bool = True,
     solar_water_heating: bool = False,
+    meter_type: str = "2",
+    main_heating_label: str = "Boiler and radiators, mains gas",
+    main_heating_controls_label: Optional[str] = None,
+    mechanical_ventilation_kind: Optional[str] = None,
 ) -> EpcPropertyData:
     epc: EpcPropertyData = object.__new__(EpcPropertyData)
     epc.property_type = "2"
@@ -55,6 +64,7 @@ def _epc(
     parts: list[SapBuildingPart] = []
     for _ in range(building_parts):
         part: SapBuildingPart = object.__new__(SapBuildingPart)
+        part.identifier = identifier
         part.wall_construction = wall_construction
         part.wall_insulation_type = wall_insulation_type
         part.construction_age_band = construction_age_band
@@ -82,8 +92,31 @@ def _epc(
     heating.cylinder_insulation_type = 1
     heating.secondary_heating_type = None
     epc.sap_heating = heating
+    epc.main_heating = [
+        EnergyElement(
+            description=main_heating_label,
+            energy_efficiency_rating=4,
+            environmental_efficiency_rating=4,
+        )
+    ]
+    epc.main_heating_controls = (
+        EnergyElement(
+            description=main_heating_controls_label,
+            energy_efficiency_rating=4,
+            environmental_efficiency_rating=4,
+        )
+        if main_heating_controls_label is not None
+        else None
+    )
     epc.has_hot_water_cylinder = has_hot_water_cylinder
     epc.solar_water_heating = solar_water_heating
+    epc.sap_ventilation = SapVentilation(
+        mechanical_ventilation_kind=mechanical_ventilation_kind,
+        sheltered_sides=1,
+    )
+    energy: SapEnergySource = object.__new__(SapEnergySource)
+    energy.meter_type = meter_type
+    epc.sap_energy_source = energy
     return epc
 
 
@@ -143,6 +176,81 @@ def test_template_is_the_member_closest_to_the_cohort_median_size() -> None:
     assert predicted.total_floor_area_m2 == 80.0
 
 
+def test_template_skips_a_main_less_member_so_the_prediction_has_a_main_part() -> None:
+    # Arrange — the size-median member is OTHER-only (the gov API lodged its part
+    # with a null identifier), but the cohort holds MAIN-bearing neighbours at
+    # other sizes. The structural template must be a MAIN-bearing member so the
+    # predicted dwelling presents a main dwelling — else the modelling handler's
+    # MAIN-part guard rejects an otherwise-rich cohort as "not predictable".
+    cohort = _cohort(
+        _epc(floor_area=80.0, identifier=BuildingPartIdentifier.OTHER),
+        _epc(floor_area=30.0, identifier=BuildingPartIdentifier.MAIN),
+        _epc(floor_area=200.0, identifier=BuildingPartIdentifier.MAIN),
+    )
+
+    # Act
+    predicted: EpcPropertyData = EpcPrediction().predict(
+        PredictionTarget(postcode="LS6 1AA", property_type="2"), cohort
+    )
+
+    # Assert — the predicted dwelling has a MAIN part (seeded from a MAIN-bearing
+    # neighbour), not the OTHER-only median member.
+    assert any(
+        part.identifier is BuildingPartIdentifier.MAIN
+        for part in predicted.sap_building_parts
+    )
+
+
+def test_an_all_other_cohort_predicts_without_a_main_part() -> None:
+    # Arrange — every member is OTHER-only (the whole same-type cohort was lodged
+    # with null identifiers). There is no MAIN-bearing template to seed from, so
+    # the prediction must NOT silently relabel real data; it falls back to the
+    # size-closest member and yields a MAIN-less picture, which the modelling
+    # handler then rejects as not-predictable (the honest "fail" decision).
+    cohort = _cohort(
+        _epc(floor_area=80.0, identifier=BuildingPartIdentifier.OTHER),
+        _epc(floor_area=82.0, identifier=BuildingPartIdentifier.OTHER),
+    )
+
+    # Act
+    predicted: EpcPropertyData = EpcPrediction().predict(
+        PredictionTarget(postcode="LS6 1AA", property_type="2"), cohort
+    )
+
+    # Assert — no MAIN part is conjured; the picture stays as lodged.
+    assert not any(
+        part.identifier is BuildingPartIdentifier.MAIN
+        for part in predicted.sap_building_parts
+    )
+
+
+def test_template_is_the_size_closest_member_among_the_main_bearing_ones() -> None:
+    # Arrange — the size-median member is OTHER-only (80 m²). Of the MAIN-bearing
+    # members, the 78 m² one (distinctively a 2-part structure) is nearest the
+    # cohort median; the 30 m² one is far. The template must be the size-closest
+    # *MAIN-bearing* member, while the cohort median stays a property of the whole
+    # cohort (78 m², not the 54 m² median of just the MAIN-bearing subset).
+    cohort = _cohort(
+        _epc(floor_area=80.0, identifier=BuildingPartIdentifier.OTHER),
+        _epc(
+            floor_area=78.0,
+            identifier=BuildingPartIdentifier.MAIN,
+            building_parts=2,
+        ),
+        _epc(floor_area=30.0, identifier=BuildingPartIdentifier.MAIN),
+    )
+
+    # Act
+    predicted: EpcPropertyData = EpcPrediction().predict(
+        PredictionTarget(postcode="LS6 1AA", property_type="2"), cohort
+    )
+
+    # Assert — structure copied from the 78 m² MAIN-bearing member (its 2 parts),
+    # and the size estimate is the full-cohort median (78 m²), not the subset's.
+    assert len(predicted.sap_building_parts) == 2
+    assert predicted.total_floor_area_m2 == 78.0
+
+
 def test_sets_main_wall_construction_to_the_cohort_mode() -> None:
     # Arrange — the template (members[0]) is solid brick (2), but the cohort
     # majority is cavity (1). The homogeneous categorical should follow the mode,
@@ -455,6 +563,31 @@ def test_heating_is_a_coherent_donor_not_the_structural_template() -> None:
     assert predicted.has_hot_water_cylinder is True
 
 
+def test_ventilation_kind_follows_the_cohort_mode() -> None:
+    # Mechanical ventilation (MEV/MVHR) is a new-build / retrofit feature that
+    # clusters by era and street — like glazing — so the predicted ventilation
+    # kind takes the recency/geo-weighted cohort mode, not the size-template's.
+    # The size-closest template here is natural (None); the cohort is
+    # predominantly MVHR, so the prediction must reflect the MVHR neighbourhood
+    # rather than leave the template's empty ventilation (predicted property
+    # 721167 follow-up). Natural-vent cohorts mode to None and stay natural.
+    cohort = _cohort(
+        _epc(mechanical_ventilation_kind=None),  # template (size tie → first)
+        _epc(mechanical_ventilation_kind="MVHR"),
+        _epc(mechanical_ventilation_kind="MVHR"),
+        _epc(mechanical_ventilation_kind="MVHR"),
+    )
+
+    # Act
+    predicted: EpcPropertyData = EpcPrediction().predict(
+        PredictionTarget(postcode="LS6 1AA", property_type="2"), cohort
+    )
+
+    # Assert — the predicted kind is the cohort's MVHR mode, not the template's None.
+    assert predicted.sap_ventilation is not None
+    assert predicted.sap_ventilation.mechanical_ventilation_kind == "MVHR"
+
+
 def test_glazing_follows_the_recency_weighted_cohort_mode() -> None:
     # Arrange — an old majority single-glazed (type 1, 2015) and a recent
     # minority double-glazed (type 3, 2025). Glazing is retrofitted over time
@@ -543,3 +676,43 @@ def test_applies_a_known_wall_override_over_the_mode() -> None:
 
     # Assert — the known override overrides the cohort mode.
     assert predicted.sap_building_parts[0].wall_construction == 2
+
+
+def test_heating_donor_carries_the_donors_off_peak_meter() -> None:
+    # The coherent heating system spans the meter (ADR-0035): the donor's
+    # off-peak meter must travel with its heating cluster, replacing the
+    # template's single-rate meter — otherwise a donated storage system bills at
+    # the peak rate and the score collapses.
+    predicted = _epc(meter_type="2")  # the structural template's single meter
+    donor = _epc(meter_type="Dual", main_fuel_type=29)  # the cohort's heating
+    EpcPrediction._apply_heating_donor(predicted, _cohort(donor))
+    assert predicted.sap_energy_source.meter_type == "Dual"
+
+
+def test_heating_donor_carries_the_donors_display_heating_and_control() -> None:
+    # The displayed heating panel (Main Heating + Heating Control rows) describes
+    # the same system as the calc cluster, so it must travel with the donor — not
+    # be left on the size-representative structural template. Two failures
+    # otherwise: (1) the displayed heating is incoherent with the donated calc
+    # system, and (2) "Heating Control: Unknown" whenever the template lodged no
+    # control row (the donor's is dropped). Predicted property 721167 (ADR-0029
+    # follow-up): the template carried no main_heating_controls, so its passport
+    # showed Heating Control = Unknown despite a coherent gas-boiler donor.
+    predicted = _epc(
+        main_heating_label="Room heaters, electric",
+        main_heating_controls_label=None,  # template lodged no control
+    )
+    donor = _epc(
+        main_fuel_type=29,
+        main_heating_label="Boiler and radiators, mains gas",
+        main_heating_controls_label="Programmer, room thermostat and TRVs",
+    )
+
+    EpcPrediction._apply_heating_donor(predicted, _cohort(donor))
+
+    assert predicted.main_heating[0].description == "Boiler and radiators, mains gas"
+    assert predicted.main_heating_controls is not None
+    assert (
+        predicted.main_heating_controls.description
+        == "Programmer, room thermostat and TRVs"
+    )
diff --git a/tests/domain/epc_prediction/test_validation.py b/tests/domain/epc_prediction/test_validation.py
index 1e20b1b10..24fa01985 100644
--- a/tests/domain/epc_prediction/test_validation.py
+++ b/tests/domain/epc_prediction/test_validation.py
@@ -8,6 +8,7 @@ from datetime import date
 from typing import Optional, Union
 
 from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
     EpcPropertyData,
     MainHeatingDetail,
     SapBuildingPart,
@@ -39,6 +40,7 @@ def _comparable(
     epc.solar_water_heating = False
     epc.has_hot_water_cylinder = True
     part: SapBuildingPart = object.__new__(SapBuildingPart)
+    part.identifier = BuildingPartIdentifier.MAIN
     part.wall_construction = wall_construction
     part.wall_insulation_type = 1
     part.construction_age_band = "K"
@@ -62,9 +64,14 @@ def _comparable(
     heating.cylinder_insulation_type = 1
     heating.secondary_heating_type = None
     epc.sap_heating = heating
+    # Display heating rows the heating-donor synthesis carries (ADR-0029
+    # follow-up); `main_heating` has no dataclass default, so a partial instance
+    # must set it. `main_heating_controls` / `sap_ventilation` default to None.
+    epc.main_heating = []
     energy: SapEnergySource = object.__new__(SapEnergySource)
     energy.photovoltaic_supply = None
     energy.photovoltaic_arrays = None
+    energy.meter_type = "2"
     epc.sap_energy_source = energy
     return ComparableProperty(
         epc=epc,
diff --git a/tests/domain/fuel_rates/test_fuel_rates.py b/tests/domain/fuel_rates/test_fuel_rates.py
index a73192742..55472aeb7 100644
--- a/tests/domain/fuel_rates/test_fuel_rates.py
+++ b/tests/domain/fuel_rates/test_fuel_rates.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import pytest
 
 from domain.fuel_rates.fuel import Fuel, UnpricedFuel
-from domain.fuel_rates.fuel_rates import FuelRate, FuelRates
+from domain.fuel_rates.fuel_rates import FuelRate, FuelRates, OffPeakRate
 
 
 def _rates() -> FuelRates:
@@ -14,6 +14,62 @@ def _rates() -> FuelRates:
     )
 
 
+def _off_peak_rates() -> FuelRates:
+    return FuelRates(
+        period="test",
+        seg_export_p_per_kwh=15.0,
+        rates={},
+        off_peak=OffPeakRate(
+            day_p_per_kwh=29.73, night_p_per_kwh=13.89, standing_charge_p_per_day=56.99
+        ),
+    )
+
+
+def test_off_peak_blended_rate_at_zero_high_fraction_is_the_night_rate() -> None:
+    # Arrange — an all-night load (storage heating, high-rate fraction 0.0).
+    rates = _off_peak_rates()
+
+    # Act
+    blended = rates.off_peak_blended_p_per_kwh(high_rate_fraction=0.0)
+
+    # Assert — every kWh bills at the cheap night rate.
+    assert blended == 13.89
+
+
+def test_off_peak_blended_rate_at_full_high_fraction_is_the_day_rate() -> None:
+    # Arrange — an all-day load (high-rate fraction 1.0).
+    rates = _off_peak_rates()
+
+    # Act / Assert — every kWh bills at the dearer day rate.
+    assert rates.off_peak_blended_p_per_kwh(high_rate_fraction=1.0) == 29.73
+
+
+def test_off_peak_blended_rate_blends_day_and_night_linearly() -> None:
+    # Arrange — 25% of the load at the day rate, 75% at night.
+    rates = _off_peak_rates()
+
+    # Act / Assert — 0.25 * 29.73 + 0.75 * 13.89 = 17.85
+    assert rates.off_peak_blended_p_per_kwh(high_rate_fraction=0.25) == pytest.approx(17.85)
+
+
+def test_off_peak_blend_without_a_snapshot_off_peak_entry_raises_unpriced_fuel() -> None:
+    # Arrange — a snapshot that carries no off-peak entry at all.
+    rates = _rates()
+
+    # Act / Assert
+    with pytest.raises(UnpricedFuel) as excinfo:
+        rates.off_peak_blended_p_per_kwh(high_rate_fraction=0.5)
+    assert excinfo.value.fuel is Fuel.ELECTRICITY_OFF_PEAK
+
+
+def test_off_peak_meter_standing_charge_reads_back() -> None:
+    # Arrange — the bill adds the off-peak meter's standing charge once per meter.
+    rates = _off_peak_rates()
+
+    # Act / Assert
+    assert rates.standing_charge_p_per_day(Fuel.ELECTRICITY_OFF_PEAK) == 56.99
+
+
 def test_unit_rate_and_standing_charge_read_back_for_a_priced_fuel() -> None:
     # Arrange
     rates = _rates()
diff --git a/tests/domain/modelling/test_elmhurst_cascade_pins.py b/tests/domain/modelling/test_elmhurst_cascade_pins.py
index 0e6832b74..c99f7b6f0 100644
--- a/tests/domain/modelling/test_elmhurst_cascade_pins.py
+++ b/tests/domain/modelling/test_elmhurst_cascade_pins.py
@@ -492,10 +492,11 @@ def test_suspended_floor_overlay_reproduces_the_relodged_after() -> None:
 
 
 def test_double_glazing_overlay_reproduces_the_relodged_after_windows() -> None:
-    # The full-SAP pin below is xfail (draught-proofing coupling), but the
-    # overlay's actual job — turning every single-glazed window into the
-    # relodged spec — is deterministic and must hold exactly: it proves the
-    # generator detects BOTH single-glazing codes (1 and 15) on the real cert.
+    # The full-SAP pin below now passes (the draught-proofing + frame-factor
+    # coupling is modelled), but this narrower pin isolates the overlay's actual
+    # job — turning every single-glazed window into the relodged spec — which is
+    # deterministic and must hold exactly: it proves the generator detects BOTH
+    # single-glazing codes (1 and 15) on the real cert.
     # Arrange
     before: EpcPropertyData = parse_recommendation_summary(
         "double_glazing_001431_before.pdf"
@@ -528,24 +529,13 @@ def test_double_glazing_overlay_reproduces_the_relodged_after_windows() -> None:
     assert _window_spec(applied) == _window_spec(after)
 
 
-_GLAZING_DRAUGHT_COUPLING_REASON: Final[str] = (
-    "Blocked on the glazing measure's draught-proofing coupling. The window "
-    "U/g overlay reproduces the after's 14 windows EXACTLY (all four single-"
-    "glazed panes — codes 1 and 15 — become the relodged double/secondary "
-    "spec). The residual ~0.7 SAP is a secondary effect the overlay does not "
-    "model: replacing the single-glazed (lodged draught_proofed=No) windows "
-    "with sealed units re-lodges percent_draughtproofed 84->100 (~0.3 SAP) and "
-    "lowers fabric heat loss by ~+150 kWh space heating (~0.4 SAP) not yet "
-    "isolated. Flips green once the glazing overlay propagates draught-proofing "
-    "(and the residual fabric coupling is modelled)."
-)
-
-
-@pytest.mark.xfail(strict=True, reason=_GLAZING_DRAUGHT_COUPLING_REASON)
 def test_double_glazing_overlay_reproduces_the_relodged_after() -> None:
     # Arrange — cert 001431 lodges four single-glazed windows (codes 1 and 15,
     # "single glazing, known data"); the after re-lodges every one as double
-    # (gt=5, U=1.40, g=0.72).
+    # (gt=5, U=1.40, g=0.72). The overlay now also models the two secondary
+    # effects of fitting sealed units: RdSAP 10 §8.1 draught-proofing
+    # 84 → 100 (`percent_draughtproofed`) and the re-lodged FF=0.70 on the
+    # panes that lodged FF 1.00 / 0.50 — so the full-SAP pin closes.
     before: EpcPropertyData = parse_recommendation_summary(
         "double_glazing_001431_before.pdf"
     )
@@ -561,7 +551,6 @@ def test_double_glazing_overlay_reproduces_the_relodged_after() -> None:
     )
 
 
-@pytest.mark.xfail(strict=True, reason=_GLAZING_DRAUGHT_COUPLING_REASON)
 def test_secondary_glazing_overlay_reproduces_the_relodged_after() -> None:
     # Arrange — a planning protection forces secondary glazing; the after
     # re-lodges every single-glazed window as secondary (gt=11, U=2.90, g=0.85).
@@ -686,12 +675,15 @@ def test_ashp_overlay_scores_the_vaillant_end_state_from_a_gas_boiler() -> None:
     # dwelling's baseline fabric and so the ASHP end-state SAP. Still a snapshot
     # of the Vaillant overlay's own output, validated transitively by the
     # system-boiler pin below (which reproduces a real Vaillant cert at delta 0).
+    # CO2/PE are the postcode DEMAND cascade now that `Sap10Calculator.
+    # calculate` computes EPC emissions/PE on local weather (SAP 10.2
+    # Appendix U p.124); SAP is unchanged (UK-average rating cascade).
     _assert_overlay_scores(
         before,
         option.overlay,
         sap=51.99820176096402,
-        co2=1268.4645083243888,
-        pe=13080.20756425629,
+        co2=1065.7593506066496,
+        pe=10995.781557709413,
     )
 
 
@@ -715,12 +707,14 @@ def test_ashp_overlay_scores_the_vaillant_end_state_from_a_gas_boiler_instant_hw
     # boiler-1 pin above); the same merge also resolved this cert's main-fuel
     # mapper gap (§14.2 mains-gas derivation), so its raw before now baselines —
     # see `test_gas_boiler_instant_hw_before_baselines`.
+    # CO2/PE are the postcode DEMAND cascade now (see the boiler-1 pin above);
+    # SAP is unchanged (UK-average rating cascade).
     _assert_overlay_scores(
         before,
         option.overlay,
         sap=39.00740809309464,
-        co2=2248.6089062232704,
-        pe=23094.10189037302,
+        co2=1845.8588018295509,
+        pe=18944.42568846759,
     )
 
 
diff --git a/tests/domain/modelling/test_glazing_recommendation.py b/tests/domain/modelling/test_glazing_recommendation.py
index 993052f04..52063b5e0 100644
--- a/tests/domain/modelling/test_glazing_recommendation.py
+++ b/tests/domain/modelling/test_glazing_recommendation.py
@@ -67,8 +67,12 @@ def test_single_glazed_dwelling_yields_a_double_glazing_recommendation() -> None
     option = recommendation.options[0]
     assert option.measure_type == "double_glazing"
     assert dict(option.overlay.windows) == {
-        0: WindowOverlay(glazing_type=5, u_value=1.40, solar_transmittance=0.72),
-        2: WindowOverlay(glazing_type=5, u_value=1.40, solar_transmittance=0.72),
+        0: WindowOverlay(
+            glazing_type=5, u_value=1.40, solar_transmittance=0.72, frame_factor=0.70
+        ),
+        2: WindowOverlay(
+            glazing_type=5, u_value=1.40, solar_transmittance=0.72, frame_factor=0.70
+        ),
     }
 
 
@@ -121,6 +125,10 @@ def test_planning_protection_picks_secondary_glazing_over_double() -> None:
     option = recommendation.options[0]
     assert option.measure_type == "secondary_glazing"
     assert dict(option.overlay.windows) == {
-        0: WindowOverlay(glazing_type=11, u_value=2.90, solar_transmittance=0.85),
-        2: WindowOverlay(glazing_type=11, u_value=2.90, solar_transmittance=0.85),
+        0: WindowOverlay(
+            glazing_type=11, u_value=2.90, solar_transmittance=0.85, frame_factor=0.70
+        ),
+        2: WindowOverlay(
+            glazing_type=11, u_value=2.90, solar_transmittance=0.85, frame_factor=0.70
+        ),
     }
diff --git a/tests/domain/modelling/test_overlay_applicator.py b/tests/domain/modelling/test_overlay_applicator.py
index 1dce4067c..8f6c960ff 100644
--- a/tests/domain/modelling/test_overlay_applicator.py
+++ b/tests/domain/modelling/test_overlay_applicator.py
@@ -55,6 +55,76 @@ def test_apply_writes_targeted_building_part_and_leaves_others_untouched() -> No
     )
 
 
+def test_override_for_an_absent_semantic_part_lands_on_the_part_at_that_position() -> (
+    None
+):
+    # `building_part` is a POSITIONAL index (0=main, 1=extension 1…, ADR-0004). The
+    # gov-API EPC can label its parts differently (e.g. a 2nd part lodged as `other`
+    # rather than `extension_1`). An `extension_1` override must still land on the
+    # part at position 1 — the landlord's correction is applied, not dropped.
+    # Arrange — build_epc() is [MAIN, EXTENSION_1]; relabel the 2nd part to OTHER so
+    # the EXTENSION_1 identifier is absent but position 1 still exists.
+    baseline: EpcPropertyData = build_epc()
+    baseline.sap_building_parts[1].identifier = BuildingPartIdentifier.OTHER
+    simulation = EpcSimulation(
+        building_parts={
+            BuildingPartIdentifier.EXTENSION_1: BuildingPartOverlay(
+                wall_insulation_type=3
+            )
+        }
+    )
+
+    # Act
+    result: EpcPropertyData = apply_simulations(baseline, [simulation])
+
+    # Assert — the override folded onto the part at position 1 (the OTHER part).
+    assert _part(result, BuildingPartIdentifier.OTHER).wall_insulation_type == 3
+
+
+def test_override_with_no_part_at_that_position_is_skipped() -> None:
+    # When there is genuinely no part at the override's position (the EPC models
+    # fewer parts than the index), the override is skipped rather than crashing —
+    # we cannot model an extension we have no geometry for.
+    # Arrange — build_epc() has 2 parts (positions 0, 1); position 2 is absent.
+    baseline: EpcPropertyData = build_epc()
+    simulation = EpcSimulation(
+        building_parts={
+            BuildingPartIdentifier.MAIN: BuildingPartOverlay(wall_insulation_type=1),
+            BuildingPartIdentifier.EXTENSION_2: BuildingPartOverlay(
+                wall_insulation_type=1
+            ),
+        }
+    )
+
+    # Act
+    result: EpcPropertyData = apply_simulations(baseline, [simulation])
+
+    # Assert — the present part got its overlay; nothing was added for position 2.
+    assert _part(result, BuildingPartIdentifier.MAIN).wall_insulation_type == 1
+    assert len(result.sap_building_parts) == len(baseline.sap_building_parts)
+
+
+def test_flat_roof_construction_type_folds_onto_the_part() -> None:
+    # ADR-0033: a flat-roof landlord override sets `roof_construction_type` so the
+    # calculator's flat path (`"flat" in roof_construction_type`) fires the
+    # age-band default. Proves the generic field loop wires the new overlay field.
+    # Arrange
+    baseline: EpcPropertyData = build_epc()
+    simulation = EpcSimulation(
+        building_parts={
+            BuildingPartIdentifier.MAIN: BuildingPartOverlay(
+                roof_construction_type="Flat"
+            )
+        }
+    )
+
+    # Act
+    result: EpcPropertyData = apply_simulations(baseline, [simulation])
+
+    # Assert
+    assert _part(result, BuildingPartIdentifier.MAIN).roof_construction_type == "Flat"
+
+
 def test_empty_simulation_is_a_no_op() -> None:
     # Arrange
     baseline: EpcPropertyData = build_epc()
diff --git a/tests/domain/modelling/test_solar_config_selection.py b/tests/domain/modelling/test_solar_config_selection.py
index d48a7aec4..da08fd1a2 100644
--- a/tests/domain/modelling/test_solar_config_selection.py
+++ b/tests/domain/modelling/test_solar_config_selection.py
@@ -11,7 +11,14 @@ import json
 from pathlib import Path
 from typing import Any
 
+from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
+    EpcPropertyData,
+    SapBuildingPart,
+    SapFloorDimension,
+)
 from domain.modelling.generators.solar_recommendation import (
+    _dwelling_roof_area_m2,
     select_conservative_configs,
 )
 from domain.modelling.solar_potential import (
@@ -20,6 +27,37 @@ from domain.modelling.solar_potential import (
     SolarRoofSegment,
 )
 
+
+def _epc_with_roof(per_storey_areas: tuple[float, ...], total_floor_area: float) -> EpcPropertyData:
+    epc: EpcPropertyData = object.__new__(EpcPropertyData)
+    epc.total_floor_area_m2 = total_floor_area
+    part: SapBuildingPart = object.__new__(SapBuildingPart)
+    part.identifier = BuildingPartIdentifier.MAIN
+    dims: list[SapFloorDimension] = []
+    for floor, area in enumerate(per_storey_areas):
+        fd: SapFloorDimension = object.__new__(SapFloorDimension)
+        fd.floor = floor  # 0 = ground
+        fd.total_floor_area_m2 = area
+        dims.append(fd)
+    part.sap_floor_dimensions = dims
+    epc.sap_building_parts = [part]
+    return epc
+
+
+def test_dwelling_roof_basis_is_ground_floor_clamped_by_total_floor_area() -> None:
+    # ADR-0038/0029: the basis is the ground-floor footprint, clamped by total
+    # floor area. A predicted EPC's building-part geometry is the structural
+    # template's (here a 118 m² ground floor), decoupled from the predicted
+    # floor area (55 m²); a footprint can't exceed total floor area, so the cap
+    # basis clamps to 55 — not the borrowed template's 118.
+    predicted = _epc_with_roof(per_storey_areas=(118.0,), total_floor_area=55.0)
+    assert _dwelling_roof_area_m2(predicted) == 55.0
+
+    # A consistent 2-storey house — ground 55, upper 50, total 105 — uses the
+    # GROUND floor (55), not the greatest per-storey area, and the clamp is inert.
+    lodged = _epc_with_roof(per_storey_areas=(55.0, 50.0), total_floor_area=105.0)
+    assert _dwelling_roof_area_m2(lodged) == 55.0
+
 _FIXTURE: Path = (
     Path(__file__).resolve().parent
     / "fixtures"
@@ -46,6 +84,7 @@ def _segment(panels: int, azimuth: float, energy: float) -> SolarRoofSegment:
 def test_real_example_samples_five_spanning_configs() -> None:
     # Arrange
     potential = SolarPotential.from_building_insights(_insights())
+    assert potential is not None
 
     # Act
     configs = select_conservative_configs(potential)
@@ -110,6 +149,57 @@ def test_cap_excludes_configs_above_seventy_percent() -> None:
     assert [c.panels_count for c in configs] == [6]
 
 
+def _south(panels: int) -> SolarRoofSegment:
+    return _segment(panels=panels, azimuth=180.0, energy=panels * 100.0)
+
+
+def _potential_with_panel_dims(
+    max_panels: int, panel_counts: tuple[int, ...]
+) -> SolarPotential:
+    # Google panel footprint 1.879 × 1.045 ≈ 1.964 m².
+    return SolarPotential(
+        panel_capacity_watts=400.0,
+        max_array_panels_count=max_panels,
+        configurations=tuple(
+            SolarPanelConfiguration(
+                panels_count=n,
+                yearly_energy_dc_kwh=n * 100.0,
+                segments=(_south(n),),
+            )
+            for n in panel_counts
+        ),
+        panel_height_m=1.879,
+        panel_width_m=1.045,
+    )
+
+
+def test_dwelling_roof_cap_bounds_a_small_dwelling() -> None:
+    # ADR-0038: Google's maxArrayPanelsCount (58) reflects a conflated whole-
+    # building roof; a 55 m² dwelling's own usable roof (≈ 55/cos30° × 0.5 ≈
+    # 32 m² ≈ 16 panels) must bound the array, well below the 0.70×58 ≈ 40 cap.
+    potential = _potential_with_panel_dims(58, (4, 12, 20, 30, 41, 58))
+
+    # Google cap alone allows up to the 30-panel rung (41/58 exceed 0.70×58).
+    assert max(c.panels_count for c in select_conservative_configs(potential)) == 30
+
+    capped = select_conservative_configs(potential, dwelling_roof_area_m2=55.0)
+
+    assert capped  # still offers the small rungs
+    assert all(c.panels_count <= 16 for c in capped)
+    assert max(c.panels_count for c in capped) == 12
+
+
+def test_dwelling_roof_cap_is_a_no_op_on_a_matched_home() -> None:
+    # ADR-0038: on a correctly-matched home Google's roof ≈ the dwelling's, so
+    # the area budget is ≳ what Google offers and the cap does NOT bite.
+    potential = _potential_with_panel_dims(58, (4, 12, 20, 30, 41, 58))
+    baseline = [c.panels_count for c in select_conservative_configs(potential)]
+
+    matched = select_conservative_configs(potential, dwelling_roof_area_m2=300.0)
+
+    assert [c.panels_count for c in matched] == baseline
+
+
 def test_all_north_or_empty_yields_no_configs() -> None:
     # Arrange — every plane faces north
     potential = SolarPotential(
diff --git a/tests/domain/modelling/test_solar_overshading.py b/tests/domain/modelling/test_solar_overshading.py
index 9c97ce157..fcb43871c 100644
--- a/tests/domain/modelling/test_solar_overshading.py
+++ b/tests/domain/modelling/test_solar_overshading.py
@@ -77,6 +77,7 @@ def test_segment_overshading_recovers_each_bucket() -> None:
 def test_real_example_segments_are_unshaded() -> None:
     # Arrange
     potential = SolarPotential.from_building_insights(_insights())
+    assert potential is not None
     largest = potential.configurations[-1]
 
     # Act
diff --git a/tests/domain/modelling/test_solar_potential.py b/tests/domain/modelling/test_solar_potential.py
index 1561242fd..098b886e4 100644
--- a/tests/domain/modelling/test_solar_potential.py
+++ b/tests/domain/modelling/test_solar_potential.py
@@ -54,6 +54,20 @@ def test_pitch_to_sap_code_snaps_to_rdsap_enum() -> None:
     assert pitch_to_sap_code(31.896425) == 2
 
 
+def test_projection_returns_none_when_array_sizing_absent() -> None:
+    # Arrange — Google returns a solarPotential block with no array-sizing
+    # fields for buildings with no usable solar estimate; this previously
+    # KeyError'd on `maxArrayPanelsCount` and failed the whole property.
+    insights = _insights()
+    del insights["solarPotential"]["maxArrayPanelsCount"]
+
+    # Act
+    potential = SolarPotential.from_building_insights(insights)
+
+    # Assert — no usable solar potential, not a crash
+    assert potential is None
+
+
 def test_projection_reads_potential_level_fields() -> None:
     # Arrange
     insights = _insights()
@@ -62,6 +76,7 @@ def test_projection_reads_potential_level_fields() -> None:
     potential = SolarPotential.from_building_insights(insights)
 
     # Assert
+    assert potential is not None
     assert abs(potential.panel_capacity_watts - 400.0) <= 1e-4
     assert potential.max_array_panels_count == 49
     assert len(potential.configurations) == 46
@@ -73,6 +88,7 @@ def test_projection_first_config_single_segment() -> None:
 
     # Act
     potential = SolarPotential.from_building_insights(insights)
+    assert potential is not None
     first = potential.configurations[0]
 
     # Assert — the smallest rung: 4 panels on one SE roof plane
@@ -87,12 +103,50 @@ def test_projection_first_config_single_segment() -> None:
     assert segment.sap_pitch_code == 2  # ~32° → 30°
 
 
+def test_projection_reads_panel_dimensions() -> None:
+    # The Dwelling-Roof Cap (ADR-0038) sizes the array by usable roof area, so
+    # it needs each panel's physical footprint — Google reports it at the
+    # solarPotential level.
+    potential = SolarPotential.from_building_insights(_insights())
+
+    assert potential is not None
+    assert potential.panel_height_m is not None
+    assert potential.panel_width_m is not None
+    assert abs(potential.panel_height_m - 1.879) <= 1e-4
+    assert abs(potential.panel_width_m - 1.045) <= 1e-4
+
+
+def test_projection_enriches_segments_with_centre_and_area() -> None:
+    # The Dwelling-Roof Cap (ADR-0038) ranks segments by distance from the
+    # dwelling and bounds the array by usable roof area, so each segment must
+    # carry its centre + area — sourced from the top-level roofSegmentStats,
+    # keyed by segmentIndex (the per-config roofSegmentSummaries omit them).
+    insights = _insights()
+    # roofSegmentStats are positional — segmentIndex refers to the array index.
+    stats_by_index = {
+        i: s for i, s in enumerate(insights["solarPotential"]["roofSegmentStats"])
+    }
+
+    potential = SolarPotential.from_building_insights(insights)
+
+    assert potential is not None
+    segment = potential.configurations[0].segments[0]  # segment_index == 1
+    expected = stats_by_index[segment.segment_index]
+    assert segment.area_m2 is not None
+    assert abs(segment.area_m2 - expected["stats"]["areaMeters2"]) <= 1e-4
+    assert segment.center_latitude is not None
+    assert segment.center_longitude is not None
+    assert abs(segment.center_latitude - expected["center"]["latitude"]) <= 1e-9
+    assert abs(segment.center_longitude - expected["center"]["longitude"]) <= 1e-9
+
+
 def test_projection_largest_config_spans_all_segments() -> None:
     # Arrange
     insights = _insights()
 
     # Act
     potential = SolarPotential.from_building_insights(insights)
+    assert potential is not None
     largest = potential.configurations[-1]
 
     # Assert — the 49-panel rung spans all four roof planes
diff --git a/tests/domain/modelling/test_solar_recommendation.py b/tests/domain/modelling/test_solar_recommendation.py
index 9d51b0d83..43337ab51 100644
--- a/tests/domain/modelling/test_solar_recommendation.py
+++ b/tests/domain/modelling/test_solar_recommendation.py
@@ -44,7 +44,9 @@ class _StubProducts(ProductRepository):
 def _solar_potential() -> SolarPotential:
     with _FIXTURE.open(encoding="utf-8") as handle:
         data: dict[str, Any] = json.load(handle)
-    return SolarPotential.from_building_insights(data)
+    potential = SolarPotential.from_building_insights(data)
+    assert potential is not None
+    return potential
 
 
 def _eligible_house() -> EpcPropertyData:
@@ -87,6 +89,10 @@ def test_each_option_overlay_installs_per_segment_arrays_and_ensures_export() ->
         assert overlay is not None
         assert overlay.is_dwelling_export_capable is True
         assert overlay.pv_diverter_present is True
+        # A newly-installed recommended array is connected to the dwelling's own
+        # meter, so it must be tagged pv_connection=2 ("connected") — the value
+        # the SAP cascade credits. (1 = present-but-not-connected → zero credit.)
+        assert overlay.pv_connection == 2
         arrays = overlay.photovoltaic_arrays
         assert arrays is not None and len(arrays) >= 1
         assert all(isinstance(a, PhotovoltaicArray) for a in arrays)
diff --git a/tests/domain/property/test_property_landlord_overlay.py b/tests/domain/property/test_property_landlord_overlay.py
index 47e9c02ab..69e71b499 100644
--- a/tests/domain/property/test_property_landlord_overlay.py
+++ b/tests/domain/property/test_property_landlord_overlay.py
@@ -91,3 +91,30 @@ def test_baseline_wall_is_unchanged_when_no_override_applies() -> None:
 
     # Assert
     assert main.wall_construction == 4
+
+
+def test_effective_epc_folds_overrides_onto_a_predicted_epc() -> None:
+    # Arrange — an EPC-less Property whose EPC was neighbour-synthesised, plus a
+    # solid-brick/internal-insulation wall override the landlord knows.
+    overlay = wall_overlay_for("Solid brick, with internal insulation", 0)
+    assert overlay is not None
+    prop = Property(
+        identity=_identity(), predicted_epc=_epc(), landlord_overrides=[overlay]
+    )
+
+    # Act
+    main = _main_wall(prop.effective_epc)
+
+    # Assert — the override's codes correct the synthesised main wall, exactly as
+    # they do on the lodged path (the cohort fills the rest).
+    assert main.wall_construction == 3
+    assert main.wall_insulation_type == 3
+
+
+def test_effective_epc_predicted_is_returned_as_is_when_no_overrides() -> None:
+    # Arrange — a predicted Property with no Landlord Overrides.
+    predicted = _epc()
+    prop = Property(identity=_identity(), predicted_epc=predicted)
+
+    # Act / Assert — the synthesised EPC is returned untouched (same object).
+    assert prop.effective_epc is predicted
diff --git a/tests/domain/property/test_property_physical_state_changed.py b/tests/domain/property/test_property_physical_state_changed.py
new file mode 100644
index 000000000..238f32e91
--- /dev/null
+++ b/tests/domain/property/test_property_physical_state_changed.py
@@ -0,0 +1,53 @@
+"""`Property.physical_state_changed` — the Rebaselining trigger (b)/(c) signal.
+
+True when the Effective EPC was assembled from something other than a pristine
+lodged cert: Landlord Overrides folded on, Site Notes superseding the cert, or an
+EPC-Prediction synthesis. The PropertyBaselineOrchestrator threads it into the
+Rebaseliner so an overridden / predicted SAP >= 10.2 picture rebaselines off the
+calculator instead of echoing the (now-stale) accredited lodged figure.
+"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import Any
+
+from datatypes.epc.domain.epc_property_data import EpcPropertyData
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+from domain.epc.property_overlays.wall_type_overlay import wall_overlay_for
+from domain.property.property import Property, PropertyIdentity
+
+_JSON_SAMPLES = Path(__file__).resolve().parents[3] / "backend/epc_api/json_samples"
+
+
+def _epc() -> EpcPropertyData:
+    raw: dict[str, Any] = json.loads(
+        (_JSON_SAMPLES / "RdSAP-Schema-21.0.0" / "epc.json").read_text()
+    )
+    return EpcPropertyDataMapper.from_api_response(raw)
+
+
+def _identity() -> PropertyIdentity:
+    return PropertyIdentity(
+        portfolio_id=1, postcode="A0 0AA", address="1 Some Street", uprn=12345
+    )
+
+
+def test_pristine_lodged_cert_with_no_overrides_is_unchanged() -> None:
+    prop = Property(identity=_identity(), epc=_epc())
+    assert prop.physical_state_changed is False
+
+
+def test_lodged_cert_with_landlord_overrides_is_changed() -> None:
+    overlay = wall_overlay_for("Solid brick, with internal insulation", 0)
+    assert overlay is not None
+    prop = Property(identity=_identity(), epc=_epc(), landlord_overrides=[overlay])
+    assert prop.physical_state_changed is True
+
+
+def test_predicted_property_is_changed() -> None:
+    # A neighbour-synthesised picture is assembled, not a real lodged cert, so it
+    # rebaselines off the calculator (trigger (c)).
+    prop = Property(identity=_identity(), epc=None, predicted_epc=_epc())
+    assert prop.physical_state_changed is True
diff --git a/tests/domain/property_baseline/test_calculator_rebaseliner.py b/tests/domain/property_baseline/test_calculator_rebaseliner.py
index 000d28ef8..f6002bd48 100644
--- a/tests/domain/property_baseline/test_calculator_rebaseliner.py
+++ b/tests/domain/property_baseline/test_calculator_rebaseliner.py
@@ -113,6 +113,75 @@ def test_a_10_2_cert_keeps_the_lodged_figures() -> None:
     assert result.sap_result is sap_result
 
 
+def test_a_10_2_cert_with_changed_physical_state_uses_the_calculator() -> None:
+    # Arrange — a 10.2 cert whose physical state was changed by Landlord
+    # Overrides (or assembled by Prediction): the accredited lodged figure no
+    # longer describes the dwelling, so the calculator's output becomes Effective
+    # Performance (Rebaselining trigger (b)/(c), CONTEXT.md), not the lodged value.
+    sap_result = _sap_result(
+        sap_score=67, co2_kg_per_yr=2100.0, primary_energy_kwh_per_m2=210.0
+    )
+    rebaseliner = CalculatorRebaseliner(_StubCalculator(sap_result))
+    epc = _epc(sap_version=10.2)
+
+    # Act
+    result = rebaseliner.rebaseline(
+        property_id=10,
+        effective_epc=epc,
+        lodged=_lodged(),
+        physical_state_changed=True,
+    )
+
+    # Assert — calculated Performance wins, tagged physical_state_changed.
+    assert result.effective == Performance(
+        sap_score=67, epc_band=Epc.D, co2_emissions=2.1, primary_energy_intensity=210
+    )
+    assert result.reason == "physical_state_changed"
+    assert result.sap_result is sap_result
+
+
+def test_a_pre_10_2_cert_with_changed_physical_state_is_reason_both() -> None:
+    # Arrange — both triggers fire: a superseded methodology (sap_version < 10.2)
+    # AND a physical-state change. The calculator wins (as for either alone); the
+    # reason records both.
+    rebaseliner = CalculatorRebaseliner(_StubCalculator(_sap_result(sap_score=65)))
+    epc = _epc(sap_version=10.0)
+
+    # Act
+    result = rebaseliner.rebaseline(
+        property_id=10,
+        effective_epc=epc,
+        lodged=_lodged(),
+        physical_state_changed=True,
+    )
+
+    # Assert
+    assert result.effective.sap_score == 65
+    assert result.reason == "both"
+
+
+def test_a_10_2_cert_with_changed_state_does_not_log_divergence(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    # Arrange — when we ADOPT the calculator output (physical state changed),
+    # there is no accredited lodged figure to validate against, so no divergence
+    # warning is emitted (calc 90 vs lodged 72 would otherwise warn).
+    rebaseliner = CalculatorRebaseliner(_StubCalculator(_sap_result(sap_score=90)))
+    epc = _epc(sap_version=10.2)
+
+    # Act
+    with caplog.at_level(logging.WARNING):
+        rebaseliner.rebaseline(
+            property_id=42,
+            effective_epc=epc,
+            lodged=_lodged(),
+            physical_state_changed=True,
+        )
+
+    # Assert — no divergence log when the calculator output is adopted.
+    assert caplog.records == []
+
+
 def test_a_10_2_cert_logs_divergence_when_the_calculator_disagrees(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
@@ -145,3 +214,40 @@ def test_a_calculator_raise_propagates_and_aborts() -> None:
     # Act / Assert
     with pytest.raises(UnmappedSapCode):
         rebaseliner.rebaseline(property_id=10, effective_epc=epc, lodged=_lodged())
+
+
+def test_full_sap_mapped_cert_rebaselines_off_the_lodged_sap_2012_value() -> None:
+    # Regression for the portfolio-796 "impossible downgrade" (ADR-0037). A
+    # full-SAP cert lodges SAP 2012 (sap_version 9.92). The WIP mapper dropped
+    # sap_version, so the rebaseliner couldn't fire trigger (a) and Effective
+    # stayed stuck on the lodged SAP-2012 value while the plan modelled SAP-10.2.
+    # End-to-end: a real full-SAP fixture, once mapped, now carries sap_version
+    # so Effective becomes the calc output (not lodged).
+    import json
+    import os
+
+    from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+    from datatypes.epc.schema.sap_schema_17_1 import SapSchema17_1
+    from datatypes.epc.schema.tests.helpers import from_dict
+
+    fixtures = os.path.join(
+        os.path.dirname(__file__),
+        "../../../datatypes/epc/schema/tests/fixtures",
+    )
+    with open(os.path.join(fixtures, "sap_17_1.json")) as f:
+        raw = json.load(f)
+    effective_epc = EpcPropertyDataMapper.from_sap_schema_17_1(
+        from_dict(SapSchema17_1, raw)
+    )
+    # The mapped cert carries the lodged SAP 2012 version, gating the flip.
+    assert effective_epc.sap_version == 9.92
+    rebaseliner = CalculatorRebaseliner(_StubCalculator(_sap_result(sap_score=70)))
+
+    # Act
+    result = rebaseliner.rebaseline(
+        property_id=1, effective_epc=effective_epc, lodged=_lodged()
+    )
+
+    # Assert — Effective is the SAP-10.2 calc (70), NOT the lodged SAP-2012 (72).
+    assert result.reason == "pre_sap10"
+    assert result.effective.sap_score == 70
diff --git a/tests/domain/property_baseline/test_portfolio_796_override_rebaseline.py b/tests/domain/property_baseline/test_portfolio_796_override_rebaseline.py
new file mode 100644
index 000000000..618ed35ff
--- /dev/null
+++ b/tests/domain/property_baseline/test_portfolio_796_override_rebaseline.py
@@ -0,0 +1,192 @@
+"""Regression: portfolio-796 properties whose Landlord Overrides moved them off
+their lodged headline must rebaseline off the calculator (not echo the lodged
+figure).
+
+These seven properties (a hit-list Khalim raised) each displayed an Effective
+baseline equal to their *lodged accredited* SAP — band B/C — while the modelling
+plan modelled the override-applied picture (often a different band), producing an
+incoherent "already B, post-works C/D" plan. The cause: the rebaseliner kept the
+lodged figure for any SAP >= 10.2 cert, ignoring the overrides (and, for the
+predicted ones, the synthetic headline). The fix: when a physical-state trigger
+fired — Landlord Overrides or Prediction — the calculator output IS the Effective
+baseline, so the displayed baseline and the plan agree.
+
+This test pins, per property, that (1) its real override set still resolves to
+overlays and trips `physical_state_changed`, and (2) the rebaseliner adopts the
+calculator output (reason physical_state_changed / both), not the lodged figure.
+A representative end-to-end case scores a real cert through the live calculator.
+"""
+
+from __future__ import annotations
+
+import json
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Literal
+
+import pytest
+
+from datatypes.epc.domain.epc_property_data import EpcPropertyData
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+from domain.property.property import Property, PropertyIdentity
+from domain.property_baseline.calculator_rebaseliner import CalculatorRebaseliner
+from domain.property_baseline.performance import lodged_performance
+from domain.sap10_calculator.calculator import Sap10Calculator
+from repositories.property.landlord_override_overlays import overlays_from
+from repositories.property.property_overrides_reader import (
+    ResolvedPropertyOverride,
+    ResolvedPropertyOverrides,
+)
+
+_JSON_SAMPLES = Path(__file__).resolve().parents[3] / "backend/epc_api/json_samples"
+
+
+def _cert() -> EpcPropertyData:
+    """A real, scorable lodged cert used as the base picture (and, for the
+    predicted cases, as a stand-in synthesised EPC)."""
+    raw: dict[str, Any] = json.loads(
+        (_JSON_SAMPLES / "RdSAP-Schema-21.0.0" / "epc.json").read_text()
+    )
+    return EpcPropertyDataMapper.from_api_response(raw)
+
+
+def _overrides(*pairs: tuple[str, str]) -> ResolvedPropertyOverrides:
+    return ResolvedPropertyOverrides(
+        rows=tuple(
+            ResolvedPropertyOverride(
+                override_component=component, building_part=0, override_value=value
+            )
+            for component, value in pairs
+        )
+    )
+
+
+@dataclass(frozen=True)
+class _Case:
+    pid: int
+    source: Literal["lodged", "predicted"]
+    overrides: ResolvedPropertyOverrides
+
+
+# The seven properties' real Landlord Override sets (as stored in
+# property_overrides), captured verbatim from portfolio 796.
+_CASES: tuple[_Case, ...] = (
+    _Case(725634, "lodged", _overrides(
+        ("main_heating_system", "Electric storage heaters, slimline"),
+        ("wall_type", "Cavity wall, as built, no insulation (assumed)"),
+        ("main_fuel", "electricity"),
+        ("water_heating", "Electric immersion, electricity"),
+        ("glazing", "Double glazing, pre-2002"),
+        ("property_type", "House"),
+        ("built_form_type", "Mid-Terrace"),
+        ("construction_age_band", "E"),
+    )),
+    _Case(721534, "lodged", _overrides(
+        ("main_heating_system", "Gas boiler, combi"),
+        ("wall_type", "System built, as built, no insulation (assumed)"),
+        ("main_fuel", "mains gas"),
+        ("water_heating", "From main system, mains gas"),
+        ("glazing", "Double glazing, 2002 or later"),
+        ("property_type", "Flat"),
+        ("built_form_type", "Mid-Terrace"),
+        ("construction_age_band", "K"),
+    )),
+    _Case(721985, "predicted", _overrides(
+        ("main_heating_system", "Gas boiler, combi"),
+        ("wall_type", "Solid brick, as built, no insulation (assumed)"),
+        ("main_fuel", "mains gas"),
+        ("water_heating", "From main system, mains gas"),
+        ("glazing", "Double glazing, 2002 or later"),
+        ("property_type", "Maisonette"),
+        ("built_form_type", "Semi-Detached"),
+        ("construction_age_band", "B"),
+    )),
+    _Case(721993, "predicted", _overrides(
+        ("main_heating_system", "Gas boiler, combi"),
+        ("wall_type", "Solid brick, as built, no insulation (assumed)"),
+        ("main_fuel", "mains gas"),
+        ("water_heating", "From main system, mains gas"),
+        ("glazing", "Single glazing"),
+        ("property_type", "Maisonette"),
+        ("built_form_type", "Semi-Detached"),
+        ("construction_age_band", "B"),
+    )),
+    _Case(735096, "predicted", _overrides(
+        ("main_heating_system", "Gas boiler, regular"),
+        ("wall_type", "Cavity wall, as built, insulated (assumed)"),
+        ("main_fuel", "electricity"),
+        ("water_heating", "Electric immersion, electricity"),
+        ("glazing", "Double glazing, 2002 or later"),
+        ("property_type", "Flat"),
+        ("built_form_type", "Enclosed Mid-Terrace"),
+        ("construction_age_band", "K"),
+    )),
+    _Case(735220, "predicted", _overrides(
+        ("main_heating_system", "Gas boiler, regular"),
+        ("wall_type", "Cavity wall, as built, insulated (assumed)"),
+        ("main_fuel", "electricity"),
+        ("water_heating", "Electric immersion, electricity"),
+        ("glazing", "Double glazing, 2002 or later"),
+        ("property_type", "Flat"),
+        ("built_form_type", "Enclosed Mid-Terrace"),
+        ("construction_age_band", "J"),
+    )),
+    _Case(739060, "predicted", _overrides(
+        ("main_heating_system", "Gas CPSU"),
+        ("wall_type", "System built, as built, no insulation (assumed)"),
+        ("main_fuel", "mains gas (community)"),
+        ("water_heating", "From main system, mains gas"),
+        ("glazing", "Double glazing, pre-2002"),
+        ("property_type", "Flat"),
+        ("built_form_type", "Mid-Terrace"),
+        ("construction_age_band", "K"),
+    )),
+)
+
+
+def _property_for(case: _Case) -> Property:
+    overlays = overlays_from(case.overrides)
+    identity = PropertyIdentity(
+        portfolio_id=796, postcode="A0 0AA", address="", uprn=case.pid
+    )
+    if case.source == "lodged":
+        return Property(identity=identity, epc=_cert(), landlord_overrides=overlays)
+    return Property(
+        identity=identity, epc=None, predicted_epc=_cert(), landlord_overrides=overlays
+    )
+
+
+@pytest.mark.parametrize("case", _CASES, ids=lambda c: str(c.pid))
+def test_override_set_resolves_and_trips_physical_state_changed(case: _Case) -> None:
+    # The stored override values must still resolve to overlays (a renamed enum
+    # value would silently stop overriding), and the resulting Property must trip
+    # the Rebaselining trigger (b)/(c) — the signal that stops the baseline
+    # echoing the lodged headline.
+    overlays = overlays_from(case.overrides)
+    assert overlays, f"property {case.pid}: no override resolved to an overlay"
+    assert _property_for(case).physical_state_changed is True
+
+
+@pytest.mark.parametrize("case", _CASES, ids=lambda c: str(c.pid))
+def test_property_rebaselines_off_the_calculator_not_the_lodged_headline(
+    case: _Case,
+) -> None:
+    # The load-bearing guarantee: with a physical-state change, the Effective
+    # baseline is the calculator's scoring of EPC + overrides — so the displayed
+    # baseline and the modelled plan derive from the same picture and agree.
+    prop = _property_for(case)
+    effective_epc = prop.effective_epc
+    lodged = lodged_performance(effective_epc)
+    rebaseliner = CalculatorRebaseliner(Sap10Calculator())
+
+    result = rebaseliner.rebaseline(
+        case.pid,
+        effective_epc,
+        lodged,
+        physical_state_changed=prop.physical_state_changed,
+    )
+
+    assert result.reason in ("physical_state_changed", "both")
+    assert result.sap_result is not None
+    # Effective is the calculator's output, not the lodged accredited headline.
+    assert result.effective.sap_score == result.sap_result.sap_score
diff --git a/tests/domain/sap10_calculator/rdsap/test_cert_to_inputs.py b/tests/domain/sap10_calculator/rdsap/test_cert_to_inputs.py
index 24d594f73..b643bf0d3 100644
--- a/tests/domain/sap10_calculator/rdsap/test_cert_to_inputs.py
+++ b/tests/domain/sap10_calculator/rdsap/test_cert_to_inputs.py
@@ -38,7 +38,9 @@ from datatypes.epc.domain.epc_property_data import (
 from domain.sap10_ml.tests._fixtures import (
     make_building_part,
     make_floor_dimension,
+    make_main_heating_detail,
     make_minimal_sap10_epc,
+    make_pv_array,
     make_sap_heating,
     make_window,
 )
@@ -64,6 +66,7 @@ from domain.sap10_calculator.rdsap.cert_to_inputs import (
     _TABLE_4G_DEFAULT_MEV_SFP_W_PER_L_PER_S,  # pyright: ignore[reportPrivateUsage]
     dimensions_from_cert,
     _table_12_factor_fuel_code,  # pyright: ignore[reportPrivateUsage]
+    _table_12a_system_for_main,  # pyright: ignore[reportPrivateUsage]
     _is_electric_main,  # pyright: ignore[reportPrivateUsage]
     _is_heat_network_electric_main,  # pyright: ignore[reportPrivateUsage]
     _is_electric_water,  # pyright: ignore[reportPrivateUsage]
@@ -79,10 +82,12 @@ from domain.sap10_calculator.rdsap.cert_to_inputs import (
     _pv_overshading_factor,  # pyright: ignore[reportPrivateUsage]
     _pv_pitch_deg,  # pyright: ignore[reportPrivateUsage]
     _responsiveness,  # pyright: ignore[reportPrivateUsage]
+    _secondary_fuel_code,  # pyright: ignore[reportPrivateUsage]
     _secondary_fuel_cost_gbp_per_kwh,  # pyright: ignore[reportPrivateUsage]
     _secondary_heating_fraction_for_category,  # pyright: ignore[reportPrivateUsage]
     _section_12_4_4_summer_immersion_applies,  # pyright: ignore[reportPrivateUsage]
     _separately_timed_dhw,  # pyright: ignore[reportPrivateUsage]
+    _main_2_space_heating_fuel_cost_gbp_per_kwh,  # pyright: ignore[reportPrivateUsage]
     _space_heating_fuel_cost_gbp_per_kwh,  # pyright: ignore[reportPrivateUsage]
     _tariff_high_low_rates_p_per_kwh,  # pyright: ignore[reportPrivateUsage]
     _thermal_mass_parameter_kj_per_m2_k,  # pyright: ignore[reportPrivateUsage]
@@ -471,6 +476,158 @@ def test_heat_network_primary_loss_uses_p1_h3_all_months_per_table_3() -> None:
     assert abs(sum(wh_result.primary_loss_monthly_kwh) - expected_primary_kwh) <= 1e-6
 
 
+def test_dual_main_system_2_costed_at_its_own_fuel_price() -> None:
+    # Arrange — SAP 10.2 §10a: main heating system 2's fuel cost (worksheet
+    # line (213)) is billed at ITS OWN Table 32 fuel price, separately from
+    # main system 1's (211). A dwelling with main-1 = electric room heaters
+    # (SAP 691, fuel 30 standard electricity @ 13.19 p/kWh) and main-2 =
+    # wood-log room heaters (SAP 633, fuel 6 @ 4.23 p/kWh), 50/50 split, on a
+    # single-rate meter (so the §10a standard path runs). Pre-fix the main-2
+    # column reused main-1's electric price, charging the wood at 13.19 p/kWh
+    # and grossly over-costing electric+wood dwellings (cert 10032957680
+    # "Copse Cottage" SAP 21.75 -> 45.94 vs lodged 45).
+    main_1_electric = MainHeatingDetail(
+        has_fghrs=False,
+        main_fuel_type=30,  # standard electricity
+        heat_emitter_type=0,
+        emitter_temperature="NA",
+        main_heating_control=2106,
+        main_heating_category=10,
+        sap_main_heating_code=691,
+        main_heating_fraction=50,
+    )
+    main_2_wood = MainHeatingDetail(
+        has_fghrs=False,
+        main_fuel_type=6,  # wood logs — Table 32 = 4.23 p/kWh
+        heat_emitter_type=0,
+        emitter_temperature="NA",
+        main_heating_control=2106,
+        main_heating_category=10,
+        sap_main_heating_code=633,
+        main_heating_fraction=50,
+    )
+    epc = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=4,
+        country_code="ENG",
+        sap_building_parts=[make_building_part(construction_age_band="D")],
+        sap_heating=make_sap_heating(
+            main_heating_details=[main_1_electric, main_2_wood],
+        ),
+    )
+
+    # Act
+    inputs = cert_to_inputs(epc)
+    result = Sap10Calculator().calculate(epc)
+    fc = inputs.fuel_cost
+    main_2_kwh = result.main_2_heating_fuel_kwh_per_yr
+
+    # Assert — main-2 wood billed at 4.23 p/kWh (0.0423 £/kWh), NOT main-1's
+    # electric 13.19 p/kWh. (213) main_2_total_cost = kWh × wood price.
+    assert main_2_kwh > 0.0
+    assert abs(fc.main_2_total_cost_gbp - main_2_kwh * 0.0423) <= 1e-6
+    # And explicitly NOT the electric rate (the pre-fix value).
+    assert abs(fc.main_2_total_cost_gbp - main_2_kwh * 0.1319) > 1.0
+
+
+def test_off_peak_main_2_non_electric_priced_at_own_fuel() -> None:
+    # Arrange — legacy/off-peak scalar path. Main 1 = electric room heaters,
+    # Main 2 = WOOD logs (fuel 6, Table 32 4.23 p/kWh). On an off-peak tariff
+    # the second main's space-heating rate must be its OWN fuel (wood flat
+    # rate), not main 1's electric rate — SAP 10.2 §10a worksheet (213).
+    from domain.sap10_calculator.tables.table_12a import Tariff
+
+    main_1_electric = MainHeatingDetail(
+        has_fghrs=False, main_fuel_type=30, heat_emitter_type=0,
+        emitter_temperature="NA", main_heating_control=2106,
+        main_heating_category=10, sap_main_heating_code=691,
+        main_heating_fraction=50,
+    )
+    main_2_wood = MainHeatingDetail(
+        has_fghrs=False, main_fuel_type=6, heat_emitter_type=0,
+        emitter_temperature="NA", main_heating_control=2106,
+        main_heating_category=10, sap_main_heating_code=633,
+        main_heating_fraction=50,
+    )
+    epc = make_minimal_sap10_epc(
+        sap_building_parts=[make_building_part(construction_age_band="D")],
+        sap_heating=make_sap_heating(
+            main_heating_details=[main_1_electric, main_2_wood],
+        ),
+    )
+
+    # Act
+    rate = _main_2_space_heating_fuel_cost_gbp_per_kwh(
+        epc, Tariff.SEVEN_HOUR, SAP_10_2_SPEC_PRICES
+    )
+
+    # Assert — wood flat rate 4.23 p/kWh, not the off-peak electric rate.
+    assert abs(rate - 0.0423) <= 1e-9
+
+
+def test_off_peak_main_2_electric_keeps_main_1_scalar() -> None:
+    # Arrange — both mains electric on an off-peak tariff. The electric
+    # second-main off-peak Table 12a split is the deferred §10a slice, so the
+    # helper keeps main 1's space-heating scalar (no per-system split here) to
+    # avoid regressing the off-peak electric cohort.
+    from domain.sap10_calculator.tables.table_12a import Tariff
+
+    main_1 = MainHeatingDetail(
+        has_fghrs=False, main_fuel_type=29, heat_emitter_type=0,
+        emitter_temperature="NA", main_heating_control=2106,
+        main_heating_category=10, sap_main_heating_code=691,
+        main_heating_fraction=50,
+    )
+    main_2 = MainHeatingDetail(
+        has_fghrs=False, main_fuel_type=29, heat_emitter_type=0,
+        emitter_temperature="NA", main_heating_control=2106,
+        main_heating_category=10, sap_main_heating_code=691,
+        main_heating_fraction=50,
+    )
+    epc = make_minimal_sap10_epc(
+        sap_building_parts=[make_building_part(construction_age_band="D")],
+        sap_heating=make_sap_heating(main_heating_details=[main_1, main_2]),
+    )
+
+    # Act — main 2's rate equals main 1's space-heating scalar.
+    main_2_rate = _main_2_space_heating_fuel_cost_gbp_per_kwh(
+        epc, Tariff.SEVEN_HOUR, SAP_10_2_SPEC_PRICES
+    )
+    main_1_rate = _space_heating_fuel_cost_gbp_per_kwh(
+        main_1, Tariff.SEVEN_HOUR, SAP_10_2_SPEC_PRICES
+    )
+
+    # Assert
+    assert abs(main_2_rate - main_1_rate) <= 1e-9
+
+
+def test_elmhurst_main_2_solid_sap_code_derives_house_coal_not_main_1_fuel() -> None:
+    # Arrange — Elmhurst §14.1 Main Heating2 lodges SAP code 633 (solid-fuel
+    # room heater) with NO "Fuel Type" cell, on a dwelling whose Main 1 is
+    # electric. The second main must derive its fuel from the SAP code's
+    # Table 4a category (solid → house coal 11, per the documented modal sub-
+    # fuel convention), NOT inherit Main 1's electric fuel — otherwise the
+    # solid second main is billed at the electric rate (simulated case 47
+    # dual-main over-cost: SAP 37.81 -> 55.09).
+    from datatypes.epc.surveys.elmhurst_site_notes import MainHeating2
+    from datatypes.epc.domain.mapper import (  # pyright: ignore[reportPrivateUsage]
+        _map_elmhurst_main_heating_2,
+    )
+
+    mh2 = MainHeating2(
+        fuel_type="",  # §14.1 omits the Fuel Type cell
+        percentage_of_heat=50,
+        main_heating_sap_code=633,  # solid-fuel room heater
+    )
+
+    # Act — Main 1 resolved to electricity (fallback_fuel_type=30).
+    detail = _map_elmhurst_main_heating_2(mh2, fallback_fuel_type=30)
+
+    # Assert — house coal (11), not the inherited electric 30.
+    assert detail is not None
+    assert detail.main_fuel_type == 11
+
+
 def test_cylinder_thermostat_assumed_present_per_sap_9_4_9() -> None:
     # Arrange — SAP 10.2 §9.4.9 (PDF p.32): "A cylinder thermostat should be
     # assumed to be present when the domestic hot water is obtained from a
@@ -680,6 +837,103 @@ def test_integrated_storage_heater_408_bills_table_12a_grid1_high_rate_fraction(
     assert abs(inputs.space_heating_fuel_cost_gbp_per_kwh - 0.07458) <= 1e-9
 
 
+def test_off_peak_storage_cert_surfaces_billing_meter_flag_and_main_fraction() -> None:
+    # Arrange — the same integrated-storage (code 408) Economy-7 cert. For
+    # ADR-0014 Bill Derivation, cert_to_inputs surfaces the Off-Peak Meter flag
+    # and the main-heating High-Rate Fraction — the SAME Table 12a Grid 1 value
+    # (0.20) the SAP cost path blends above, so the bill never re-derives it.
+    from dataclasses import replace
+
+    main = MainHeatingDetail(
+        has_fghrs=False,
+        main_fuel_type=29,  # electricity
+        heat_emitter_type=1,
+        emitter_temperature=1,
+        main_heating_control=2401,
+        main_heating_category=7,  # electric storage heaters
+        sap_main_heating_code=408,
+    )
+    base = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=4,
+        country_code="ENG",
+        sap_building_parts=[make_building_part(construction_age_band="E")],
+        sap_heating=make_sap_heating(main_heating_details=[main]),
+    )
+    epc = replace(
+        base,
+        sap_energy_source=replace(base.sap_energy_source, meter_type="1"),  # Dual
+    )
+
+    # Act
+    inputs = cert_to_inputs(epc)
+
+    # Assert — whole-meter off-peak, main heating high-rate fraction 0.20.
+    assert inputs.is_off_peak_meter is True
+    assert inputs.main_heating_high_rate_fraction == 0.20
+    # Lighting / appliances / cooking + pumps bill at the 7-hour Table 12a
+    # Grid 2 ALL_OTHER_USES high-rate fraction (0.90), mostly at the day rate.
+    assert inputs.other_electricity_high_rate_fraction == 0.90
+    assert inputs.pumps_fans_high_rate_fraction == 0.90
+
+
+def test_off_peak_immersion_unlodged_type_defaults_to_dual_table13_blend() -> None:
+    # Arrange — electric immersion DHW (WHC 903) on a Dual / Economy-7 (7-hour)
+    # meter with a cylinder present (Normal / 110 L), but the cert does NOT lodge
+    # `immersion_heating_type`. RdSAP 10 §10.5 (PDF p.54) assumes a DUAL immersion
+    # on a dual / off-peak meter, so the hot-water scalar rate must be the SAP
+    # 10.2 Table 13 DUAL high/low blend (a small high-rate fraction at 15.29 p +
+    # the remainder at 5.50 p), NOT the 100%-low-rate (5.50 p) fallback that an
+    # unlodged type previously triggered. The fallback under-costs the DHW and
+    # over-rates the dwelling — cf. uprn_10022893721, whose Elmhurst worksheet
+    # bills the immersion at a 0.1386 high-rate fraction, not 100% low.
+    from dataclasses import replace
+
+    main = MainHeatingDetail(
+        has_fghrs=False,
+        main_fuel_type=29,  # electricity
+        heat_emitter_type=0,
+        emitter_temperature=1,
+        main_heating_control=2401,
+        main_heating_category=7,  # electric storage heaters
+        sap_main_heating_code=401,
+    )
+    base = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=4,
+        country_code="ENG",
+        has_hot_water_cylinder=True,
+        sap_building_parts=[make_building_part(construction_age_band="E")],
+        sap_heating=make_sap_heating(
+            main_heating_details=[main],
+            water_heating_code=903,        # electric immersion
+            water_heating_fuel=29,         # off-peak electricity
+            cylinder_size=2,               # Normal / 110 L
+            immersion_heating_type=None,   # UNLODGED -> assume dual on off-peak
+        ),
+    )
+    epc = replace(
+        base,
+        sap_energy_source=replace(base.sap_energy_source, meter_type="1"),  # Dual
+    )
+
+    # Act
+    inputs = cert_to_inputs(epc)
+
+    # Assert — the Table 13 DUAL blend applied, not the 100%-low-rate fallback.
+    rate = inputs.hot_water_fuel_cost_gbp_per_kwh
+    assert rate > 0.0550 + 1e-6   # NOT the 100%-low-rate bug value (5.50 p/kWh)
+    assert rate < 0.0900          # a small DUAL high-rate fraction, not single (~11 p)
+    # ADR-0014 Bill Derivation surfaces the SAME Table 13 fraction it bills the
+    # HW cost at: a small day-rate share (0 < frac < 0.3), not 0.0 (all-night
+    # fallback) nor 1.0 (single rate). Mirrors the cost-rate split exactly.
+    assert 0.0 < inputs.hot_water_high_rate_fraction < 0.3
+    # Back out the fraction the cost rate used and confirm the surfaced one
+    # matches it: rate_p = frac×15.29 + (1−frac)×5.50.
+    _frac_from_cost = (rate * 100.0 - 5.50) / (15.29 - 5.50)
+    assert inputs.hot_water_high_rate_fraction == pytest.approx(_frac_from_cost)
+
+
 def test_non_integrated_storage_heater_bills_100_percent_low_rate() -> None:
     # Arrange — same off-peak storage cert but SAP code 401 ("other storage
     # heaters"): Table 12a Grid 1 gives a 0.00 high-rate fraction → the heat
@@ -756,6 +1010,49 @@ def test_no_system_electric_heaters_assumed_code_699_bills_direct_acting_split()
     assert abs(inputs.space_heating_fuel_cost_gbp_per_kwh - 0.1109) <= 1e-9
 
 
+def test_electric_boilers_191_195_map_to_distinct_table_12a_grid1_rows() -> None:
+    # Arrange — SAP 10.2 Table 4a electric boilers (PDF p.170) do NOT share
+    # one Table 12a Grid 1 row (PDF p.191). Read exactly: code 191
+    # "Direct-acting electric boiler (a)" → 7-hour 0.90 / 10-hour 0.50 (its
+    # OWN row, NOT the 1.00/0.50 "Other direct-acting electric heating"
+    # room-heater row); code 195 "Electric water storage boiler" → the
+    # "Electric dry core or water storage boiler" row → 7-hour 0.00 (charged
+    # wholly off-peak = 100% low rate, identical to the None fallback). This
+    # pins the spec-correct 0.00 so 195 can't be mis-"fixed" up to a wrong
+    # direct-acting fraction.
+    from domain.sap10_calculator.tables.table_12a import (
+        Table12aSystem,
+        Tariff,
+        space_heating_high_rate_fraction,
+    )
+
+    def _electric_boiler_main(code: int) -> MainHeatingDetail:
+        return MainHeatingDetail(
+            has_fghrs=False,
+            main_fuel_type=29,  # electricity
+            heat_emitter_type=0,
+            emitter_temperature=1,
+            main_heating_control=2106,
+            main_heating_category=2,  # boiler
+            sap_main_heating_code=code,
+        )
+
+    # Act
+    direct_acting = _table_12a_system_for_main(_electric_boiler_main(191))
+    storage = _table_12a_system_for_main(_electric_boiler_main(195))
+
+    # Assert — distinct rows with their published fractions.
+    assert direct_acting is Table12aSystem.DIRECT_ACTING_ELECTRIC_BOILER
+    assert storage is Table12aSystem.ELECTRIC_DRY_CORE_OR_WATER_STORAGE
+    assert (
+        space_heating_high_rate_fraction(direct_acting, Tariff.SEVEN_HOUR) == 0.90
+    )
+    assert (
+        space_heating_high_rate_fraction(direct_acting, Tariff.TEN_HOUR) == 0.50
+    )
+    assert space_heating_high_rate_fraction(storage, Tariff.SEVEN_HOUR) == 0.00
+
+
 def test_heat_network_distribution_electricity_per_sap_10_2_appendix_c_3_2() -> None:
     # Arrange — heat-network main (Table 4a code 301 = community heating,
     # category 6). SAP 10.2 Appendix C §C3.2 (PDF p.51): distribution
@@ -1102,6 +1399,59 @@ def test_secondary_fraction_fires_when_secondary_lodged_via_description_only() -
     assert abs(description_lodged - 0.10) <= 1e-9
 
 
+def test_secondary_fraction_fires_for_unheated_habitable_rooms_per_appendix_a22() -> None:
+    # Arrange — SAP 10.2 Appendix A.2.2: when the main system does not heat
+    # every habitable room (heated rooms < habitable rooms), the unheated
+    # rooms take an assumed portable-electric secondary heater, so the Table
+    # 11 0.10 fraction is costed EVEN WITH no lodged secondary. A gas boiler
+    # main (cat 2, not forced-secondary) with no secondary lodged returns 0.0
+    # normally, but 0.10 once `unheated_habitable_rooms=True`. Worksheet-
+    # validated on simulated case 46 (heated 4 < habitable 7): the assumed
+    # secondary lifted our SAP from 39 to 29 (Elmhurst 30).
+    from domain.sap10_calculator.rdsap.cert_to_inputs import _secondary_fraction  # pyright: ignore[reportPrivateUsage]
+
+    main = _gas_boiler_detail()  # cat 2, code 102 — not forced-secondary
+
+    # Act
+    all_rooms_heated = _secondary_fraction(main, None, unheated_habitable_rooms=False)
+    has_unheated = _secondary_fraction(main, None, unheated_habitable_rooms=True)
+
+    # Assert
+    assert all_rooms_heated == 0.0
+    assert abs(has_unheated - 0.10) <= 1e-9
+
+
+def test_has_unheated_habitable_rooms_prefers_flag_and_guards_zero_sentinel() -> None:
+    # Arrange — `_has_unheated_habitable_rooms` prefers the lodged
+    # `any_unheated_rooms` flag; its room-count fallback must NOT trigger on a
+    # `heated_rooms_count == 0` "not provided" sentinel (gov-API), only on a
+    # real positive heated count below the habitable count.
+    import dataclasses
+
+    from domain.sap10_calculator.rdsap.cert_to_inputs import (  # pyright: ignore[reportPrivateUsage]
+        _has_unheated_habitable_rooms,
+    )
+
+    base = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2, country_code="ENG",
+    )
+
+    flag_true = dataclasses.replace(base, any_unheated_rooms=True)
+    flag_false = dataclasses.replace(base, any_unheated_rooms=False)
+    count_unheated = dataclasses.replace(
+        base, any_unheated_rooms=None, heated_rooms_count=4, habitable_rooms_count=7
+    )
+    zero_sentinel = dataclasses.replace(
+        base, any_unheated_rooms=None, heated_rooms_count=0, habitable_rooms_count=5
+    )
+
+    # Act / Assert
+    assert _has_unheated_habitable_rooms(flag_true) is True
+    assert _has_unheated_habitable_rooms(flag_false) is False
+    assert _has_unheated_habitable_rooms(count_unheated) is True
+    assert _has_unheated_habitable_rooms(zero_sentinel) is False
+
+
 def test_main_heating_fraction_missing_falls_back_to_table11_default() -> None:
     # Arrange — when main_heating_fraction isn't lodged AND the cert
     # has a secondary system lodged, Table 11's 0.10 default still
@@ -1554,6 +1904,90 @@ def test_ventilation_from_cert_applies_table_5_default_when_lodged_zero() -> Non
     )
 
 
+def test_ventilation_from_cert_dmev_takes_lodged_zero_fans_not_table_5_default() -> None:
+    # Arrange — on a dwelling with a whole-house mechanical EXTRACT system
+    # (dMEV → EXTRACT_OR_PIV_OUTSIDE) the lodged intermittent extract-fan
+    # count (7a) is explicit: a lodged 0 means 0 (the dMEV is the
+    # ventilation), NOT "unknown". The SAP 10.2 §2 Table 5 age-band default
+    # must NOT be substituted as it would on a NATURALLY ventilated dwelling.
+    # Worksheet-proven: two dMEV builds of cert 000565 — "simulated case 48"
+    # lodges (7a)=0 and Elmhurst's worksheet uses 0 (→ SAP 57 exact), while
+    # the original 000565 fixture lodges (7a)=2 and Elmhurst uses 2. The same
+    # Table 5 default that this age-G NATURAL case applies (1 fan above) must
+    # be suppressed here.
+    from domain.sap10_calculator.worksheet.ventilation import (
+        MechanicalVentilationKind,
+    )
+    age_g_part = make_building_part(
+        floor_dimensions=[
+            make_floor_dimension(total_floor_area_m2=45.0, floor=0),
+            make_floor_dimension(total_floor_area_m2=45.0, floor=1),
+        ],
+        construction_age_band='G',
+    )
+    base = _typical_semi_detached_epc()
+    epc_dmev = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=4,
+        region_code="1",
+        sap_building_parts=[age_g_part],
+        sap_windows=base.sap_windows,
+        sap_heating=base.sap_heating,
+        sap_ventilation=SapVentilation(
+            extract_fans_count=0,
+            mechanical_ventilation_kind=(
+                MechanicalVentilationKind.EXTRACT_OR_PIV_OUTSIDE.name
+            ),
+        ),
+    )
+
+    # Act
+    v = ventilation_from_cert(epc_dmev)
+
+    # Assert — 0 intermittent fans contribute 0 to (8), so openings ACH = 0
+    # (no Table 5 age-G default fan); the mechanical system is applied via
+    # the separate (23a) 0.5 system air-change rate instead.
+    assert abs(v.openings_ach) <= 1e-9, (
+        f"openings ACH {v.openings_ach:.6f} should be 0 for a dMEV cert "
+        f"lodging 0 fans (no Table 5 default substituted)"
+    )
+    assert v.mv_system_ach == 0.5
+
+
+def test_ventilation_from_cert_uses_lodged_fans_below_age_default_not_floored() -> None:
+    # Arrange — RdSAP 10 §4.1 Table 5 (PDF p.28): "Number of extract fans if
+    # known; if unknown: [age-band default]." The default is an UNKNOWN-
+    # fallback, NOT a floor — a genuinely-lodged positive count is used
+    # as-is even when below the age default. An age-H 6-habitable-room
+    # dwelling has a 3-fan default, but a cert lodging 2 fans must use 2,
+    # not be floored up to 3. (Was `max(lodged, default)` → 3, over-counting
+    # ventilation; surfaced on simulated case 46 where it inflated (8) by
+    # one fan = 0.055 ACH and pushed SAP 30 → 29.)
+    age_h_part = make_building_part(
+        floor_dimensions=[
+            make_floor_dimension(total_floor_area_m2=45.0, floor=0),
+            make_floor_dimension(total_floor_area_m2=45.0, floor=1),
+        ],
+        construction_age_band='H',
+    )
+    epc = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=6,  # age H-M, 6-8 rooms → Table 5 default 3
+        region_code="1",
+        sap_building_parts=[age_h_part],
+        sap_ventilation=SapVentilation(extract_fans_count=2),  # lodged 2 < 3
+    )
+
+    # Act
+    v = ventilation_from_cert(epc)
+
+    # Assert — (8) openings ACH uses the lodged 2 fans (20 m³/h), not 3.
+    from domain.sap10_calculator.rdsap.cert_to_inputs import dimensions_from_cert
+    vol = dimensions_from_cert(epc).volume_m3
+    assert abs(v.openings_ach - 20.0 / vol) <= 1e-6
+    assert abs(v.openings_ach - 30.0 / vol) > 1e-6
+
+
 def test_ventilation_from_cert_passes_lodged_ap4_to_pressure_test_ach_per_sap_10_2_section_2_line_18() -> None:
     # Arrange — SAP 10.2 §2 line (17a)/(18) "Air permeability value, AP4
     # (m³/h/m²)": when a Pulse pressure test is lodged the cascade must
@@ -2161,6 +2595,47 @@ def test_is_electric_main_dual_fuel_table_32_code_10_is_not_electric() -> None:
     assert _is_electric_main(community_electric_main) is False
 
 
+def test_dual_fuel_secondary_api_enum_9_prices_as_dual_fuel_not_lpg() -> None:
+    # Arrange — the gov-API lodges secondary fuel enum 9 = "dual fuel (mineral
+    # and wood)", but enum value 9 COLLIDES with the same-valued RdSAP 10
+    # Table 32 / SAP 10.2 Table 12 code 9 = "LPG (bulk, SC11F)". The secondary
+    # cost + CO2/PE paths previously took the same-value lookup (LPG 3.48
+    # p/kWh, CO2 0.241 kg/kWh) instead of translating the enum to the dual-
+    # fuel row (3.99 p/kWh, CO2 0.087) — under-costing the secondary (SAP
+    # over-rate) AND over-counting its CO2 (LPG is fossil; dual fuel is part
+    # wood). Enum 9 is now in `_GOV_API_COLLISION_FUELS`, and both secondary
+    # paths canonicalise (mirroring the main-fuel boundary). SAP 10.2 Table
+    # 12 (p.189) / RdSAP 10 Table 32 (p.95).
+    gas_boiler_main = MainHeatingDetail(
+        has_fghrs=False, main_fuel_type=26, heat_emitter_type=1,
+        emitter_temperature=1, main_heating_control=2106,
+        main_heating_category=2, sap_main_heating_code=102,
+    )
+    dual_fuel_secondary_epc = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=4,
+        country_code="ENG",
+        sap_heating=make_sap_heating(
+            main_heating_details=[gas_boiler_main],
+            secondary_fuel_type=9,  # gov-API enum: dual fuel (mineral + wood)
+            secondary_heating_type=631,
+        ),
+    )
+
+    # Act — the rating-cascade secondary price + the CO2/PE fuel code.
+    secondary_rate_gbp_per_kwh = _secondary_fuel_cost_gbp_per_kwh(
+        dual_fuel_secondary_epc.sap_heating,
+        gas_boiler_main,
+        2,  # standard (single-rate) meter
+        SAP_10_2_SPEC_PRICES,
+    )
+    secondary_factor_code = _secondary_fuel_code(dual_fuel_secondary_epc)
+
+    # Assert — dual fuel 3.99 p/kWh (NOT LPG 3.48) + Table code 10 (NOT 9).
+    assert abs(secondary_rate_gbp_per_kwh - 0.0399) <= 1e-6
+    assert secondary_factor_code == 10
+
+
 def test_is_electric_water_dual_fuel_table_32_code_10_is_not_electric() -> None:
     # Arrange — same API/Table 32 collision as `_is_electric_main` per
     # S0380.136 docstring.
@@ -3440,19 +3915,195 @@ def test_api_mechanical_ventilation_maps_extract_systems_to_cascade_kind() -> No
     )
 
     # Act / Assert — extract / positive-input-from-outside systems carry
-    # the (24c) kind; MV-no-HR carries (24b); natural and PIV-from-loft
-    # stay NATURAL; MVHR (4) is deferred (efficiency not yet plumbed) and
-    # stays NATURAL rather than mis-modelling as MV.
+    # the (24c) kind; MV-no-HR carries (24b); MVHR (4) carries (24a) (its
+    # heat-recovery efficiency is read from PCDB Table 323 in cert_to_
+    # inputs); natural and PIV-from-loft stay NATURAL.
     assert _api_mechanical_ventilation_kind(0) is None          # natural
     assert _api_mechanical_ventilation_kind(1) == "MV"          # MV, no HR
     assert _api_mechanical_ventilation_kind(2) == "EXTRACT_OR_PIV_OUTSIDE"  # MEV dc
     assert _api_mechanical_ventilation_kind(3) == "EXTRACT_OR_PIV_OUTSIDE"  # MEV c
-    assert _api_mechanical_ventilation_kind(4) is None          # MVHR (deferred)
+    assert _api_mechanical_ventilation_kind(4) == "MVHR"        # balanced + HR (24a)
     assert _api_mechanical_ventilation_kind(5) is None          # PIV from loft
     assert _api_mechanical_ventilation_kind(6) == "EXTRACT_OR_PIV_OUTSIDE"  # PIV outside
     assert _api_mechanical_ventilation_kind(None) is None
 
 
+def test_mvhr_system_values_apply_pcdb_wet_room_point_and_table_329_iufs() -> None:
+    # Arrange — simulated case 49 (000565 semi + MVHR + gas combi →
+    # Elmhurst Current SAP 72). The dwelling lodges Vent Axia Sentinel
+    # Kinetic B (PCDB Table 323 index 500140), 2 wet rooms, rigid ducting.
+    # SAP 10.2 §2.6.4 selects the 2-wet-room data point (raw SFP 0.88,
+    # efficiency 91%); the Table 329 system_type-3 in-use factors are SFP
+    # rigid 1.4 + heat-recovery-efficiency-inside-envelope 0.90.
+    import dataclasses
+
+    from domain.sap10_calculator.rdsap.cert_to_inputs import (
+        _mvhr_fan_kwh_per_yr_from_cert,  # pyright: ignore[reportPrivateUsage]
+        _mvhr_system_values,  # pyright: ignore[reportPrivateUsage]
+        dimensions_from_cert,
+    )
+    from tests.domain.sap10_calculator.worksheet import (
+        _elmhurst_worksheet_000565 as _w000565,
+    )
+
+    base = _w000565.build_epc()
+    assert base.sap_ventilation is not None
+    epc = dataclasses.replace(
+        base,
+        mechanical_ventilation_index_number=500140,
+        wet_rooms_count=2,
+        mechanical_vent_duct_type=2,  # rigid
+        sap_ventilation=dataclasses.replace(
+            base.sap_ventilation, mechanical_ventilation_kind="MVHR"
+        ),
+    )
+
+    # Act
+    values = _mvhr_system_values(epc)
+    fan_kwh = _mvhr_fan_kwh_per_yr_from_cert(epc)
+
+    # Assert — worksheet (23c) = 91 × 0.90 = 81.9%; in-use SFP = 0.88 ×
+    # 1.4 = 1.232 W/(l/s). The (230a) fan electricity is in-use SFP ×
+    # 1.22 × V; on the case-49 Summary (V = 276.7275 m³) this is exactly
+    # 415.9325 kWh (verified via run_elmhurst_summary). Here we pin the
+    # formula against this fixture's own volume (its geometry differs).
+    assert values is not None
+    assert abs(values.in_use_efficiency_pct - 81.9) <= 1e-6
+    assert abs(values.in_use_sfp_w_per_l_per_s - 1.232) <= 1e-9
+    expected_fan_kwh = 1.232 * 1.22 * dimensions_from_cert(epc).volume_m3
+    assert abs(fan_kwh - expected_fan_kwh) <= 1e-6
+
+
+def test_mvhr_fan_electricity_bills_at_grid2_fan_fraction_on_off_peak() -> None:
+    # Arrange — an MVHR dwelling on an off-peak tariff. SAP 10.2 Table 12a
+    # Grid 2 (PDF p.191) bills "Fans for mechanical ventilation systems" at
+    # 0.71 (7-hour) / 0.58 (10-hour) high-rate fraction, distinct from "All
+    # other uses" (0.90 / 0.80) which covers circulation pumps + flue fans.
+    # The MVHR fan electricity (230a) was summed into the pumps/fans total
+    # but NOT into the cost-split mech-vent kWh, so on off-peak it billed at
+    # the 0.90/0.80 "all other uses" rate. Worksheet-proven on simulated
+    # case 50 (000565 + MVHR + dual immersion): +£5.87/yr, -0.23 SAP.
+    import dataclasses
+
+    from domain.sap10_calculator.rdsap.cert_to_inputs import (
+        _mvhr_fan_kwh_per_yr_from_cert,  # pyright: ignore[reportPrivateUsage]
+        _tariff_high_low_rates_p_per_kwh,  # pyright: ignore[reportPrivateUsage]
+    )
+    from domain.sap10_calculator.tables.table_12a import (
+        OtherUse,
+        Tariff,
+        other_use_high_rate_fraction,
+    )
+    from tests.domain.sap10_calculator.worksheet import (
+        _elmhurst_worksheet_000565 as _w000565,
+    )
+
+    base = _w000565.build_epc()
+    assert base.sap_ventilation is not None
+    epc = dataclasses.replace(
+        base,
+        mechanical_ventilation_index_number=500140,
+        wet_rooms_count=2,
+        mechanical_vent_duct_type=2,  # rigid
+        sap_ventilation=dataclasses.replace(
+            base.sap_ventilation, mechanical_ventilation_kind="MVHR"
+        ),
+        sap_energy_source=dataclasses.replace(
+            base.sap_energy_source, meter_type="1"  # off-peak (10-hour)
+        ),
+    )
+
+    # Act
+    inputs = cert_to_inputs(epc)
+    rate = inputs.pumps_fans_fuel_cost_gbp_per_kwh
+
+    # Assert — the resolved rate is the kWh-weighted blend of the MVHR fan
+    # portion at the FANS_FOR_MECH_VENT fraction and the remaining pumps at
+    # ALL_OTHER_USES. The presence of the MVHR fan in the split makes it
+    # strictly cheaper than billing the whole bucket at ALL_OTHER_USES.
+    tariff = Tariff.TEN_HOUR
+    high, low = _tariff_high_low_rates_p_per_kwh(tariff)
+    fan_frac = other_use_high_rate_fraction(OtherUse.FANS_FOR_MECH_VENT, tariff)
+    other_frac = other_use_high_rate_fraction(OtherUse.ALL_OTHER_USES, tariff)
+    fan_blend = fan_frac * high + (1.0 - fan_frac) * low
+    other_blend = other_frac * high + (1.0 - other_frac) * low
+    fan_kwh = _mvhr_fan_kwh_per_yr_from_cert(epc)
+    total_kwh = inputs.pumps_fans_kwh_per_yr
+    non_fan_kwh = total_kwh - fan_kwh
+    expected = (
+        (fan_kwh * fan_blend + non_fan_kwh * other_blend) / total_kwh / 100.0
+    )
+    assert rate is not None
+    assert fan_kwh > 0.0
+    assert abs(rate - expected) <= 1e-12
+    assert rate < other_blend / 100.0  # regression guard: fan portion is in the split
+
+
+def test_mvhr_system_values_fall_back_to_table_4g_defaults_without_pcdb_index() -> None:
+    # Arrange — an MVHR cert lodged with NO PCDF index (corpus cert
+    # "Flat 1"). SAP 10.2 Table 4g (PDF p.176): default raw efficiency
+    # 66% + raw SFP 2.0, × the default-data in-use factors (Table 329
+    # system_type 10 — efficiency-inside 0.70, SFP 2.5).
+    import dataclasses
+
+    from domain.sap10_calculator.rdsap.cert_to_inputs import (
+        _mvhr_system_values,  # pyright: ignore[reportPrivateUsage]
+    )
+    from tests.domain.sap10_calculator.worksheet import (
+        _elmhurst_worksheet_000565 as _w000565,
+    )
+
+    base = _w000565.build_epc()
+    assert base.sap_ventilation is not None
+    epc = dataclasses.replace(
+        base,
+        mechanical_ventilation_index_number=None,
+        sap_ventilation=dataclasses.replace(
+            base.sap_ventilation, mechanical_ventilation_kind="MVHR"
+        ),
+    )
+
+    # Act
+    values = _mvhr_system_values(epc)
+
+    # Assert — efficiency 66 × 0.70 = 46.2%; SFP 2.0 × 2.5 = 5.0.
+    assert values is not None
+    assert abs(values.in_use_efficiency_pct - 46.2) <= 1e-6
+    assert abs(values.in_use_sfp_w_per_l_per_s - 5.0) <= 1e-9
+
+
+def test_pcdb_combi_loss_keep_hot_time_clock_returns_explicit_flat_600() -> None:
+    # Arrange — SAP 10.2 Table 3a (PDF p.160): a PCDB combi declaring a
+    # keep-hot facility on a time clock (keep_hot_facility=1, keep_hot_
+    # timer=1) uses the flat 600 × n/365 row. The keep-hot status rides on
+    # the PCDB boiler record, NOT a separate cert field — a non-PCDB combi
+    # has no keep-hot and falls to the "without keep-hot" 600 × fu default.
+    # pcdb_combi_loss_override must return this row EXPLICITLY (it must not
+    # lean on the cascade default, which is now "without keep-hot").
+    # Vaillant Ecotec Pro (PCDB 10328) is the 000490 boiler.
+    from domain.sap10_calculator.rdsap.cert_to_inputs import pcdb_combi_loss_override
+    from domain.sap10_calculator.tables.pcdb import gas_oil_boiler_record
+    from domain.sap10_calculator.worksheet.water_heating import (
+        combi_loss_monthly_kwh_table_3a_keep_hot_time_clock,
+    )
+
+    record = gas_oil_boiler_record(10328)
+    assert record is not None
+    assert record.keep_hot_facility == 1
+    assert record.keep_hot_timer == 1
+    monthly = (200.0,) * 12  # energy content / daily HW unused for this row
+
+    # Act
+    override = pcdb_combi_loss_override(
+        record,
+        energy_content_monthly_kwh=monthly,
+        daily_hot_water_monthly_l_per_day=monthly,
+    )
+
+    # Assert — explicit flat keep-hot row, not None.
+    assert override == combi_loss_monthly_kwh_table_3a_keep_hot_time_clock()
+
+
 def test_api_mechanical_ventilation_unmapped_code_raises() -> None:
     # Arrange — an out-of-range `mechanical_ventilation` integer is a
     # spec-coverage gap: raise rather than silently default to NATURAL
@@ -4308,6 +4959,7 @@ def test_secondary_heating_fraction_for_category_full_table_11_coverage() -> Non
     assert _secondary_heating_fraction_for_category(5) == 0.10
     assert _secondary_heating_fraction_for_category(6) == 0.10
     assert _secondary_heating_fraction_for_category(7) == 0.15
+    assert _secondary_heating_fraction_for_category(8) == 0.10   # was untested
     # Category 9 = warm-air systems (NOT heat pump). A gas/oil warm-air
     # unit is an "All gas, liquid and solid fuel systems" row (0.10);
     # electric warm air is "Other electric systems" (also 0.10) — so 0.10
@@ -4316,6 +4968,7 @@ def test_secondary_heating_fraction_for_category_full_table_11_coverage() -> Non
     # secondary) previously raised UnmappedSapCode here, blocking it.
     assert _secondary_heating_fraction_for_category(9) == 0.10
     assert _secondary_heating_fraction_for_category(10) == 0.20
+    assert _secondary_heating_fraction_for_category(11) == 0.10  # electric ceiling heating (SAP code 701)
     # Absent
     assert _secondary_heating_fraction_for_category(None) == 0.10
     # Lodging present but unmapped → raise
@@ -4799,6 +5452,58 @@ def test_electric_water_heating_factors_use_annual_table_12_on_dual_rate_tariff(
     )
 
 
+def test_whc903_immersion_hw_co2_pe_factors_split_high_low_on_off_peak() -> None:
+    # Arrange — the flat-annual S0380.163 rule (preceding test) was validated
+    # only on HW-from-main "low-rate cost" certs (100% low, no high-rate
+    # split). For whc-903 ELECTRIC IMMERSION the Elmhurst worksheet bills HW
+    # CO2/PE as TWO lines — "Water heating - high rate cost" at the Table
+    # 12d/12e high-rate electricity factor + "low rate cost" at the low-rate
+    # factor — weighted by the SAME Table 13 fraction the COST path applies
+    # (simulated case 50: CO2 high 0.1475 + low 0.1238; PE high 1.5514 + low
+    # 1.4429; frac 0.1009). Our cascade previously applied the flat annual
+    # 0.136 / 1.501 to dual-rate immersion HW too — a spec gap, not a genuine
+    # Elmhurst divergence (case 50 worksheet proves the split). The split
+    # makes both factors fall BELOW the flat annual (the low-rate factor
+    # dominates at ~0.90 weight). Reconciled exactly by the case-50 e2e pin.
+    storage_main = MainHeatingDetail(
+        has_fghrs=False,
+        main_fuel_type=30,
+        heat_emitter_type="",
+        emitter_temperature="",
+        main_heating_control=2401,
+        sap_main_heating_code=402,  # storage heater → off-peak
+        central_heating_pump_age_str="Unknown",
+    )
+    epc = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=4,
+        country_code="ENG",
+        has_hot_water_cylinder=True,
+        sap_building_parts=[make_building_part(construction_age_band="D")],
+        sap_heating=make_sap_heating(
+            water_heating_code=903,  # electric immersion
+            water_heating_fuel=29,
+            cylinder_size=5,
+            immersion_heating_type=1,  # dual immersion
+            main_heating_details=[storage_main],
+        ),
+    )
+    # Unknown meter + dual electric immersion → 7-hour off-peak (§12 trigger).
+    epc.sap_energy_source.meter_type = "Unknown"
+
+    # Act
+    inputs = cert_to_inputs(epc)
+    co2 = inputs.hot_water_co2_factor_kg_per_kwh
+    pe = inputs.hot_water_primary_factor
+
+    # Assert — the Table 13 split is applied, so both factors are a genuine
+    # high/low blend strictly BELOW the flat-annual S0380.163 figures (and
+    # above the all-low-rate bound — not degenerate).
+    assert co2 is not None and pe is not None
+    assert 0.1238 < co2 < 0.136, f"expected split CO2 in (0.1238, 0.136); got {co2}"
+    assert 1.4429 < pe < 1.501, f"expected split PE in (1.4429, 1.501); got {pe}"
+
+
 def test_gas_water_heating_co2_and_pe_factors_pass_through_annual_table_12() -> None:
     # Arrange — RdSAP cert with mains-gas water heating
     # (`water_heating_fuel=26` API mains gas → Table 12 code 1). Per
@@ -4986,7 +5691,10 @@ def test_mid_floor_flat_dwelling_type_zeroes_floor_and_roof_heat_transmission()
     # Arrange — A "Mid-floor flat" has party floor (downstairs flat) and
     # party ceiling (upstairs flat). The mapper must wire DwellingExposure
     # to suppress both channels so the HLC matches what RdSAP-driven
-    # assessor software produces.
+    # assessor software produces. A genuine mid-floor flat lodges
+    # roof_insulation_location="ND" (Not Defined — no roof to insulate, the
+    # ceiling is a party surface), so `_cert_lodges_exposed_roof` does not
+    # fire.
     epc = make_minimal_sap10_epc(
         total_floor_area_m2=_TYPICAL_TFA_M2,
         habitable_rooms_count=4,
@@ -4994,6 +5702,7 @@ def test_mid_floor_flat_dwelling_type_zeroes_floor_and_roof_heat_transmission()
         dwelling_type="Mid-floor flat",
         sap_building_parts=[
             make_building_part(
+                roof_insulation_location="ND",  # party ceiling — no exposed roof
                 floor_dimensions=[
                     make_floor_dimension(total_floor_area_m2=_TYPICAL_TFA_M2, floor=0),
                 ],
@@ -5014,6 +5723,51 @@ def test_mid_floor_flat_dwelling_type_zeroes_floor_and_roof_heat_transmission()
     assert inputs.heat_transmission.walls_w_per_k > 0
 
 
+def test_mid_floor_label_with_determined_roof_insulation_exposes_roof() -> None:
+    # Arrange — gov-API certs lodge `dwelling_type` as the raw assessor
+    # label, which can contradict the lodged fabric. Property 715363
+    # (uprn 6027561) and its sibling 715395 (6027563) lodge
+    # dwelling_type="Mid-floor flat" yet lodge a determined
+    # roof_insulation_location (715363: code 6 = flat roof) over a
+    # "(another dwelling below)" floor — i.e. they are TOP-floor flats
+    # mislabelled mid-floor. Keying roof exposure on the label alone dropped
+    # the roof heat-loss term, under-reading space-heating demand ~32% and
+    # over-reading SAP +7 (calc 81 vs lodged 74). The correctly labelled
+    # top-floor sibling 715871 (6027574), same block + same flat roof,
+    # already computes the lodged 74.
+    #
+    # `roof_insulation_location` is the authoritative per-unit structured
+    # signal: a determined location (an RdSAP code, not "ND") means the unit
+    # has an exposed roof to insulate — unlike roof_construction, which the
+    # gov-API lodges building-wide on every unit.
+    epc = make_minimal_sap10_epc(
+        total_floor_area_m2=_TYPICAL_TFA_M2,
+        habitable_rooms_count=4,
+        region_code="1",
+        dwelling_type="Mid-floor flat",
+        sap_building_parts=[
+            make_building_part(
+                roof_insulation_location=6,  # flat roof — a determined location
+                floor_dimensions=[
+                    make_floor_dimension(total_floor_area_m2=_TYPICAL_TFA_M2, floor=0),
+                ],
+            ),
+        ],
+        sap_heating=make_sap_heating(
+            main_heating_details=[_gas_boiler_detail(sap_main_heating_code=102)],
+        ),
+    )
+
+    # Act
+    inputs = cert_to_inputs(epc)
+
+    # Assert — the floor stays party (dwelling below) but the determined
+    # roof-insulation location exposes the roof, matching the top-floor
+    # sibling.
+    assert inputs.heat_transmission.floor_w_per_k == 0.0
+    assert inputs.heat_transmission.roof_w_per_k > 0
+
+
 def test_top_floor_flat_keeps_roof_drops_floor() -> None:
     # Arrange — Top-floor flat: party floor, external roof.
     epc = make_minimal_sap10_epc(
@@ -5187,16 +5941,15 @@ def test_pcdb_combi_loss_override_preserves_separate_dhw_tests_1_routing_to_tabl
 
 
 def test_pcdb_combi_loss_override_returns_none_or_raises_for_untested_or_storage_combis() -> None:
-    """The override gate returns None — letting the worksheet fall back
-    to Table 3a row 3 (600 × n/365) — whenever the PCDB record lodges
-    keep-hot with a time clock but has insufficient EN 13203 lab data,
-    or sits in a storage / FGHRS row (Table 3b/3c rows 2-5, deferred
-    until a fixture exercises them).
+    """The override gate dispatches the PCDB record's keep-hot fields to
+    the matching Table 3a row, or returns None for a storage / FGHRS row
+    (Table 3b/3c rows 2-5, deferred until a fixture exercises them).
 
-    Per Slice S0380.21: keep_hot_facility ∈ {None, 0} dispatches to
-    Table 3a row 1 (`600 × fu × n/365`), keep_hot_facility=1 + no
-    timer dispatches to row 4 (`900 × n/365`). Only the electric
-    keep-hot variants (keep_hot_facility ∈ {2, 3}) now raise
+    keep_hot_facility ∈ {None, 0} → Table 3a row 1 (`600 × fu × n/365`,
+    without keep-hot); keep_hot_facility=1 + timer=1 → row 3 (`600 ×
+    n/365`, EXPLICIT — the cascade default is now "without keep-hot");
+    keep_hot_facility=1 + no timer → row 4 (`900 × n/365`). Only the
+    electric keep-hot variants (keep_hot_facility ∈ {2, 3}) raise
     `UnresolvedPcdbCombiLoss` — Table 3a Note 2 fuel-split deferred."""
     # Arrange — a minimal record skeleton, mutated per scenario via
     # dataclasses.replace.
@@ -5223,7 +5976,7 @@ def test_pcdb_combi_loss_override_returns_none_or_raises_for_untested_or_storage
         loss_factor_f1_kwh_per_day=0.5,
         loss_factor_f2_kwh_per_day=0.001,
         rejected_factor_f3_per_litre=0.00014,
-        keep_hot_facility=1,  # lodges keep-hot → cascade default 600 is correct
+        keep_hot_facility=1,  # lodges keep-hot, time clock → flat 600 row
         keep_hot_timer=1,
         raw=(),
     )
@@ -5237,17 +5990,19 @@ def test_pcdb_combi_loss_override_returns_none_or_raises_for_untested_or_storage
         )
         is None
     )
-    # separate_dhw_tests=0 + keep_hot_facility=1 + timer=1 → None (no
-    # PCDB DHW test data, but cascade's row 3 default IS the right spec
-    # row → return None and let the cascade default fire).
-    assert (
-        pcdb_combi_loss_override(
-            replace(base, separate_dhw_tests=0),
-            energy_content_monthly_kwh=energy_content,
-            daily_hot_water_monthly_l_per_day=daily_hw,
-        )
-        is None
+    # separate_dhw_tests=0 + keep_hot_facility=1 + timer=1 → Table 3a row 3
+    # (600 × n/365, keep-hot time clock) returned EXPLICITLY. The cascade
+    # default is now "without keep-hot" (600 × fu), so the keep-hot row
+    # must be delivered here, not leaned on the default.
+    from domain.sap10_calculator.worksheet.water_heating import (
+        combi_loss_monthly_kwh_table_3a_keep_hot_time_clock,
     )
+
+    assert pcdb_combi_loss_override(
+        replace(base, separate_dhw_tests=0),
+        energy_content_monthly_kwh=energy_content,
+        daily_hot_water_monthly_l_per_day=daily_hw,
+    ) == combi_loss_monthly_kwh_table_3a_keep_hot_time_clock()
     # separate_dhw_tests=0 + keep_hot_facility=None → Table 3a row 1
     # (600 × fu × n/365) — Slice S0380.21 dispatch.
     row_1 = pcdb_combi_loss_override(
@@ -7581,3 +8336,90 @@ def test_index_less_mev_applies_table_4g_note_3_default_data_iuf() -> None:
     # 2.5x the raw-0.8 value, not the raw default.
     assert fan_kwh > 0.0
     assert abs(fan_kwh - expected) <= 1e-9
+
+
+def test_heat_pump_water_scop_not_applied_to_separate_immersion_dhw() -> None:
+    # Arrange — SAP 10.2 Appendix N3.7(a): a heat pump's PCDB water
+    # efficiency (η_water) applies to the DHW ONLY when the cylinder is
+    # heated BY the heat pump. A separate electric immersion (WHC 903) heats
+    # the water at 100% regardless of the space-heating system, so the HP's
+    # water SCOP must NOT leak onto it. Invariant: a WHC-903 immersion's
+    # hot-water fuel is INDEPENDENT of the main — a heat-pump main and a gas-
+    # boiler main yield the SAME immersion fuel (both 100%, no primary loss).
+    # Before the fix the APM override set η_water = 187.5% × 0.6 in-use =
+    # 112.5% on the HP cert, under-counting its immersion fuel. Worksheet-
+    # validated on simulated case 45: water (62) = 2130.26 kWh at η_water=100%,
+    # not 2130.26 / 1.125 = 1893.57.
+    hp_main = make_main_heating_detail(
+        main_fuel_type=29,  # electricity
+        heat_emitter_type=1,
+        main_heating_category=4,  # heat pump
+        main_heating_index_number=100053,  # PCDB Table 362 ASHP (ECODAN 5 kW)
+        main_heating_data_source=1,
+    )
+    boiler_main = make_main_heating_detail(
+        main_fuel_type=26,  # mains gas
+        heat_emitter_type=1,
+        main_heating_category=2,  # gas boiler
+        sap_main_heating_code=102,
+    )
+
+    def _immersion_epc(main: MainHeatingDetail) -> EpcPropertyData:
+        return make_minimal_sap10_epc(
+            total_floor_area_m2=_TYPICAL_TFA_M2,
+            habitable_rooms_count=4,
+            country_code="ENG",
+            has_hot_water_cylinder=True,
+            sap_heating=make_sap_heating(
+                main_heating_details=[main],
+                water_heating_code=903,  # separate electric immersion
+                water_heating_fuel=30,  # standard electricity
+                cylinder_size=2,
+                cylinder_insulation_type=1,
+                cylinder_insulation_thickness_mm=25,
+            ),
+        )
+
+    # Act
+    hp_fuel = cert_to_inputs(_immersion_epc(hp_main)).hot_water_kwh_per_yr
+    boiler_fuel = cert_to_inputs(_immersion_epc(boiler_main)).hot_water_kwh_per_yr
+
+    # Assert — the immersion DHW fuel is identical whether the space main is a
+    # heat pump or a gas boiler (the HP water SCOP does not apply to it).
+    assert hp_fuel > 0.0
+    assert abs(hp_fuel - boiler_fuel) <= 1e-6
+
+
+def test_pv_credited_only_when_connected_to_dwelling_meter_per_pv_connection() -> None:
+    # RdSAP 10 §11.1 / SAP 10.2 Appendix M: PV-generated electricity is
+    # included in a dwelling's assessment ONLY IF the array is connected to
+    # the dwelling's own electricity meter; an unconnected (communal /
+    # separately-metered) array contributes nothing to the dwelling's energy
+    # cost, CO2 or primary energy. The gov-API `sap_energy_source.pv_connection`
+    # enum encodes this: 0 = no PV, 1 = present but NOT connected, 2 = connected.
+    #
+    # Validated on the RdSAP-21.0.1 corpus (57 PV certs): every pv_connection=1
+    # cert reconciles BETTER without the credit (MAE 4.48 -> 1.22, 0/5 need it),
+    # while pv_connection=2 certs need it (MAE 0.98 vs 10.29 without). Accredited
+    # Elmhurst proof: an identical dwelling rates SAP 87 with "Connected to
+    # Dwelling = Yes" (credit -£167) vs SAP 74 with "No" (credit £0).
+    array = [make_pv_array(peak_power=3.0)]
+
+    def _gen(pv_connection: int) -> float:
+        epc = make_minimal_sap10_epc(
+            dwelling_type="Mid-terrace house",
+            total_floor_area_m2=70.0,
+            habitable_rooms_count=3,
+            country_code="ENG",
+            photovoltaic_arrays=array,
+            is_dwelling_export_capable=True,
+            pv_connection=pv_connection,
+        )
+        return cert_to_inputs(epc).pv_generation_kwh_per_yr
+
+    # pv_connection=2 (connected to the dwelling's meter) → PV serves the
+    # dwelling and is credited.
+    assert _gen(2) > 0.0
+    # pv_connection=1 (present but NOT connected to the dwelling's meter) →
+    # the array contributes nothing to this dwelling's SAP.
+    assert _gen(1) == 0.0
diff --git a/tests/domain/sap10_calculator/test_calculator.py b/tests/domain/sap10_calculator/test_calculator.py
index dba25409c..7ab7d3c0c 100644
--- a/tests/domain/sap10_calculator/test_calculator.py
+++ b/tests/domain/sap10_calculator/test_calculator.py
@@ -165,6 +165,37 @@ def test_fuel_codes_and_pv_export_thread_unchanged_onto_sap_result() -> None:
     assert abs(result.pv_exported_kwh_per_yr - 850.0) <= 1e-9
 
 
+def test_off_peak_meter_flag_and_high_rate_fractions_thread_onto_sap_result() -> None:
+    """The Off-Peak Meter flag + per-end-use High-Rate Fractions surface on
+    SapResult unchanged (ADR-0014). Output-only metadata for Bill Derivation's
+    day/night split — they must thread byte-identical from CalculatorInputs
+    through `calculate_sap_from_inputs` and NOT perturb the SAP cost/score."""
+    # Arrange — an off-peak dwelling: storage heating all-night (0.0), HW immersion
+    # all-night (0.0), other uses 0.90 / pumps 0.71 (7-hour Grid-2 fractions).
+    inputs = replace(
+        _baseline_inputs(),
+        is_off_peak_meter=True,
+        main_heating_high_rate_fraction=0.0,
+        main_2_heating_high_rate_fraction=0.5,
+        secondary_heating_high_rate_fraction=1.0,
+        hot_water_high_rate_fraction=0.0,
+        pumps_fans_high_rate_fraction=0.71,
+        other_electricity_high_rate_fraction=0.90,
+    )
+
+    # Act
+    result = calculate_sap_from_inputs(inputs)
+
+    # Assert — threaded unchanged.
+    assert result.is_off_peak_meter is True
+    assert result.main_heating_high_rate_fraction == 0.0
+    assert result.main_2_heating_high_rate_fraction == 0.5
+    assert result.secondary_heating_high_rate_fraction == 1.0
+    assert result.hot_water_high_rate_fraction == 0.0
+    assert result.pumps_fans_high_rate_fraction == 0.71
+    assert result.other_electricity_high_rate_fraction == 0.90
+
+
 def test_pv_export_collapses_none_input_to_zero_on_sap_result() -> None:
     """`pv_exported_kwh_per_yr` is 0.0 (not None) on SapResult for no-PV.
 
@@ -270,6 +301,28 @@ def test_calculator_returns_twelve_month_breakdown_and_plausible_sap_score() ->
     )
 
 
+def test_sap_score_continuous_floored_at_1_for_degenerate_high_cost() -> None:
+    # Arrange — SAP 10.2 §13 / RdSAP 10 §13: the SAP rating is floored at 1
+    # ("if the result of the calculation is less than 1, the rating is 1").
+    # Drive the cost so high that the raw ECF formula returns a negative SAP
+    # (a degenerate dwelling, e.g. a cert lodged at the floor of 1); both the
+    # integer AND the continuous score must clamp to 1 rather than emit a
+    # physically impossible negative rating.
+    inputs = replace(
+        _baseline_inputs(),
+        space_heating_fuel_cost_gbp_per_kwh=5.0,
+        hot_water_fuel_cost_gbp_per_kwh=5.0,
+        other_fuel_cost_gbp_per_kwh=5.0,
+    )
+
+    # Act
+    result = calculate_sap_from_inputs(inputs)
+
+    # Assert — raw SAP would be < 1 here; the floor holds on both outputs.
+    assert result.sap_score == 1
+    assert abs(result.sap_score_continuous - 1.0) <= 1e-9
+
+
 def test_calculate_exposes_dimensions_intermediates() -> None:
     # Arrange — P5 trace mode: `result.intermediate` must surface the
     # worksheet-named dimensions variables for per-section diffing
diff --git a/tests/domain/sap10_calculator/test_pcdb_table_323_lookup.py b/tests/domain/sap10_calculator/test_pcdb_table_323_lookup.py
new file mode 100644
index 000000000..22be55c4b
--- /dev/null
+++ b/tests/domain/sap10_calculator/test_pcdb_table_323_lookup.py
@@ -0,0 +1,105 @@
+"""Tests for the runtime PCDB Table 323 (Centralised MEV and MVHR) lookup.
+
+The lookup loads pcdb_table_323_centralised_mev_mvhr.jsonl at import time
+and caches a typed `MvhrRecord` per pcdb_id. `cert_to_inputs` invokes
+`mvhr_record(pcdb_id)` to obtain the per-wet-room test points (SFP +
+heat-recovery efficiency), selects the data point matching the dwelling's
+wet-room count (SAP 10.2 §2.6.4: "MVHR ... SFP is a single value
+depending on the number of wet rooms"), and applies the PCDB Table 329
+in-use factors before feeding the (23c)/(230a) cascade.
+
+Field positions are documented in PCDF Spec Rev 6b §A.18 (Format 426);
+pcdb10.dat (header `$323,431,...`) carries Format 431, which compresses
+each per-configuration test group to a (num_wet_rooms, flow_l_per_s,
+sfp_w_per_l_per_s, efficiency_pct) tuple.
+
+Reference: BRE PCDB pcdb10.dat (April 2026); PCDF Spec Rev 6b §A.18;
+SAP 10.2 specification (14-03-2025) §2.6.4/§2.6.6.
+"""
+
+from __future__ import annotations
+
+from domain.sap10_calculator.tables.pcdb import (
+    mv_in_use_factors_record,
+    mvhr_record,
+)
+
+
+def test_mvhr_record_returns_verified_vent_axia_500140_header() -> None:
+    """Vent Axia Sentinel Kinetic B, PCDB index 500140 — the MVHR unit of
+    the worksheet-ground-truthed simulated case 49 (000565 semi + MVHR +
+    gas combi → Elmhurst Current SAP 72).
+
+    Header fields cross-referenced against pcdb10.dat:
+        brand_name:       "Vent Axia"
+        model_name:       "Sentinel Kinetic B"
+        main_type:        3 (balanced whole-house MV per PCDF §A.18 field 11)
+        duct_type_tested: 2 (rigid per PCDF §A.18 field 13)
+    """
+    # Arrange / Act
+    record = mvhr_record(500140)
+
+    # Assert
+    assert record is not None
+    assert record.pcdb_id == 500140
+    assert record.brand_name == "Vent Axia"
+    assert record.model_name == "Sentinel Kinetic B"
+    assert record.main_type == 3
+    assert record.duct_type_tested == 2
+
+
+def test_mvhr_record_500140_data_point_selected_by_wet_rooms() -> None:
+    """SAP 10.2 §2.6.4 selects the MVHR SFP/efficiency by the dwelling's
+    wet-room count. Record 500140 lodges five wet-room configurations;
+    the case-49 dwelling (000565, 2 wet rooms) resolves to the group whose
+    leading field is 2 → flow 21.0 l/s, SFP 0.88 W/(l/s), efficiency 91%
+    (the values echoed on the U985 worksheet section 2).
+    """
+    # Arrange / Act
+    record = mvhr_record(500140)
+
+    # Assert
+    assert record is not None
+    by_wet = {p.num_wet_rooms: p for p in record.data_points}
+    assert set(by_wet.keys()) == {1, 2, 3, 4, 5}
+    # Worksheet ground truth: 2 wet rooms → SFP 0.88, efficiency 91%.
+    assert by_wet[2].flow_rate_l_per_s == 21.0
+    assert by_wet[2].sfp_w_per_l_per_s == 0.88
+    assert by_wet[2].efficiency_pct == 91.0
+    # The 1-wet-room point is distinct (lower flow / SFP, same efficiency).
+    assert by_wet[1].flow_rate_l_per_s == 15.0
+    assert by_wet[1].sfp_w_per_l_per_s == 0.76
+    assert by_wet[1].efficiency_pct == 91.0
+
+
+def test_mvhr_record_returns_none_for_unknown_pcdb_id() -> None:
+    """An index not in Table 323 returns None so callers fall back to the
+    SAP 10.2 Table 4g default MVHR data (raw SFP 2.0, efficiency 66%)."""
+    # Arrange / Act
+    record = mvhr_record(99999999)
+
+    # Assert
+    assert record is None
+
+
+def test_table_329_decodes_mvhr_efficiency_in_use_factor_for_balanced_mv() -> None:
+    """PCDB Table 329 (Format 432) system_type 3 (balanced whole-house MV)
+    carries the MVHR heat-recovery efficiency in-use factor for ducts
+    inside the heated envelope = 0.90 (case-49 worksheet (23c) = 91 × 0.90
+    = 81.9%), plus the rigid/flexible SFP in-use factors 1.4 / 1.7.
+
+    The default-data row (system_type 10) carries the SAP 10.2 Table 4g
+    default heat-recovery in-use factor 0.70 in the same column — a
+    cross-check that the decoded column is the efficiency factor.
+    """
+    # Arrange / Act
+    balanced = mv_in_use_factors_record(3)
+    default = mv_in_use_factors_record(10)
+
+    # Assert
+    assert balanced is not None
+    assert balanced.sfp_iuf_rigid_no_scheme == 1.4
+    assert balanced.sfp_iuf_flexible_no_scheme == 1.7
+    assert balanced.mvhr_efficiency_iuf_inside_no_scheme == 0.9
+    assert default is not None
+    assert default.mvhr_efficiency_iuf_inside_no_scheme == 0.7
diff --git a/tests/domain/sap10_calculator/test_real_cert_sap_accuracy.py b/tests/domain/sap10_calculator/test_real_cert_sap_accuracy.py
index 89bcee3df..5575384f4 100644
--- a/tests/domain/sap10_calculator/test_real_cert_sap_accuracy.py
+++ b/tests/domain/sap10_calculator/test_real_cert_sap_accuracy.py
@@ -228,6 +228,16 @@ _EXPECTATIONS: Final[tuple[RealCertExpectation, ...]] = (
         cert_num="7608-9066-7346-5236-4944",
         sap_score=83,
     ),
+    # UPRN 10093116330 — SAP-Schema-17.1, FULL-SAP 2017 mains-gas combi
+    # 2-storey SEMI-DETACHED HOUSE (Emsworth, TFA 73 m²), same 10093116xxx street
+    # / boiler PCDB 17505. Lodged 83; engine 82. Elmhurst worksheet 78 (evidence
+    # saved). The +4 is the documented full-SAP→RdSAP residual. Build clean.
+    RealCertExpectation(
+        schema="SAP-Schema-17.1",
+        sample="uprn_10093116330",
+        cert_num="8318-7437-5660-3332-6922",
+        sap_score=82,
+    ),
     # UPRN 10002468137 → cert 0215-2818-7357-9703-2145. RdSAP-Schema-17.1,
     # all-electric high-heat-retention storage heaters on Economy 7, solid-
     # brick uninsulated end-terrace. Validated against Elmhurst RdSAP10 on
@@ -246,6 +256,399 @@ _EXPECTATIONS: Final[tuple[RealCertExpectation, ...]] = (
         cert_num="0215-2818-7357-9703-2145",
         sap_score=61,
     ),
+    # UPRN 100021943298 → cert 0498-6963-7270-0822-1980. SAP-Schema-16.1 — a
+    # reduced-field (RdSAP-shaped) ground-floor FLAT, band B (1900-1929), solid
+    # brick with internal insulation, mains-gas COMBI (PCDB 10328 Vaillant Ecotec
+    # Pro 28), double glazed, TFA 78 m². New-schema coverage: mapped via the
+    # dedicated `from_sap_schema_16_1` → `_normalize_sap_schema_16_x` →
+    # `from_rdsap_schema_17_1`. Lodged 72 (old 2012 assessment); engine 76.
+    # Built in Elmhurst RdSAP10 on the mapped inputs (evidence saved:
+    # elmhurst_summary.pdf / elmhurst_worksheet.pdf): Elmhurst worksheet SAP 75 —
+    # engine within ~1 (continuous 75.70 vs 75), the tightest agreement in the
+    # cohort because this is reduced-field (both sides use RdSAP age-band/
+    # description U-values, not measured). Boiler set to the cert's exact PCDB
+    # 10328 via the search dialog; control 2106 (CBE programmer + room stat +
+    # TRVs); water from primary (combi, no cylinder). The ~0.7 residual is minor
+    # RdSAP defaults (wall thickness 280 vs 300 mm, internal-insulation thickness
+    # Unknown vs lodged 50 mm). PINNED to the observed 76 — mapping untuned.
+    RealCertExpectation(
+        schema="SAP-Schema-16.1",
+        sample="uprn_100021943298",
+        cert_num="0498-6963-7270-0822-1980",
+        sap_score=76,
+    ),
+    # UPRN 10096028301 → cert 0390-3321-6060-2405-7985. SAP-Schema-19.1.0 — a
+    # FULL-SAP ground-floor FLAT (band M 2023+, mains-gas COMBI Ideal Logic Combi
+    # PCDB 17929, decentralised MEV, measured AP50 3.5, TFA 73 m²). New-schema
+    # coverage: mapped via the dedicated `from_sap_schema_19_1_0` (parses with the
+    # 17.1 dataclass, delegates to from_sap_schema_17_1). Lodged 85; engine 82.
+    # Built in Elmhurst RdSAP10 on the mapped inputs (evidence saved:
+    # elmhurst_summary.pdf / elmhurst_worksheet.pdf): Elmhurst worksheet SAP 82 —
+    # engine EXACTLY matches (82.11 vs 82), and engine-on-Elmhurst's-own-parsed-
+    # inputs is 82.16 ≈ 82, so the calculator is confirmed faithful on identical
+    # inputs. Boiler set to the cert's exact PCDB 17929 via the search dialog;
+    # control 2106 (CBE); water from primary (combi); MEV on; AP50 Blower Door 3.5.
+    # The −3 vs lodged 85 is the documented full-SAP→RdSAP gap: the engine uses the
+    # cert's MEASURED U (wall 0.24 / floor 0.13, WORSE than RdSAP band-M defaults)
+    # + MEV priced as extract loss not heat recovery. PINNED to the observed 82 —
+    # mapping untuned; engine == Elmhurst.
+    RealCertExpectation(
+        schema="SAP-Schema-19.1.0",
+        sample="uprn_10096028301",
+        cert_num="0390-3321-6060-2405-7985",
+        sap_score=82,
+    ),
+    # UPRN 44012843 → cert 0775-2898-6628-9594-8005. SAP-Schema-16.3 — a
+    # reduced-field (RdSAP-shaped) ground-floor FLAT, band K (2007-2011), cavity
+    # insulated, mains-gas REGULAR boiler (PCDB 9895 Ideal icos HE15) + cylinder,
+    # double glazed, TFA 55 m². New-schema coverage via the dedicated
+    # `from_sap_schema_16_3` → `_normalize_sap_schema_16_x` → from_rdsap_schema_17_1.
+    # Lodged 81; engine 79. Built in Elmhurst RdSAP10 on the mapped inputs
+    # (evidence saved: elmhurst_summary.pdf / elmhurst_worksheet.pdf): Elmhurst
+    # worksheet SAP 78 — engine within ~1 (continuous 78.82 vs 78), and engine-on-
+    # Elmhurst's-own-parsed-inputs is 78.48 ≈ 78 → calculator confirmed faithful.
+    # Boiler set to the cert's exact PCDB 9895 via the search dialog; control 2106
+    # (CBE); regular boiler + cylinder (Large, foam, 50 mm), water from primary.
+    # The −2 vs lodged 81 is reduced-field RdSAP defaults. PINNED to the observed
+    # 79 — mapping untuned.
+    RealCertExpectation(
+        schema="SAP-Schema-16.3",
+        sample="uprn_44012843",
+        cert_num="0775-2898-6628-9594-8005",
+        sap_score=79,
+    ),
+    # UPRN 10023444324 → cert 8501-5064-6739-1407-0163. SAP-Schema-17.0 — a
+    # FULL-SAP ground-floor FLAT (band M, mains-gas COMBI Ideal Logic+ combi 35
+    # PCDB 16211, decentralised MEV, measured AP50 3.2, lodged party wall 6.43 m,
+    # TFA 50 m²). Full-SAP shape ≡ 17.1, dispatched via from_sap_schema_17_1.
+    # Lodged 82; engine 80. Built in Elmhurst RdSAP10 on the mapped inputs
+    # (evidence saved: elmhurst_summary.pdf / elmhurst_worksheet.pdf): Elmhurst
+    # worksheet SAP 80 — engine EXACTLY matches (80.13 vs 80); engine-on-Elmhurst's-
+    # own-parsed-inputs 81.03 ≈ 80 → calculator faithful. Boiler set to the cert's
+    # exact PCDB 16211 via the search dialog; control 2106 (CBE); water from primary
+    # (combi); MEV on; AP50 Blower Door 3.2; party wall 6.43 m entered. The −2 vs
+    # lodged 82 is the documented full-SAP→RdSAP gap (measured U 0.2/0.1 + MEV
+    # extract loss). PINNED to the observed 80 — mapping untuned; engine == Elmhurst.
+    RealCertExpectation(
+        schema="SAP-Schema-17.0",
+        sample="uprn_10023444324",
+        cert_num="8501-5064-6739-1407-0163",
+        sap_score=80,
+    ),
+    # UPRN 10023444320 → cert 0868-6045-7331-4376-0914. SAP-Schema-17.0 — FULL-SAP
+    # MID-FLOOR FLAT (sibling of 10023444324, same block / combi PCDB 16211 / MEV),
+    # band M, no party wall, floor + roof both to other dwellings, TFA 50.68 m².
+    # Lodged 81; engine 81. Built in Elmhurst RdSAP10 (evidence saved): Elmhurst
+    # worksheet 82 — engine within ~1 (81.38 vs 82); engine-on-Elmhurst-inputs 82.46
+    # ≈ 82 → calculator faithful. Boiler PCDB 16211 via search; control 2106 (CBE);
+    # water from primary (combi); MEV on; AP50 Blower Door 3.09; mid-floor (floor =
+    # another dwelling below). PINNED to the observed 81 — mapping untuned.
+    RealCertExpectation(
+        schema="SAP-Schema-17.0",
+        sample="uprn_10023444320",
+        cert_num="0868-6045-7331-4376-0914",
+        sap_score=81,
+    ),
+    # UPRN 10090844932 → cert 0646-3008-6208-0619-6204. RdSAP-Schema-20.0.0 —
+    # END-TERRACE HOUSE, 2-storey, band L (2012-2022), cavity insulated, pitched
+    # roof 250 mm loft insulation, mains-gas COMBI (PCDB 10327 Vaillant Ecotec Plus
+    # 831), double glazed, lodged party wall 4.93 m, TFA 74.7 m². Native RdSAP
+    # (from_rdsap_schema_20_0_0). Lodged 78; engine 78. Built in Elmhurst RdSAP10
+    # (evidence saved): Elmhurst worksheet 77 — engine within ~1 (78.13 vs 77);
+    # engine-on-Elmhurst-inputs 77.24 ≈ 77 → calculator faithful. Boiler PCDB 10327
+    # via search; control 2106 (CBE); water from primary (combi); party wall 4.93 m
+    # (filled cavity). PINNED to the observed 78 — mapping untuned.
+    RealCertExpectation(
+        schema="RdSAP-Schema-20.0.0",
+        sample="uprn_10090844932",
+        cert_num="0646-3008-6208-0619-6204",
+        sap_score=78,
+    ),
+    # UPRN 100090182288 → cert 0068-1092-7237-0157-9954. SAP-Schema-16.2 —
+    # reduced-field SEMI-DETACHED HOUSE, 2-storey, band D (1950-1966), filled
+    # cavity, pitched roof 250 mm, solid uninsulated floor, mains-gas COMBI (PCDB
+    # 10327 Vaillant Ecotec Plus 831), double glazed, TFA 73.4 m². Lodged 71;
+    # engine 71. Built in Elmhurst RdSAP10 (evidence saved): Elmhurst worksheet 69.
+    # The +2 (engine 71 vs Elmhurst 69) is the documented 16.2 reduced-field
+    # PARTY-WALL gap: gov-API 16.2 lodges no party_wall_length → the engine models
+    # NO party wall, but Elmhurst requires one for a semi (entered the geometry-
+    # derived 4.28 m, filled cavity). Calculator confirmed faithful: engine on
+    # Elmhurst's own parsed inputs (which include the party wall) = 69.35 ≈ worksheet
+    # 69. PINNED to the observed 71 (= lodged) — mapping untuned; the Elmhurst delta
+    # is the reduced-field missing-party-wall-data gap, not a calculator bug.
+    RealCertExpectation(
+        schema="SAP-Schema-16.2",
+        sample="uprn_100090182288",
+        cert_num="0068-1092-7237-0157-9954",
+        sap_score=71,
+    ),
+    # UPRN 100021985993 → cert 9658-2087-7277-0667-1910. SAP-Schema-16.2 —
+    # reduced-field END-TERRACE BUNGALOW, single-storey, band C (1930-1949),
+    # solid-brick internal insulation, pitched roof 100 mm loft, suspended
+    # uninsulated floor, mains-gas COMBI (PCDB 10328 Vaillant Ecotec Pro 28),
+    # double glazed, TFA 76.54 m². Lodged 70; engine 74. Built in Elmhurst RdSAP10
+    # (evidence saved): Elmhurst worksheet 72. The +2 (engine 74 vs Elmhurst 72) is
+    # the documented 16.2 reduced-field PARTY-WALL gap: gov-API 16.2 lodges no
+    # party_wall_length → the engine models NO party wall, but Elmhurst requires one
+    # for an end-terrace (entered the geometry-derived 6.89 m, solid masonry; the
+    # worksheet's only extra heat-loss element is the party wall at 16.19 m² × U0.25
+    # = 4.05 W/K ≈ the 2-SAP gap). Calculator faithful: engine-on-gov-API 74 minus
+    # that omitted party-wall heat loss ≈ 72 = worksheet. (Engine on Elmhurst's
+    # PDF-parsed inputs = 67 here — lower than the worksheet — is PDF-parser noise:
+    # hot water over-parsed to 2998 kWh/£684; not a calculator divergence.) PINNED
+    # to the observed 74 — mapping untuned; the Elmhurst delta is the reduced-field
+    # missing-party-wall-data gap, not a calculator bug.
+    RealCertExpectation(
+        schema="SAP-Schema-16.2",
+        sample="uprn_100021985993",
+        cert_num="9658-2087-7277-0667-1910",
+        sap_score=74,
+    ),
+    # UPRN 10091568921 → cert 8806-5635-1239-5807-8283. SAP-Schema-17.1 — full-SAP
+    # END-TERRACE HOUSE, 2-storey, 2018 (band L), measured U walls 0.18 / roof 0.10
+    # / floor 0.15, mains-gas COMBI (PCDB 17615 Potterton Promax Ultra Combi 28,
+    # 88.5%), double glazed, party wall 40.56 m², natural vent + 3 extract fans,
+    # AP50 4.45 (tested), 20 LED outlets, TFA 78.7 m². has_hot_water_cylinder lodged
+    # true but cylinder detail all None + PCDB combi → built as combi (water from
+    # primary). Lodged 85; engine 82. Built in Elmhurst RdSAP10 (evidence saved):
+    # worksheet 80. The +2 (engine 82 vs Elmhurst 80) is the documented full-SAP→
+    # RdSAP residual (cert's measured U-values beat RdSAP band-L age defaults).
+    # Calculator confirmed faithful: engine on Elmhurst's own parsed inputs = 80.16
+    # ≈ worksheet 80. PINNED to the observed 82 — mapping untuned. (Control: cert
+    # 2110 time+temp zone vs Elmhurst CBE 2106; sub-0.5 SAP, in the noise.)
+    RealCertExpectation(
+        schema="SAP-Schema-17.1",
+        sample="uprn_10091568921",
+        cert_num="8806-5635-1239-5807-8283",
+        sap_score=82,
+    ),
+    # UPRN 10093718424 → cert 0369-3892-7678-2690-7475. SAP-Schema-17.1 — full-SAP
+    # SEMI-DETACHED HOUSE, 2-storey, band L, measured U walls 0.25 / roof 0.13 /
+    # floor 0.16, mains-gas COMBI (PCDB 17615 Potterton Promax Ultra Combi 28),
+    # double glazed, party wall 40.89 m², natural vent + 3 extract fans, AP50 4.18
+    # (tested), 20 LED outlets, TFA 79.9 m². Sibling of uprn_10091568921 (same
+    # development/boiler); built combi (cylinder lodged true but combi PCDB).
+    # Lodged 84; engine 81. Built in Elmhurst RdSAP10 (evidence saved): worksheet
+    # 80. The +1 (engine 81 vs Elmhurst 80) is the documented full-SAP→RdSAP
+    # residual. Calculator faithful: engine on Elmhurst's own parsed inputs = 80.12
+    # ≈ worksheet 80. PINNED to the observed 81 — mapping untuned.
+    RealCertExpectation(
+        schema="SAP-Schema-17.1",
+        sample="uprn_10093718424",
+        cert_num="0369-3892-7678-2690-7475",
+        sap_score=81,
+    ),
+    # UPRN 10022893721 → cert 8078-7422-5930-5662-8922. RdSAP-Schema-18.0 — GROUND-
+    # FLOOR FLAT, band I (1996-2002), cavity insulated, ELECTRIC STORAGE HEATERS
+    # (SAP code 402 = SEB Modern slimline, manual charge control 2401) + electric
+    # immersion off-peak (dual-rate) hot water with cylinder (Normal/110 L, foam
+    # 50 mm), party wall 21.48 m, TFA 54.29. First non-boiler corpus cert. Lodged
+    # 79; engine 79. Built in Elmhurst RdSAP10 (evidence saved): worksheet 81 —
+    # engine -2, within tolerance; engine on Elmhurst's own parsed inputs = 78.76 ≈
+    # engine 79 → calculator faithful. The Economy-7 off-peak pricing is CORRECT
+    # (Table 12a/13 split, fixed in PR #1217): storage SH high-rate fraction 0.00 →
+    # 100% low rate is the spec value, and immersion HW takes the Table 13 blend.
+    # (An earlier build mistakenly left Elmhurst's meter on Single/Standard, pricing
+    # at 13.19p → bogus worksheet 66; corrected by setting the Dual meter. NOT an
+    # engine bug.) PINNED to the observed engine 79 = lodged.
+    RealCertExpectation(
+        schema="RdSAP-Schema-18.0",
+        sample="uprn_10022893721",
+        cert_num="8078-7422-5930-5662-8922",
+        sap_score=79,
+    ),
+    # UPRN 10023443426 → cert 4106-3336-4002-1402-2202. RdSAP-Schema-21.0.1 (the
+    # engine's NATIVE schema) — END-TERRACE HOUSE, 2-storey, band L, cavity
+    # insulated, mains-gas COMBI (PCDB 17045 Ideal Logic Combi ES35), 300 mm loft,
+    # solid insulated floor, party wall 9.2 m (lodged), 11 double-glazed windows
+    # (~10.3 m²), 9 LED, mains-gas room-heater SECONDARY (SAP code 612, seasonal
+    # efficiency 0.20 per Table 4a — a low-efficiency decorative/old gas fire),
+    # TFA 98. Engine 76 = lodged 76 EXACTLY (and reproduces every component: space
+    # 6129, main fuel 6247, HW 2752, CO2 2232 kWh/kg) — the authoritative validation
+    # for a native-schema cert. Built in Elmhurst RdSAP10 (evidence saved):
+    # worksheet 79. The +3 is a BUILD gap, not a calculator error — my Elmhurst
+    # build omitted the lodged secondary gas fire (engine models it at 3065 kWh =
+    # 0.1 fraction ÷ 0.20 eff; Elmhurst secondary 0). engine on Elmhurst's own
+    # parsed inputs (also no secondary) = 79.29 ≈ worksheet 79 → calculator faithful
+    # to its inputs. PINNED to the observed engine 76 = lodged; mapping untuned.
+    RealCertExpectation(
+        schema="RdSAP-Schema-21.0.1",
+        sample="uprn_10023443426",
+        cert_num="4106-3336-4002-1402-2202",
+        sap_score=76,
+    ),
+    # UPRN 10093412452 → cert 8306-7575-5832-6507-9803. SAP-Schema-17.1 — full-SAP
+    # END-TERRACE HOUSE, 2-storey, band L, measured U walls 0.25 / roof 0.13 /
+    # floor 0.16, mains-gas COMBI (PCDB 17615 Potterton Promax Ultra Combi 28),
+    # double glazed (~12.3 m²), party wall 41.01 m², natural vent + 3 extract fans,
+    # AP50 4.62, 20 LED, no secondary, TFA 79.8 m². Same Emsworth development as the
+    # 10091568921 / 10093718424 siblings (cylinder lodged true but combi PCDB →
+    # built combi). Lodged 84; engine 81. Built in Elmhurst RdSAP10 (evidence
+    # saved): worksheet 80. The +1 (engine 81 vs Elmhurst 80) is the documented
+    # full-SAP→RdSAP residual; engine on Elmhurst's own parsed inputs = 79.91 ≈
+    # worksheet 80 → calculator faithful. PINNED to the observed 81 — mapping
+    # untuned.
+    RealCertExpectation(
+        schema="SAP-Schema-17.1",
+        sample="uprn_10093412452",
+        cert_num="8306-7575-5832-6507-9803",
+        sap_score=81,
+    ),
+    # UPRN 10093115480 → cert 8393-7438-5230-3319-1996. SAP-Schema-17.1 — full-SAP
+    # END-TERRACE BUNGALOW (single-storey), 2016 (band L), measured U walls 0.19 /
+    # roof 0.11 / floor 0.12, mains-gas COMBI (PCDB 16841 Vaillant ecoTEC plus 824),
+    # double glazed (~11.9 m²), party wall 10.99 m² (CF filled, U≈0), natural vent +
+    # 2 extract fans, AP50 3.85, 9 LED, TFA 56 m². Lodged 81; engine 81 (EXACT
+    # match). Built in Elmhurst RdSAP10 (evidence saved): worksheet 78. The +3
+    # (engine 81 vs Elmhurst 78) is the documented full-SAP→RdSAP residual — the
+    # cert's measured U-values beat Elmhurst's RdSAP band-L age defaults; engine on
+    # Elmhurst's own parsed inputs = 78.29 ≈ worksheet 78 → calculator faithful.
+    # PINNED to the observed engine 81 = lodged — mapping untuned.
+    RealCertExpectation(
+        schema="SAP-Schema-17.1",
+        sample="uprn_10093115480",
+        cert_num="8393-7438-5230-3319-1996",
+        sap_score=81,
+    ),
+    # UPRN 100020665611 → cert 2846-1002-5208-6669-0204. RdSAP-Schema-20.0.0 —
+    # native RdSAP, END-TERRACE HOUSE, 2-storey, band E (1967-1975), cavity
+    # UNINSULATED walls (U 1.5), pitched roof "limited insulation" (U 1.5), solid
+    # uninsulated floor (U 0.63), double glazed PVC (~12.9 m², U 2.8), party wall
+    # 9.5 m/floor (construction code 0 → U 0.25 "unable to determine, house"), TFA
+    # 87.4. Heating: ELECTRIC STORAGE HEATERS (SAP 402 = SEB Modern slimline, manual
+    # charge control 2401 = CSA) + electric immersion off-peak (Economy-7 Dual meter)
+    # with cylinder (size 2 = Normal/110 L, foam, 38 mm); secondary "Portable
+    # electric heaters (assumed)" (Elmhurst SAP 691, eff 100%). Lodged 37; engine 36.
+    # Built in Elmhurst RdSAP10 (evidence saved): worksheet SAP 35, on the same
+    # off-peak Dual tariff. engine on Elmhurst's own parsed inputs = 35 ≡ worksheet
+    # 35 → calculator faithful; engine 36 ≈ lodged 37 (−1). The cylinder insulation
+    # thickness (38 mm) IS carried by the RdSAP-20.0.0 mapper (line ~1701), so the
+    # banked RdSAP-17.0 cylinder-thickness gap does NOT bite here. NB the Elmhurst
+    # build needed the secondary set EXPLICITLY (Electric room heater): the shared
+    # assessment's leftover House-Coal secondary (633) survived `present=No` and
+    # inflated the worksheet to 44 until overwritten. PINNED to the observed engine
+    # 36 — mapping untuned.
+    RealCertExpectation(
+        schema="RdSAP-Schema-20.0.0",
+        sample="uprn_100020665611",
+        cert_num="2846-1002-5208-6669-0204",
+        sap_score=36,
+    ),
+    # UPRN 10090944225 → cert 2298-4036-7306-3186-4930. SAP-Schema-17.0 — full-SAP
+    # GROUND-FLOOR FLAT, band L (built 2015), measured U walls 0.27 / floor 0.14 /
+    # window 1.41, mains-gas COMBI (PCDB 17045 Ideal Logic Combi ES35), control 2110
+    # (CBI time + temperature zone control), NATURAL ventilation + 2 intermittent
+    # extract fans, AP50 3.48, party wall only 3.41 m² (U 0), ~6.6 m² double glazing,
+    # no cylinder, no secondary, TFA 49.97. Lodged 82; engine 81. Built in Elmhurst
+    # RdSAP10 (evidence saved): worksheet SAP 80. engine on Elmhurst's own parsed
+    # inputs = 80 = worksheet 80 (exact) → calculator faithful; engine 81 ≈ lodged 82
+    # (−1). The remaining +1 (engine 81 vs Elmhurst 80) is the documented full-SAP→
+    # RdSAP residual, localised to the FLOOR: the cert lodges measured floor U 0.14
+    # but Elmhurst (U-known override disabled) recomputes the RdSAP band-L solid-floor
+    # default 0.23 (~4.5 W/K on 50 m²); walls match (measured 0.27 ≈ Elmhurst 0.28),
+    # party wall U 0 both sides. The engine correctly uses the measured 0.14 — NOT a
+    # mapper bug. (An earlier build read 79 from a spurious leftover REA/691 electric
+    # secondary the shared assessment retained at Table-11 fraction 0.1 — worth ~1.5
+    # SAP; removed by present=Yes → clear the secondary code to empty → present=No,
+    # taking the worksheet 79→80.) PINNED to the observed engine 81 — mapping untuned.
+    RealCertExpectation(
+        schema="SAP-Schema-17.0",
+        sample="uprn_10090944225",
+        cert_num="2298-4036-7306-3186-4930",
+        sap_score=81,
+    ),
+    # UPRN 10010215568 → cert 9978-7098-7226-2633-3994. RdSAP-Schema-17.1 — NATIVE
+    # RdSAP, END-TERRACE BUNGALOW (single-storey), band J (2003-2006), cavity wall
+    # as-built insulated (assumed), pitched 200 mm loft, solid insulated floor,
+    # mains-gas REGULAR boiler (PCDB 15100 Vaillant Ecotec plus 415) + cylinder
+    # (size 2 = Normal/110 L, factory foam 25 mm, thermostat), control 2106 (CBE
+    # programmer + room thermostat + TRVs), water from primary, party wall 9.8 m,
+    # double glazed, natural ventilation, 86% LED, TFA 75.46. Lodged 74; engine 75.
+    # Built in Elmhurst RdSAP10 on the lodged inputs (evidence saved:
+    # elmhurst_summary.pdf / elmhurst_worksheet.pdf): worksheet SAP 73. Engine on
+    # Elmhurst's own parsed inputs = 74 ≈ worksheet 73 → calculator faithful (~1).
+    # The cylinder insulation thickness (25 mm) IS carried by the RdSAP-17.1 mapper
+    # (cylinder_insulation_thickness_mm=25) — no mapper gap here (cf. the RdSAP-17.0
+    # cylinder-thickness drop on uprn_68151071). The residual engine 75 vs Elmhurst
+    # 73 (+2) is the documented engine-uses-lodged vs Elmhurst-RdSAP-default gap:
+    # Elmhurst defaulted the cavity wall thickness to 250 mm (lodged 310 mm) and
+    # number of baths to 2 (lodged 1, lifting Elmhurst's HW demand). Engine 75 ≈
+    # lodged 74 (+1) is the validated anchor. PINNED to the observed engine 75 —
+    # mapping deliberately untuned.
+    RealCertExpectation(
+        schema="RdSAP-Schema-17.1",
+        sample="uprn_10010215568",
+        cert_num="9978-7098-7226-2633-3994",
+        sap_score=75,
+    ),
+    # UPRN 10002468137 → cert 0215-2818-7357-9703-2145. RdSAP-Schema-17.1,
+    # all-electric high-heat-retention storage heaters on Economy 7, solid-
+    # brick uninsulated end-terrace. Ground truth is Elmhurst RdSAP10 = 60,
+    # reproduced on identical inputs (summary + full SAP 10.2 worksheet saved
+    # alongside: elmhurst_summary.pdf / elmhurst_worksheet.pdf). The engine
+    # produces 62 — a +2 over-rating localised to OFF-PEAK WATER HEATING:
+    # the worksheet (lines 243-246) prices the 7-hour off-peak immersion at a
+    # Table 13 split (19.36% @ 15.29p high + 80.64% @ 5.5p low), but the engine
+    # prices 100% at the 5.5p low rate, under-costing the bill (£595.68 vs
+    # £629.67) → lower ECF (2.69 vs 2.84) → SAP 62 not 60. (Space heating 100%
+    # off-peak IS correct for storage heaters — the worksheet agrees.) Strict
+    # xfail until the off-peak water-heating rate split is implemented.
+    RealCertExpectation(
+        schema="RdSAP-Schema-17.1",
+        sample="uprn_10002468137",
+        cert_num="0215-2818-7357-9703-2145",
+        sap_score=60,
+        known_bug_xfail=(
+            "off-peak (7-hour) water-heating high/low rate split not applied — "
+            "engine prices 100% at the low rate; see elmhurst_worksheet.pdf (243-246)"
+        ),
+    ),
+    # UPRN 10070004512 → cert 8742-6624-9300-2780-4926. SAP-Schema-16.0, GROUND-
+    # FLOOR FLAT, band B, cavity FILLED, ELECTRIC STORAGE HEATERS (SAP 402 SEB,
+    # manual charge CSA/2401) + electric immersion off-peak (Economy-7 Dual meter)
+    # with a small cylinder (size 1), roof = another dwelling above, floor to
+    # EXTERNAL AIR, double glazed, TFA 33.24. Engine 66 = lodged 66 EXACTLY.
+    # This is the modelling_e2e built_form fix cert: 16.0 omits `built_form`, which
+    # RdSapSchema17_1 requires; the mapper derives it from dwelling_type (flat →
+    # modal 4). built_form is ML-only (the SAP calculator never reads it) so the fix
+    # is SAP-NEUTRAL — the engine reproduces the lodged score regardless. Built in
+    # Elmhurst RdSAP10 (evidence saved: elmhurst_summary.pdf / elmhurst_worksheet.pdf):
+    # worksheet SAP 54, engine on Elmhurst's own parsed inputs 53 ≈ 54 → calculator
+    # faithful. The engine 66 vs Elmhurst 54 (+12) is an input/build gap dominated by
+    # HOT WATER (engine 1272 vs Elmhurst 1948 kWh): the cert lodges a size-1 (small)
+    # cylinder but Elmhurst's RdSAP entry has no "Small" option (Normal/110 L is the
+    # smallest), forcing a larger cylinder + more storage loss; plus the reduced-field
+    # 16.0 floor/party-wall defaults. PINNED to the observed engine 66 (= lodged 66).
+    RealCertExpectation(
+        schema="SAP-Schema-16.0",
+        sample="uprn_10070004512",
+        cert_num="8742-6624-9300-2780-4926",
+        sap_score=66,
+    ),
+    # UPRN 22086693 → cert 6102-6227-8000-0083-2292. RdSAP-Schema-20.0.0, SEMI-
+    # DETACHED HOUSE 2-storey, band C, cavity UNINSULATED, mains-gas COMBI (no PCDB
+    # → generic SAP Table-4b BGW post-98 condensing combi), control 2106 (CBE),
+    # pitched 200 mm loft, suspended uninsulated floor, party wall 6.8 m, double
+    # glazed, electric secondary room heater (SAP 691 REA), 2× PV ARRAYS @1.14 kW,
+    # 100% LED, TFA ~74. Engine 66 / lodged 72.
+    # This is the modelling_e2e photovoltaic_supply-AS-LIST fix cert: 20.0.0 typed
+    # `photovoltaic_supply` as the wrapper only, so a measured-array LIST crashed
+    # `from_rdsap_schema_20_0_0` ("'list' object has no attribute none_or_no_details")
+    # and sank the whole prediction cohort. The fix routes it through the dict-tolerant
+    # `_map_schema_21_pv`, capturing the arrays. PV is correctly credited: engine
+    # WITHOUT pv = 61, WITH pv = 66 (+5). Built in Elmhurst RdSAP10 (evidence saved:
+    # elmhurst_summary.pdf / elmhurst_worksheet.pdf) — fabric+heating only (the PV
+    # is a separate "New Technologies" Panel-details grid, deferred): worksheet 55,
+    # engine on Elmhurst's own parsed inputs 55 = 55 EXACTLY → calculator faithful.
+    # The engine-without-pv 61 vs Elmhurst 55 (+6) is the documented engine-vs-
+    # Elmhurst-RdSAP-default residual on a band-C cavity-uninsulated suspended-floor
+    # semi; lodged 72 vs engine 66 (−6) is that plus PV-credit method. PINNED engine 66.
+    RealCertExpectation(
+        schema="RdSAP-Schema-20.0.0",
+        sample="uprn_22086693",
+        cert_num="6102-6227-8000-0083-2292",
+        sap_score=66,
+    ),
 )
 
 
diff --git a/tests/domain/sap10_calculator/test_table_12a.py b/tests/domain/sap10_calculator/test_table_12a.py
index a43ef5e2b..9a70dbfae 100644
--- a/tests/domain/sap10_calculator/test_table_12a.py
+++ b/tests/domain/sap10_calculator/test_table_12a.py
@@ -62,17 +62,69 @@ def test_unknown_meter_infers_off_peak_from_electric_storage_main() -> None:
 
 
 def test_unknown_meter_does_not_infer_off_peak_for_room_heater_or_heat_pump() -> None:
-    # Arrange — direct-acting electric room heaters (Rule 3, SAP 691) and
-    # heat pumps run ON DEMAND and exist on single-rate meters too, so they
-    # are NOT evidence of an off-peak tariff. On an Unknown meter they keep
-    # STANDARD — billing them 100% at the off-peak low rate would
-    # over-credit (room heaters draw mostly at the high rate).
+    # Arrange — RdSAP 10 §12 (PDF p.62): on an Unknown meter the off-peak
+    # exception fires only when a text-box off-peak SYSTEM is present (storage
+    # / underfloor / dry-core / CPSU main, OR dual electric immersion water
+    # heating, OR GSHP/WSHP main). A direct-acting room-heater (Rule 3, SAP
+    # 691) or heat-pump main is NOT by itself such a system — absent a
+    # dual-immersion (or GSHP/WSHP) trigger the dwelling stays on a single
+    # meter (STANDARD). The 7-/10-hour choice in Rules 1-4 only applies ONCE
+    # the meter is already established as dual.
 
-    # Act / Assert
+    # Act / Assert — room heater / heat pump with no dual-immersion trigger.
     assert rdsap_tariff_for_cert(3, main_1_sap_code=691) is Tariff.STANDARD
     assert rdsap_tariff_for_cert(3, main_1_is_heat_pump_database=True) is Tariff.STANDARD
 
 
+def test_unknown_meter_dual_electric_immersion_triggers_off_peak_via_rules() -> None:
+    # Arrange — RdSAP 10 §12 (PDF p.62): "If the electricity meter is unknown,
+    # treat as single meter EXCEPT where ... water heating [is] intended to
+    # run off an off-peak tariff (per systems listed in the text box above)"
+    # — the text box lists DUAL ELECTRIC IMMERSION. "If that results in a dual
+    # meter, assign tariff per rules 1 to 4." So an Unknown meter + dual
+    # electric immersion makes the dwelling dual; the 7-/10-hour choice then
+    # follows Rules 1-4 on the MAIN heating. Worksheet-validated on Khalim's
+    # "simulated case 48" (main 691 room heaters + Unknown meter + 903 dual
+    # immersion → Elmhurst 10-Hour Off Peak, SAP 57; ours 45→55). Corpus cert
+    # "Apartment 241" (main 691 + dual immersion) moved -5.38 → -1.05.
+
+    # Act / Assert — dual immersion + room-heater main → Rule 3 → 10-hour;
+    # + storage main → Rule 2 → 7-hour (already off-peak); + gas main → Rule 4
+    # default → 7-hour. WITHOUT the dual-immersion flag, the room-heater main
+    # stays STANDARD (single electric immersion is not a trigger).
+    assert rdsap_tariff_for_cert(
+        3, main_1_sap_code=691, water_is_off_peak_dual_immersion=True
+    ) is Tariff.TEN_HOUR
+    assert rdsap_tariff_for_cert(
+        3, main_1_sap_code=402, water_is_off_peak_dual_immersion=True
+    ) is Tariff.SEVEN_HOUR
+    assert rdsap_tariff_for_cert(
+        3, main_1_sap_code=102, water_is_off_peak_dual_immersion=True
+    ) is Tariff.SEVEN_HOUR
+    assert rdsap_tariff_for_cert(
+        3, main_1_sap_code=691, water_is_off_peak_dual_immersion=False
+    ) is Tariff.STANDARD
+
+
+def test_unknown_meter_ground_or_water_source_heat_pump_triggers_off_peak() -> None:
+    # Arrange — RdSAP 10 §12 (PDF p.62) third Unknown-meter exception bullet:
+    # "main heating is ground source or water source heat pump." Per SAP 10.2
+    # Table 4a (PDF p.176-177) ground source = 211/215/221/225 (+ warm-air
+    # 521/525), water source = 213/216/223/226 (+ warm-air 523/526); AIR
+    # source (214/224 etc.) is NOT named, so it stays standard. Once the GSHP/
+    # WSHP makes the meter dual, Rules 1-4 (Rule 3, heat pump 211-224) → 10h.
+    # 0 corpus certs carry a GSHP/WSHP on an Unknown meter (the only Unknown-
+    # meter HPs are 3/10 Bedford House, main 214 = AIR source) — this is a
+    # spec-completeness forward guard.
+
+    # Act / Assert — ground/water source → 10-hour; air source → STANDARD.
+    assert rdsap_tariff_for_cert(3, main_1_sap_code=211) is Tariff.TEN_HOUR
+    assert rdsap_tariff_for_cert(3, main_1_sap_code=213) is Tariff.TEN_HOUR
+    assert rdsap_tariff_for_cert(3, main_1_sap_code=521) is Tariff.TEN_HOUR
+    assert rdsap_tariff_for_cert(3, main_1_sap_code=214) is Tariff.STANDARD
+    assert rdsap_tariff_for_cert(3, main_1_sap_code=224) is Tariff.STANDARD
+
+
 def test_unknown_meter_with_non_electric_main_stays_standard() -> None:
     # Arrange — an "Unknown" meter on a GAS-heated dwelling (SAP 102) has
     # no off-peak evidence, so it must NOT pick up the Rule-4 Dual default
diff --git a/tests/domain/sap10_calculator/test_table_32.py b/tests/domain/sap10_calculator/test_table_32.py
index b297a78d3..e8fb4ab22 100644
--- a/tests/domain/sap10_calculator/test_table_32.py
+++ b/tests/domain/sap10_calculator/test_table_32.py
@@ -13,6 +13,7 @@ from __future__ import annotations
 
 import pytest
 
+from domain.sap10_calculator.exceptions import UnpricedFuelCode
 from domain.sap10_calculator.tables.table_12a import Tariff
 from domain.sap10_calculator.tables.table_32 import (
     additional_standing_charges_gbp,
@@ -143,9 +144,9 @@ def test_unit_price_translates_api_fuel_enum_via_api_fuel_to_table_32() -> None:
 
 
 def test_unit_price_defaults_to_mains_gas_when_code_is_none() -> None:
-    """Mirrors `table_12.unit_price_p_per_kwh` behaviour: unknown / missing
-    fuel codes fall back to mains gas. cert_to_inputs occasionally has to
-    resolve a price for a cert with a missing main_fuel_type."""
+    """A `None` fuel code (no fuel lodged) falls back to mains gas — callers
+    resolve a "no system" before pricing, so None is not an error. A concrete
+    UNRECOGNISED code raises instead (see the next test)."""
     # Arrange
     fuel_code = None
 
@@ -156,6 +157,20 @@ def test_unit_price_defaults_to_mains_gas_when_code_is_none() -> None:
     assert price == 3.48
 
 
+def test_unit_price_raises_on_unrecognised_fuel_code() -> None:
+    """A concrete (non-None) fuel code that resolves to neither a Table 32
+    price nor a translatable gov-API enum raises `UnpricedFuelCode` rather
+    than silently defaulting to the mains-gas price — an unhandled fuel
+    billed at 3.48 p/kWh mis-costs the dwelling (the dual-main wood-vs-
+    electric failure mode). Guards against future/unmapped fuels."""
+    # Arrange — 999 is not a Table 32 code nor a gov-API fuel enum.
+    fuel_code = 999
+
+    # Act / Assert
+    with pytest.raises(UnpricedFuelCode):
+        unit_price_p_per_kwh(fuel_code)
+
+
 @pytest.mark.parametrize(
     "fuel_code, expected_standing_gbp, fuel_name",
     [
@@ -324,3 +339,19 @@ def test_additional_standing_charges_zero_for_oil_only() -> None:
 
     # Assert
     assert standing == 0.0
+
+
+def test_electricity_any_tariff_code_39_resolves_to_standard_electricity() -> None:
+    # SAP Table 12 code 39 = "electricity, any tariff" (epc_codes.csv main_fuel 39
+    # = "electricity, unspecified tariff"; spec footnote (j): defines an electric
+    # system, cost = standard tariff). It must classify as electric and price at
+    # the standard-electricity rate — without the mapping it raises UnpricedFuelCode
+    # and is_electric_fuel_code(39) is False (mis-rated as non-electric).
+    from domain.sap10_calculator.tables.table_32 import (
+        is_electric_fuel_code,
+        to_table_32_code,
+    )
+
+    assert to_table_32_code(39) == 30
+    assert is_electric_fuel_code(39) is True
+    assert unit_price_p_per_kwh(39) == unit_price_p_per_kwh(30)
diff --git a/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000490.py b/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000490.py
index 9bf662620..4184b7998 100644
--- a/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000490.py
+++ b/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000490.py
@@ -42,7 +42,10 @@ from domain.sap10_ml.tests._fixtures import (
 )
 from domain.sap10_calculator.worksheet.solar_gains import RoofWindowInput, RooflightInput
 from domain.sap10_calculator.worksheet.ventilation import MechanicalVentilationKind
-from domain.sap10_calculator.worksheet.water_heating import TABLE_J1_TCOLD_FROM_MAINS_C
+from domain.sap10_calculator.worksheet.water_heating import (
+    TABLE_J1_TCOLD_FROM_MAINS_C,
+    combi_loss_monthly_kwh_table_3a_keep_hot_time_clock,
+)
 
 from tests.domain.sap10_calculator.worksheet._elmhurst_fixtures import (
     SECTION_8C_ALL_ZERO_MONTHLY,
@@ -284,9 +287,12 @@ MIXER_SHOWER_FLOW_RATES_L_PER_MIN: tuple[float, ...] = (7.0,)
 COLD_WATER_TEMPS_C: tuple[float, ...] = TABLE_J1_TCOLD_FROM_MAINS_C
 LOW_WATER_USE: bool = False
 # Vaillant Ecotec Pro combi, "Combi keep hot type = Gas/Oil, time clock":
-# the orchestrator's default (Table 3a row "time-clock keep-hot")
-# reproduces this fixture exactly. No override needed.
-COMBI_LOSS_OVERRIDE: Optional[tuple[float, ...]] = None
+# SAP 10.2 Table 3a flat keep-hot row (600 × n/365). The orchestrator's
+# default is now "without keep-hot" (600 × fu × n/365, the modal lodging),
+# so this keep-hot fixture supplies the override explicitly.
+COMBI_LOSS_OVERRIDE: Optional[tuple[float, ...]] = (
+    combi_loss_monthly_kwh_table_3a_keep_hot_time_clock()
+)
 ELECTRIC_SHOWER_OVERRIDE: Optional[tuple[float, ...]] = None
 
 # §4 Water heating energy requirements
diff --git a/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000565_case50.py b/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000565_case50.py
new file mode 100644
index 000000000..e051922b2
--- /dev/null
+++ b/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000565_case50.py
@@ -0,0 +1,113 @@
+"""Mapper-driven cascade pin against the Elmhurst U985-0001-000565
+"simulated case 50" worksheet — an all-electric Economy-7 dwelling with
+MVHR + electric storage heaters + a DUAL-immersion hot-water cylinder.
+
+Like 000565 / the _rr cases, this fixture does NOT hand-build the
+EpcPropertyData: it routes the Summary PDF through
+ElmhurstSiteNotesExtractor + from_elmhurst_site_notes so the SAP-result
+pin grid exercises the WHOLE extractor + mapper + calculator pipeline.
+
+This case was hand-built (Khalim) to ground-truth the dual-immersion
+cylinder water-heating path, and it exercises two distinct off-peak
+tariff mechanics that the gas/standard-tariff fixtures don't reach:
+
+  - The Table 13 HW high-rate fraction for a whc-903 DUAL electric
+    immersion (0.1009 high / 0.8991 low) — the COST (6.4878 p/kWh) AND
+    the CO2/PE split ("Water heating - high/low rate cost", fixed in
+    `_electric_immersion_hw_high_rate_fraction`).
+  - The Table 12a Grid 2 fan fraction (0.71/0.58) for MVHR fan
+    electricity (315.64 kWh, 100% MVHR per worksheet line 230a) — billed
+    distinct from "all other uses" 0.90/0.80 (fixed by including the MVHR
+    fan in `mev_kwh_for_cost_split`).
+
+Unknown meter + dual electric immersion resolves to 7-hour off-peak via
+the §12 trigger. After both fixes the existing-dwelling rating reconciles
+to the U985 worksheet EXACTLY, including the (272) rating CO2.
+
+Cert shape: 000565 semi shell, main = electric storage heaters (SAP 402,
+manual charge control), portable electric secondary (SAP 693), water
+heating from a whc-903 dual electric immersion + 160 L foam cylinder (no
+cylinder stat), MVHR (Vent Axia, PCDB 500140), one instantaneous electric
+shower, no PV, Economy-7.
+
+Source: user-simulated PDFs at `sap worksheets/golden fixture debugging/
+simulated case 50/`. The Summary is mirrored into the tracked
+`backend/documents_parser/tests/fixtures/Summary_000565_case50.pdf` so the
+test runs without depending on the unstaged workspace.
+
+Worksheet pin targets (U985-0001-000565 block 1 — existing dwelling SAP):
+- SAP rating 39 (258); continuous 38.8426; ECF 4.4252 (257)
+- Total fuel cost £1317.0116 (255)
+- Total CO2 2397.1237 kg/year (272)
+- Space heating 14318.4904 kWh/year ((98c))
+- Main 1 fuel 12170.7169 kWh/year (211)
+- Secondary fuel 2147.7736 kWh/year (215)
+- Hot water fuel 1668.0788 kWh/year (219)
+- Lighting 435.3204 kWh/year (232)
+- Pumps/fans 315.6384 kWh/year (231)
+
+Per [[feedback-zero-error-strict]] + [[feedback-e2e-validation-
+philosophy]]: pins are abs=1e-4 against the worksheet PDF. The pin
+values live in `test_e2e_elmhurst_sap_score._FIXTURE_PINS`.
+"""
+
+from __future__ import annotations
+
+import re
+import subprocess
+from pathlib import Path
+from typing import Final
+
+from backend.documents_parser.elmhurst_extractor import ElmhurstSiteNotesExtractor
+from datatypes.epc.domain.epc_property_data import EpcPropertyData
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+
+# parents[0]=worksheet/, [1]=sap10_calculator/, [2]=domain/, [3]=tests/,
+# [4]=repo root.
+_SUMMARY_PDF: Final[Path] = (
+    Path(__file__).resolve().parents[4]
+    / "backend" / "documents_parser" / "tests" / "fixtures"
+    / "Summary_000565_case50.pdf"
+)
+
+
+def _summary_pdf_to_textract_style_pages(pdf_path: Path) -> list[str]:
+    """Convert a Summary PDF into the per-page text format the
+    ElmhurstSiteNotesExtractor expects (label\\nvalue sequences). Mirror
+    of the helper in the other `_elmhurst_worksheet_*` fixtures.
+    """
+    info = subprocess.run(
+        ["pdfinfo", str(pdf_path)], capture_output=True, text=True, check=True,
+    ).stdout
+    m = re.search(r"Pages:\s+(\d+)", info)
+    if m is None:
+        raise RuntimeError(f"Could not parse page count from {pdf_path}")
+    page_count = int(m.group(1))
+    pages: list[str] = []
+    for i in range(1, page_count + 1):
+        layout = subprocess.run(
+            [
+                "pdftotext", "-layout", "-f", str(i), "-l", str(i),
+                str(pdf_path), "-",
+            ],
+            capture_output=True, text=True, check=True,
+        ).stdout
+        tokens: list[str] = []
+        for line in layout.splitlines():
+            if not line.strip():
+                tokens.append("")
+                continue
+            parts = [p for p in re.split(r"\s{2,}", line.strip()) if p]
+            tokens.extend(parts)
+        pages.append("\n".join(tokens))
+    return pages
+
+
+def build_epc() -> EpcPropertyData:
+    """Route the simulated case-50 Summary through extractor + mapper.
+    No hand-built EpcPropertyData — the extractor and mapper are part of
+    the test target.
+    """
+    pages = _summary_pdf_to_textract_style_pages(_SUMMARY_PDF)
+    site_notes = ElmhurstSiteNotesExtractor(pages).extract()
+    return EpcPropertyDataMapper.from_elmhurst_site_notes(site_notes)
diff --git a/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000565_case52.py b/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000565_case52.py
new file mode 100644
index 000000000..8f3684760
--- /dev/null
+++ b/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_000565_case52.py
@@ -0,0 +1,110 @@
+"""Mapper-driven cascade pin against the Elmhurst U985-0001-000565
+"simulated case 52" worksheet — a REGULAR (non-combi) mains-gas boiler
+feeding a hot-water CYLINDER, on standard tariff.
+
+Like 000565 / the _rr cases, this fixture does NOT hand-build the
+EpcPropertyData: it routes the Summary PDF through
+ElmhurstSiteNotesExtractor + from_elmhurst_site_notes so the SAP-result
+pin grid exercises the WHOLE extractor + mapper + calculator pipeline.
+
+This case was hand-built (Khalim) to ground-truth the LAST untested
+branch of the cylinder/water-heating chain that the combi/immersion
+fixtures don't reach: a regular boiler + cylinder heated from the main,
+exercising SAP 10.2 §4 —
+  - Cylinder storage loss via Table 2 loss factor (51) 0.0181, Table 2a
+    volume factor (52) 0.9086, Table 2b temperature factor (53) 0.7020
+    (NO cylinder thermostat) → (55) 1.8466.
+  - PRIMARY circuit loss (59) 128.3772 (winter) — the Table 3 path for
+    UNINSULATED primary pipework + no cylinder stat. Case 50 (immersion,
+    no boiler) couldn't reach this branch.
+  - Combi loss (61) correctly 0 (regular boiler, not a combi).
+The whole chain reconciles to the U985 worksheet EXACTLY with no
+calculator change — it pins the cylinder-loss derivation as correct.
+
+Cert shape: 000565 semi shell, single main = mains-gas REGULAR boiler
+(SAP code 102, control 2106 programmer + room stat + TRVs), water
+heating from main (WHC 901) via a 160 L foam-insulated cylinder (no
+cylinder stat, uninsulated primary pipework, in heated space), one
+instantaneous electric shower, no secondary, no PV, standard tariff.
+
+Source: user-simulated PDFs at `sap worksheets/golden fixture debugging/
+simulated case 52/`. The Summary is mirrored into the tracked
+`backend/documents_parser/tests/fixtures/Summary_000565_case52.pdf` so the
+test runs without depending on the unstaged workspace.
+
+Worksheet pin targets (U985-0001-000565 block 1 — existing dwelling SAP):
+- SAP rating 57 (258); continuous 57.2904; ECF 3.0616 (257)
+- Total fuel cost £911.1973 (255)
+- Total CO2 3834.8434 kg/year (272)
+- Space heating 10563.5170 kWh/year ((98c))
+- Main 1 fuel 13371.5405 kWh/year (211)
+- Secondary fuel 0.0 kWh/year (215)
+- Hot water fuel 3929.7635 kWh/year (219)
+- Lighting 435.3204 kWh/year (232)
+- Pumps/fans 401.6384 kWh/year (231)
+
+Per [[feedback-zero-error-strict]] + [[feedback-e2e-validation-
+philosophy]]: pins are abs=1e-4 against the worksheet PDF. The pin
+values live in `test_e2e_elmhurst_sap_score._FIXTURE_PINS`.
+"""
+
+from __future__ import annotations
+
+import re
+import subprocess
+from pathlib import Path
+from typing import Final
+
+from backend.documents_parser.elmhurst_extractor import ElmhurstSiteNotesExtractor
+from datatypes.epc.domain.epc_property_data import EpcPropertyData
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+
+# parents[0]=worksheet/, [1]=sap10_calculator/, [2]=domain/, [3]=tests/,
+# [4]=repo root.
+_SUMMARY_PDF: Final[Path] = (
+    Path(__file__).resolve().parents[4]
+    / "backend" / "documents_parser" / "tests" / "fixtures"
+    / "Summary_000565_case52.pdf"
+)
+
+
+def _summary_pdf_to_textract_style_pages(pdf_path: Path) -> list[str]:
+    """Convert a Summary PDF into the per-page text format the
+    ElmhurstSiteNotesExtractor expects (label\\nvalue sequences). Mirror
+    of the helper in the other `_elmhurst_worksheet_*` fixtures.
+    """
+    info = subprocess.run(
+        ["pdfinfo", str(pdf_path)], capture_output=True, text=True, check=True,
+    ).stdout
+    m = re.search(r"Pages:\s+(\d+)", info)
+    if m is None:
+        raise RuntimeError(f"Could not parse page count from {pdf_path}")
+    page_count = int(m.group(1))
+    pages: list[str] = []
+    for i in range(1, page_count + 1):
+        layout = subprocess.run(
+            [
+                "pdftotext", "-layout", "-f", str(i), "-l", str(i),
+                str(pdf_path), "-",
+            ],
+            capture_output=True, text=True, check=True,
+        ).stdout
+        tokens: list[str] = []
+        for line in layout.splitlines():
+            if not line.strip():
+                tokens.append("")
+                continue
+            parts = [p for p in re.split(r"\s{2,}", line.strip()) if p]
+            tokens.extend(parts)
+        pages.append("\n".join(tokens))
+    return pages
+
+
+def build_epc() -> EpcPropertyData:
+    """Route the simulated case-52 Summary through extractor + mapper.
+    No hand-built EpcPropertyData — the extractor and mapper are part of
+    the test target.
+    """
+    pages = _summary_pdf_to_textract_style_pages(_SUMMARY_PDF)
+    site_notes = ElmhurstSiteNotesExtractor(pages).extract()
+    return EpcPropertyDataMapper.from_elmhurst_site_notes(site_notes)
diff --git a/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_001431_case45.py b/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_001431_case45.py
new file mode 100644
index 000000000..7d9ab95f2
--- /dev/null
+++ b/tests/domain/sap10_calculator/worksheet/_elmhurst_worksheet_001431_case45.py
@@ -0,0 +1,107 @@
+"""Mapper-driven cascade pin against the Elmhurst P960-0001-001431
+"simulated case 45" worksheet — a ~47 m² GROUND-FLOOR FLAT heated by an
+air-source HEAT PUMP (PCDB 100053 ECODAN, radiators, MCS=No) with a
+WHC-903 electric-immersion DHW and a 110 L cylinder, postcode W6 9BF
+(SAP Region "Thames Valley").
+
+Case 45 is the 1e-4 oracle for the SAP 10.2 Appendix U (PDF p.124) TWO-
+CLIMATE-CASCADE split. The P960 prints the current dwelling TWICE:
+
+  * Block 1 — "11a. SAP rating / 12a. CO2" — computed on UK-AVERAGE
+    weather (Appendix U Tables U1-U3 region 0). Drives the SAP/EI rating.
+    Space-heat demand (98c) = 7333.79; SAP value (258) = 60.5318 (-> 61);
+    total CO2 (272) = 692.13.
+  * Block 2 — "CALCULATION OF EPC COSTS, EMISSIONS AND PRIMARY ENERGY" —
+    computed on POSTCODE-DISTRICT weather (PCDB Table 172, W6). Drives the
+    EPC-displayed figures. Space-heat demand (98c) = 5921.05; total CO2
+    (272) = 626.78; total primary energy (286) = 6581.59.
+
+Per Appendix U paragraph 1: "Other calculations (such as for energy use
+and costs on EPCs) are done using local weather." `Sap10Calculator.
+calculate` therefore runs both cascades and grafts the demand cascade's
+CO2/PE onto the rating cascade's SAP — this fixture pins BOTH.
+
+Like the other `_elmhurst_worksheet_001431_case*` fixtures it does NOT
+hand-build the EpcPropertyData: it routes the Summary PDF through
+ElmhurstSiteNotesExtractor + from_elmhurst_site_notes so the pin exercises
+the WHOLE extractor + mapper + calculator pipeline.
+
+Source: user-simulated PDFs at `sap worksheets/golden fixture debugging/
+simulated case 45/`. The Summary is mirrored into the tracked
+`backend/documents_parser/tests/fixtures/Summary_001431_case45.pdf` so the
+test runs without depending on the unstaged workspace.
+
+Per [[feedback-zero-error-strict]]: pins are abs <= 1e-4 against the PDF.
+"""
+
+from __future__ import annotations
+
+import re
+import subprocess
+from pathlib import Path
+from typing import Final
+
+from backend.documents_parser.elmhurst_extractor import ElmhurstSiteNotesExtractor
+from datatypes.epc.domain.epc_property_data import EpcPropertyData
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+
+# parents[0]=worksheet/, [1]=sap10_calculator/, [2]=domain/, [3]=tests/,
+# [4]=repo root.
+_SUMMARY_PDF: Final[Path] = (
+    Path(__file__).resolve().parents[4]
+    / "backend" / "documents_parser" / "tests" / "fixtures"
+    / "Summary_001431_case45.pdf"
+)
+
+# Block 1 — UK-average RATING cascade (`cert_to_inputs`).
+RATING_SPACE_HEATING_KWH: Final[float] = 7333.7892    # (98c)
+RATING_SAP_CONTINUOUS: Final[float] = 60.5318         # (258) un-rounded
+RATING_SAP_INTEGER: Final[int] = 61                   # (258)
+RATING_CO2_KG_PER_YR: Final[float] = 692.1287         # (272)
+
+# Block 2 — POSTCODE-district DEMAND cascade (`cert_to_demand_inputs`).
+DEMAND_SPACE_HEATING_KWH: Final[float] = 5921.0486    # (98c)
+DEMAND_CO2_KG_PER_YR: Final[float] = 626.7797         # (272)
+DEMAND_PRIMARY_ENERGY_KWH: Final[float] = 6581.5936   # (286)
+
+
+def _summary_pdf_to_textract_style_pages(pdf_path: Path) -> list[str]:
+    """Convert a Summary PDF into the per-page text format the
+    ElmhurstSiteNotesExtractor expects (label/value token sequences).
+    Mirror of the helper in the other `_elmhurst_worksheet_*` fixtures.
+    """
+    info = subprocess.run(
+        ["pdfinfo", str(pdf_path)], capture_output=True, text=True, check=True,
+    ).stdout
+    m = re.search(r"Pages:\s+(\d+)", info)
+    if m is None:
+        raise RuntimeError(f"Could not parse page count from {pdf_path}")
+    page_count = int(m.group(1))
+    pages: list[str] = []
+    for i in range(1, page_count + 1):
+        layout = subprocess.run(
+            [
+                "pdftotext", "-layout", "-f", str(i), "-l", str(i),
+                str(pdf_path), "-",
+            ],
+            capture_output=True, text=True, check=True,
+        ).stdout
+        tokens: list[str] = []
+        for line in layout.splitlines():
+            if not line.strip():
+                tokens.append("")
+                continue
+            parts = [p for p in re.split(r"\s{2,}", line.strip()) if p]
+            tokens.extend(parts)
+        pages.append("\n".join(tokens))
+    return pages
+
+
+def build_epc() -> EpcPropertyData:
+    """Route the simulated case-45 Summary through extractor + mapper.
+    No hand-built EpcPropertyData — the extractor and mapper are part of
+    the test target. This module is a pin PROVIDER (build_epc + constants);
+    the collected assertions live in `test_section_cascade_pins`."""
+    pages = _summary_pdf_to_textract_style_pages(_SUMMARY_PDF)
+    site_notes = ElmhurstSiteNotesExtractor(pages).extract()
+    return EpcPropertyDataMapper.from_elmhurst_site_notes(site_notes)
diff --git a/tests/domain/sap10_calculator/worksheet/test_e2e_elmhurst_sap_score.py b/tests/domain/sap10_calculator/worksheet/test_e2e_elmhurst_sap_score.py
index 1637f281d..918329d99 100644
--- a/tests/domain/sap10_calculator/worksheet/test_e2e_elmhurst_sap_score.py
+++ b/tests/domain/sap10_calculator/worksheet/test_e2e_elmhurst_sap_score.py
@@ -24,7 +24,10 @@ from typing import Final
 
 import pytest
 
-from domain.sap10_calculator.calculator import Sap10Calculator
+from domain.sap10_calculator.calculator import (
+    Sap10Calculator,
+    calculate_sap_from_inputs,
+)
 from domain.sap10_calculator.rdsap.cert_to_inputs import (
     cert_to_inputs,
     water_heating_section_from_cert,
@@ -45,6 +48,8 @@ from tests.domain.sap10_calculator.worksheet import (
     _elmhurst_worksheet_001431_case6 as _w001431_case6,
     _elmhurst_worksheet_001431_case7 as _w001431_case7,
     _elmhurst_worksheet_001431_case20 as _w001431_case20,
+    _elmhurst_worksheet_000565_case50 as _w000565_case50,
+    _elmhurst_worksheet_000565_case52 as _w000565_case52,
 )
 from tests.domain.sap10_calculator.worksheet._elmhurst_fixtures import (
     ALL_FIXTURES as _ELMHURST_FIXTURES,
@@ -293,6 +298,39 @@ _FIXTURE_PINS: Final[dict[str, FixtureCascadePins]] = {
         lighting_kwh_per_yr=246.3083,
         pumps_fans_kwh_per_yr=0.0,
     ),
+    # Mapper-driven — Summary_000565_case50.pdf → extractor → mapper →
+    # calculator. All-electric Economy-7: storage-heater main (SAP 402) +
+    # MVHR + whc-903 DUAL electric immersion + 160 L cylinder. Exercises
+    # the Table 13 HW high/low split (cost + CO2/PE) AND the Table 12a
+    # Grid 2 MVHR fan fraction (0.71/0.58). Reconciles to the worksheet
+    # EXACTLY after both off-peak fixes (incl. the (272) rating CO2).
+    "000565_case50": FixtureCascadePins(
+        sap_score=39, sap_score_continuous=38.8426, ecf=4.4252,
+        total_fuel_cost_gbp=1317.0116, co2_kg_per_yr=2397.1237,
+        space_heating_kwh_per_yr=14318.4904,
+        main_heating_fuel_kwh_per_yr=12170.7169,
+        secondary_heating_fuel_kwh_per_yr=2147.7736,
+        hot_water_kwh_per_yr=1668.0788,
+        lighting_kwh_per_yr=435.3204,
+        pumps_fans_kwh_per_yr=315.6384,
+    ),
+    # Mapper-driven — Summary_000565_case52.pdf → extractor → mapper →
+    # calculator. Regular (non-combi) mains-gas boiler (SAP 102) + a
+    # 160 L foam cylinder heated from the main (WHC 901), no cylinder
+    # stat + uninsulated primary pipework, standard tariff. Validates the
+    # cylinder storage loss (51-55) + PRIMARY loss (59) chain — the
+    # branch immersion/combi fixtures can't reach. Reconciles to the
+    # worksheet EXACTLY with no calculator change.
+    "000565_case52": FixtureCascadePins(
+        sap_score=57, sap_score_continuous=57.2904, ecf=3.0616,
+        total_fuel_cost_gbp=911.1973, co2_kg_per_yr=3834.8434,
+        space_heating_kwh_per_yr=10563.5170,
+        main_heating_fuel_kwh_per_yr=13371.5405,
+        secondary_heating_fuel_kwh_per_yr=0.0,
+        hot_water_kwh_per_yr=3929.7635,
+        lighting_kwh_per_yr=435.3204,
+        pumps_fans_kwh_per_yr=401.6384,
+    ),
 }
 
 
@@ -312,6 +350,8 @@ _FIXTURE_MODULES: Final[dict[str, ModuleType]] = {
     "001431_case6": _w001431_case6,
     "001431_case7": _w001431_case7,
     "001431_case20": _w001431_case20,
+    "000565_case50": _w000565_case50,
+    "000565_case52": _w000565_case52,
 }
 
 
@@ -338,8 +378,13 @@ def test_sap_result_pin(fixture_name: str, field_name: str) -> None:
     epc = _FIXTURE_MODULES[fixture_name].build_epc()
     expected = getattr(pin, field_name)
 
-    # Act
-    result = Sap10Calculator().calculate(epc)
+    # Act — these pins are the worksheet's Block-1 (energy-rating) line refs,
+    # i.e. the UK-average RATING cascade. `Sap10Calculator.calculate` now
+    # grafts the postcode DEMAND cascade's CO2/PE onto the result (SAP 10.2
+    # Appendix U p.124), so the rating-cascade fields are pinned via
+    # `cert_to_inputs` directly; the demand cascade is pinned separately
+    # (corpus gauge + simulated case 45 Block-2 pins).
+    result = calculate_sap_from_inputs(cert_to_inputs(epc))
     actual = getattr(result, field_name)
 
     # Assert
diff --git a/tests/domain/sap10_calculator/worksheet/test_heat_transmission.py b/tests/domain/sap10_calculator/worksheet/test_heat_transmission.py
index 1f20aeedc..213bf2ffb 100644
--- a/tests/domain/sap10_calculator/worksheet/test_heat_transmission.py
+++ b/tests/domain/sap10_calculator/worksheet/test_heat_transmission.py
@@ -157,6 +157,70 @@ def test_mixed_flat_pitched_roof_does_not_contaminate_pitched_u_value() -> None:
     assert abs(result.roof_w_per_k - 44.6) <= 2.0
 
 
+def test_ground_floor_flat_bills_floor_despite_flat_dwelling_type() -> None:
+    # Arrange — a ground-floor flat whose dwelling_type the mapper labelled
+    # "Top-floor flat" (so the dwelling-level exposure heuristic
+    # `_dwelling_exposure` suppresses the floor on the assumption a heated
+    # dwelling sits below), but whose building part lodges a "Ground floor"
+    # floor_type. A ground floor is in contact with the ground (RdSAP 10
+    # §3.12) -> heat-loss floor. The Elmhurst Summary path lodges this as a
+    # "Ground floor" floor_type (not the API floor_heat_loss=1 exposed code),
+    # so without the per-part ground signal the cascade dropped the floor.
+    # Worksheet-validated by simulated case 45: (28a) = 47.0 × U=0.54 = 25.38
+    # W/K, billed as 0 before this fix (+7 SAP).
+    ground = make_building_part(
+        identifier=BuildingPartIdentifier.MAIN,
+        construction_age_band="C",
+        floor_type="Ground floor",
+        floor_dimensions=[
+            make_floor_dimension(
+                total_floor_area_m2=47.0, room_height_m=2.4,
+                heat_loss_perimeter_m=15.8, party_wall_length_m=0.0, floor=0,
+            ),
+        ],
+    )
+    epc = make_minimal_sap10_epc(
+        total_floor_area_m2=47.0, country_code="ENG",
+        dwelling_type="Top-floor flat", property_type="Flat",
+        sap_building_parts=[ground],
+    )
+
+    # Act
+    result = heat_transmission_from_cert(epc)
+
+    # Assert — the ground floor carries heat loss (≈ 47 × 0.54), not 0.
+    assert result.floor_w_per_k > 20.0
+
+
+def test_top_floor_flat_with_party_floor_stays_suppressed() -> None:
+    # Arrange — the contrast: a flat lodging "(another dwelling below)" sits
+    # over a heated dwelling, so its floor is a party floor with no heat loss
+    # (RdSAP 10 §3). The ground-floor override must NOT fire — proving the
+    # discriminator is the floor_type, not the flat label.
+    party = make_building_part(
+        identifier=BuildingPartIdentifier.MAIN,
+        construction_age_band="C",
+        floor_type="To another dwelling below",
+        floor_dimensions=[
+            make_floor_dimension(
+                total_floor_area_m2=47.0, room_height_m=2.4,
+                heat_loss_perimeter_m=15.8, party_wall_length_m=0.0, floor=0,
+            ),
+        ],
+    )
+    epc = make_minimal_sap10_epc(
+        total_floor_area_m2=47.0, country_code="ENG",
+        dwelling_type="Top-floor flat", property_type="Flat",
+        sap_building_parts=[party],
+    )
+
+    # Act
+    result = heat_transmission_from_cert(epc)
+
+    # Assert — party floor, no heat loss.
+    assert result.floor_w_per_k == 0.0
+
+
 def test_part_geometry_floorless_part_honours_full_key_contract() -> None:
     # Arrange — a building part lodged with NO sap_floor_dimensions (e.g.
     # a party-wall-only or RR-only extension; observed on 5 certs in a
diff --git a/tests/domain/sap10_calculator/worksheet/test_section_cascade_pins.py b/tests/domain/sap10_calculator/worksheet/test_section_cascade_pins.py
index 6547a585e..ce93e21c2 100644
--- a/tests/domain/sap10_calculator/worksheet/test_section_cascade_pins.py
+++ b/tests/domain/sap10_calculator/worksheet/test_section_cascade_pins.py
@@ -46,6 +46,7 @@ from tests.domain.sap10_calculator.worksheet import (
     _elmhurst_worksheet_001431_case21 as _w001431_case21,
     _elmhurst_worksheet_001431_case43 as _w001431_case43,
     _elmhurst_worksheet_001431_case44 as _w001431_case44,
+    _elmhurst_worksheet_001431_case45 as _w001431_case45,
 )
 
 
@@ -491,6 +492,67 @@ def test_case44_blower_door_pressure_test_matches_pdf() -> None:
     _pin(vent.effective_monthly_ach[0], 0.5812, "§2 (25) Jan case44")
 
 
+def test_case45_heat_pump_two_climate_cascade_matches_pdf() -> None:
+    """Simulated case 45 (heat-pump ground-floor flat, postcode W6) is the
+    1e-4 oracle for the SAP 10.2 Appendix U (p.124) two-climate-cascade
+    split. The P960 prints the current dwelling twice:
+
+      * Block 1 ("11a SAP rating / 12a CO2") on UK-AVERAGE weather (region
+        0): space heat (98c) 7333.79, SAP (258) 60.5318, CO2 (272) 692.13.
+      * Block 2 ("EPC COSTS, EMISSIONS AND PRIMARY ENERGY") on POSTCODE
+        weather (PCDB Table 172, W6): space heat (98c) 5921.05, CO2 (272)
+        626.78, primary energy (286) 6581.59.
+
+    The SAP/EI rating reads the rating cascade; the EPC-displayed CO2/PE
+    read the demand cascade. Pins both ends at abs=1e-4."""
+    # Arrange
+    from domain.sap10_calculator.calculator import calculate_sap_from_inputs
+    from domain.sap10_calculator.rdsap.cert_to_inputs import cert_to_demand_inputs
+
+    epc = _w001431_case45.build_epc()
+    # The split only exists because the postcode resolves to local weather.
+    assert local_climate_for_cert(epc) is not None
+
+    # Act — both climate cascades from the one cert.
+    rating = calculate_sap_from_inputs(cert_to_inputs(epc))
+    demand = calculate_sap_from_inputs(cert_to_demand_inputs(epc))
+
+    # Assert — Block 1 (UK-average rating cascade).
+    _pin(
+        rating.space_heating_kwh_per_yr,
+        _w001431_case45.RATING_SPACE_HEATING_KWH,
+        "(98c) rating case45",
+    )
+    _pin(
+        rating.sap_score_continuous,
+        _w001431_case45.RATING_SAP_CONTINUOUS,
+        "(258) rating case45",
+    )
+    assert rating.sap_score == _w001431_case45.RATING_SAP_INTEGER
+    _pin(
+        rating.co2_kg_per_yr,
+        _w001431_case45.RATING_CO2_KG_PER_YR,
+        "(272) rating case45",
+    )
+
+    # Assert — Block 2 (postcode demand cascade).
+    _pin(
+        demand.space_heating_kwh_per_yr,
+        _w001431_case45.DEMAND_SPACE_HEATING_KWH,
+        "(98c) demand case45",
+    )
+    _pin(
+        demand.co2_kg_per_yr,
+        _w001431_case45.DEMAND_CO2_KG_PER_YR,
+        "(272) demand case45",
+    )
+    _pin(
+        demand.primary_energy_kwh_per_yr,
+        _w001431_case45.DEMAND_PRIMARY_ENERGY_KWH,
+        "(286) demand case45",
+    )
+
+
 def test_case6_main_2_emitter_and_control_extracted() -> None:
     """Simulated case 6's §14.1 Main Heating2 lodges its OWN emitter
     ("Underfloor Heating") and control ("SAP code 2110, ...") — the two
diff --git a/tests/domain/sap10_calculator/worksheet/test_water_heating.py b/tests/domain/sap10_calculator/worksheet/test_water_heating.py
index 5a96deb52..c7a2db79a 100644
--- a/tests/domain/sap10_calculator/worksheet/test_water_heating.py
+++ b/tests/domain/sap10_calculator/worksheet/test_water_heating.py
@@ -970,13 +970,17 @@ def test_water_heating_from_cert_matches_elmhurst_worksheet_000490() -> None:
     # Arrange
     epc = _w000490.build_epc()
 
-    # Act
+    # Act — 000490 lodges "Combi keep hot type = time clock" (U985 §15),
+    # so the (61)m combi loss is the Table 3a flat keep-hot row, not the
+    # "without keep-hot" 600 × fu default that `water_heating_from_cert`
+    # now applies when no override is supplied.
     result = water_heating_from_cert(
         epc=epc,
         mixer_shower_flow_rates_l_per_min=(7.0,),
         has_bath=True,
         cold_water_temps_c=TABLE_J1_TCOLD_FROM_MAINS_C,
         low_water_use=False,
+        combi_loss_monthly_kwh_override=combi_loss_monthly_kwh_table_3a_keep_hot_time_clock(),
     )
 
     # Assert — annual output equals the days-month-weighted sum of (64)m
diff --git a/tests/harness/test_report.py b/tests/harness/test_report.py
index 6b8bc9a46..304f89408 100644
--- a/tests/harness/test_report.py
+++ b/tests/harness/test_report.py
@@ -179,7 +179,7 @@ def test_few_measure_cert_surfaces_only_its_fired_measures_triggers() -> None:
     }
     assert triggers["low_energy_lighting"].triggers == {
         "incandescent_fixed_lighting_bulbs_count": 0,
-        "cfl_fixed_lighting_bulbs_count": None,
+        "cfl_fixed_lighting_bulbs_count": 0,
         "low_energy_fixed_lighting_bulbs_count": 7,
     }
 
diff --git a/tests/infrastructure/chatgpt/test_chatgpt_column_classifier.py b/tests/infrastructure/chatgpt/test_chatgpt_column_classifier.py
index 425d26251..0070af494 100644
--- a/tests/infrastructure/chatgpt/test_chatgpt_column_classifier.py
+++ b/tests/infrastructure/chatgpt/test_chatgpt_column_classifier.py
@@ -5,8 +5,8 @@ from typing import Optional
 import pytest
 
 from domain.data_transformation.column_classifier import ClassificationError
-from domain.epc.property_type import PropertyType
-from domain.epc.wall_type import WallType
+from domain.epc.property_overrides.property_type import PropertyType
+from domain.epc.property_overrides.wall_type import WallType
 from infrastructure.chatgpt.chatgpt import ChatGPT
 from infrastructure.chatgpt.chatgpt_column_classifier import (
     ChatGptColumnClassifier,
diff --git a/tests/infrastructure/epc_client/test_client.py b/tests/infrastructure/epc_client/test_client.py
index 190513ce2..97a0403b5 100644
--- a/tests/infrastructure/epc_client/test_client.py
+++ b/tests/infrastructure/epc_client/test_client.py
@@ -78,7 +78,7 @@ def test_429_retry_after_header_drives_sleep_duration(
         _mock_response(200, cert_response),
     ]
     with patch("httpx.get", side_effect=responses), patch(
-        "infrastructure.epc_client._retry.time.sleep"
+        "infrastructure.http_retry.time.sleep"
     ) as mock_sleep:
         epc_service.get_by_certificate_number("CERT-001")
 
@@ -100,7 +100,7 @@ def test_429_without_retry_after_uses_exponential_backoff(
         _mock_response(200, cert_response),
     ]
     with patch("httpx.get", side_effect=responses), patch(
-        "infrastructure.epc_client._retry.time.sleep"
+        "infrastructure.http_retry.time.sleep"
     ) as mock_sleep:
         epc_service.get_by_certificate_number("CERT-001")
 
@@ -121,7 +121,7 @@ def test_429_malformed_retry_after_falls_back_to_backoff(
         _mock_response(200, cert_response),
     ]
     with patch("httpx.get", side_effect=responses), patch(
-        "infrastructure.epc_client._retry.time.sleep"
+        "infrastructure.http_retry.time.sleep"
     ) as mock_sleep:
         epc_service.get_by_certificate_number("CERT-001")
 
@@ -140,7 +140,7 @@ def test_429_retry_after_capped_by_max_backoff(epc_service, rdsap_21_0_1_cert):
         _mock_response(200, cert_response),
     ]
     with patch("httpx.get", side_effect=responses), patch(
-        "infrastructure.epc_client._retry.time.sleep"
+        "infrastructure.http_retry.time.sleep"
     ) as mock_sleep:
         epc_service.get_by_certificate_number("CERT-001")
 
diff --git a/tests/infrastructure/epc_client/test_sap_accuracy_corpus.py b/tests/infrastructure/epc_client/test_sap_accuracy_corpus.py
index 9aed0f34b..cc57d28d9 100644
--- a/tests/infrastructure/epc_client/test_sap_accuracy_corpus.py
+++ b/tests/infrastructure/epc_client/test_sap_accuracy_corpus.py
@@ -30,11 +30,7 @@ from typing import Any
 import pytest
 
 from datatypes.epc.domain.mapper import EpcPropertyDataMapper
-from domain.sap10_calculator.calculator import calculate_sap_from_inputs
-from domain.sap10_calculator.rdsap.cert_to_inputs import (
-    SAP_10_2_SPEC_PRICES,
-    cert_to_inputs,
-)
+from domain.sap10_calculator.calculator import Sap10Calculator
 
 _CORPUS = Path(
     "backend/epc_api/json_samples/RdSAP-Schema-21.0.1/corpus.jsonl"
@@ -119,10 +115,142 @@ _CORPUS = Path(
 # 100010129331 (roof 110.5 -> 31.3 W/K, +13.1 -> -0.05 SAP). within-0.5
 # 68.8% -> 69.5% (MAE 0.888 -> 0.859; PE 13.9 -> 13.6); 3-part cohort 56% ->
 # 61%. Pinned in test_heat_transmission (by_kind split + no-contamination).
-_MIN_WITHIN_HALF_SAP = 0.69
-_MAX_SAP_MAE = 0.86
-_MAX_CO2_MAE_TONNES = 0.30      # t CO2 / yr vs co2_emissions_current
-_MAX_PE_PER_M2_MAE = 14.0       # kWh / m2 / yr vs energy_consumption_current
+# GROUND-FLOOR FLAT FLOOR EXPOSURE (RdSAP 10 §3.12): a ground-floor flat whose
+# dwelling_type the mapper labelled "Top-floor flat" had its ground floor (in
+# contact with the ground -> heat loss) dropped, because the flat exposure
+# heuristic keys on dwelling_type and the Summary path lodges the position as a
+# "Ground floor" floor_type (not the API floor_heat_loss=1 code). Treating a
+# "ground floor" floor_type as exposed (worksheet-validated to 1e-4 on simulated
+# case 45: floor (28a) 0 -> 25.38 W/K, fabric (33) 75.6 -> 101.01) -> 69.5% ->
+# 69.7% (MAE 0.859 -> 0.854). Pinned in test_heat_transmission.
+# POSTCODE DEMAND CASCADE (SAP 10.2 Appendix U paragraph 1, p.124): the
+# CO2/PE over-estimate diagnosed above as "per-cert mapper/demand fidelity"
+# was largely a CLIMATE-cascade bug. The SAP/EI rating is computed on
+# UK-average weather (Tables U1-U3 region 0), but EPC-displayed energy use,
+# CO2 emissions and primary energy use POSTCODE-DISTRICT weather from PCDB
+# Table 172 — "other calculations (such as for energy use and costs on EPCs)
+# are done using local weather". We were feeding the UK-average demand to all
+# three outputs, so warm-region certs (most of England, warmer than the
+# UK-average) over-counted heating demand → CO2/PE high. `Sap10Calculator.
+# calculate` now grafts the demand cascade's CO2/PE onto the rating cascade's
+# SAP. Across the corpus this moved CO2 MAE 0.26 -> 0.12 t/yr (bias +0.18 ->
+# +0.04) and PE MAE 13.6 -> 3.8 kWh/m2/yr (bias +9.0 -> +0.24); SAP unchanged
+# (rating cascade). Worksheet-validated to 1e-4 on simulated case 45 (rating
+# CO2 692.13; demand CO2 626.78, PE 6581.59). The residual PE/CO2 spread is
+# now the genuine per-cert mapper-fidelity tail.
+# DUAL-FUEL SECONDARY COLLISION (RdSAP 10 Table 32 / SAP 10.2 Table 12): the
+# gov-API lodges fuel enum 9 ("dual fuel, mineral and wood") for a dual-fuel
+# room heater, but enum 9 collides with the same-valued Table-32/12 code 9
+# (LPG SC11F), so the price (3.48 vs dual-fuel 3.99 p/kWh) AND the CO2/PE
+# factors (LPG 0.241 / 1.163 vs dual fuel 0.087 / 1.049) resolved to LPG —
+# the secondary was under-costed (→ SAP over-rate) and over-counted on CO2.
+# Canonicalising enum 9 (now in `_GOV_API_COLLISION_FUELS`) on the secondary
+# cost + factor paths took within-0.5 69.7% -> 70.2% (MAE 0.854 -> 0.845;
+# dual-fuel-secondary cohort 42.9% -> 49.0%, signed +0.55 -> +0.41) and CO2
+# MAE 0.12 -> 0.08 t/yr (bias +0.04 -> 0.00). A prior session deferred enum 9
+# ("direction not understood") while the PE/CO2 lens was confounded by the
+# climate-cascade bug (fc7c4d2d); the corrected lens shows the over-rate.
+# UNINSULATED STONE WALL §5.6 FORMULA (RdSAP 10 §5.6 Table 12, PDF p.40): a
+# stone wall of KNOWN thickness whose insulation STATE is known (As Built /
+# external / internal) is billed by the §5.6 formula on its lodged thickness
+# (sandstone/limestone U = 54.876·W^-0.561, granite/whinstone 45.315·W^-0.513),
+# NOT capped at the Table-6 typical-thickness 1.7. The old `if u0>=1.7: 1.7`
+# cap nullified the formula for every real-thickness stone wall (it only dips
+# below 1.7 past ~488 mm sandstone / ~640 mm granite) and under-counted fabric
+# loss → over-rate. Gated on `wall_insulation_type is not None` so an
+# "insulation Unknown" wall still falls to the Table-6 default (cert 000565
+# Ext1: granite 50 mm + Unknown → worksheet 1.70, not the formula's 6.09).
+# Took within-0.5 70.3% -> 71.6% (MAE 0.833 -> 0.822); fixed the 2 stone-U
+# unit tests; worksheet-validated (Elmhurst age-B sandstone 400 mm → 1.90).
+#
+# STONE MECHANISM CORRECTED (RdSAP 10 Tables 6-7 footnote a + §3.5 Table 3):
+# the commit above (034d4b7c) got the right numbers for two cases but the
+# wrong mechanism — it dropped the 1.7 cap for ALL age bands and gated on
+# `wall_insulation_type is not None`. Per Tables 6-10: bands A-D = uncapped
+# §5.6 formula, band E = min(formula, 1.7) (Scotland sandstone 1.5); the cap
+# is age-E ONLY. The insulation-state gate is not a spec rule (it sent
+# age-A-D "insulation Unknown" stone to the flat 1.7 table). Unknown
+# thickness now feeds the §3.5 Table-3 default thickness (stone A-D 500 mm,
+# E 450; Scotland +200/+100) into the formula — Elmhurst defaults an England
+# age-B granite as-built unknown-thickness wall to 500 mm → 1.87 (sandstone
+# 1.68), NOT a flat 1.7. Also added the missing Scotland band-J 0.30 override
+# (Table 7) for all 7 as-built wall types. MAE 0.822 -> 0.819, PE 3.7 -> 3.6;
+# within-0.5 and CO2 unchanged. Unit-pinned in test_rdsap_uvalues.
+#
+# SAP RATING FLOOR (SAP 10.2 §13 / RdSAP 10 §13): the rating is floored at 1
+# ("if the result is less than 1, the rating is 1"). `calculate_sap_from_inputs`
+# now applies that floor to the CONTINUOUS score too (was integer-only), so a
+# degenerate dwelling no longer emits a negative SAP. Removed a -12.3 outlier
+# (cert 422000111926, lodged at the floor of 1, was computing -11.3): within-0.5
+# 70.2% -> 70.3%, MAE 0.845 -> 0.833.
+# EXTRACT-FAN DEFAULT IS UNKNOWN-FALLBACK, NOT A FLOOR (RdSAP 10 §4.1 Table 5,
+# PDF p.28). Table 5 reads "Number of extract fans if known; if unknown:
+# [age-band default]". The cascade applied `max(lodged, age_default)`, flooring
+# a genuinely-lodged count up to the age-band minimum (e.g. an age H-M dwelling
+# lodging 2 fans billed at the 3-fan default), over-counting ventilation line
+# (8) and the HLC. Fixed to `lodged if lodged > 0 else default` (a lodged 0 is
+# the Elmhurst/RdSAP "unknown" form → default; any positive count is literal).
+# within-0.5 71.6% -> 72.5%, MAE 0.819 -> 0.815. Surfaced by Khalim's Elmhurst
+# stress worksheet (simulated case 46): closed its last ventilation residual
+# (our Jan ACH 9.14 -> 9.0748 exact; SAP 29 -> 30 = accredited Elmhurst).
+_MIN_WITHIN_HALF_SAP = 0.74
+# 0.793 -> 0.789 via the §12 Unknown-meter + dual-electric-immersion off-peak
+# trigger (RdSAP 10 PDF p.62): Apartment 241 (main 691 + 903 dual immersion)
+# -5.38 -> -1.05. Worksheet-validated on "simulated case 48" (Elmhurst SAP 57,
+# 10-Hour Off Peak). Then 0.789 -> 0.788 (within-0.5 72.5% -> 72.6%) via the
+# dMEV intermittent-fan fix: an EXTRACT_OR_PIV_OUTSIDE cert lodging 0 fans now
+# takes 0 (not the Table 5 age-band default) — same "case 48" worksheet closes
+# its space-heating demand to land SAP 57 exact.
+# 0.788 -> 0.782 (within-0.5 72.6% -> 72.7%, PE 3.6 -> 3.5) via MVHR (24a) heat-
+# recovery support: the gov-API `mechanical_ventilation=4` cohort (balanced
+# whole-house MV with heat recovery) was treated as natural; now credited via
+# PCDB Table 323 efficiency × Table 329 in-use factor and the §2.6.6 eq (2)
+# effective-air-change formula + (230a) fan electricity. Worksheet-proven on
+# simulated case 49 (Vent Axia 500140, every MVHR line — (33) 100.5923, (23c)
+# 81.9%, (230a) 415.9325, (231) 501.9325 — matching Elmhurst exactly). Corpus
+# MVHR certs: Flat 1 +6 -> 0, 12a Princes Gate +3 -> +1; Apartment 707's -4 ->
+# -6 is a separate baseline under-rate (it under-rated as natural too).
+# Then 0.782 -> 0.781 via extending the dMEV "lodged 0 extract fans, no Table 5
+# default" rule to MVHR (the balanced system is the ventilation, so a lodged
+# (7a)=0 is explicit): case 49's (8) openings line is 0.0000 — our default had
+# added 20 m3/h (0.0723 ach), inflating (22b)/(25)/(38) and demand (SAP 70.90
+# -> 71.43; the worksheet's own continuous SAP is 71.69 -> rounds to 72).
+# Then 0.781 -> 0.774 (within-0.5 72.7% -> 73.3%, PE 3.5 -> 3.4) via the combi
+# keep-hot fix: SAP 10.2 Table 3a (PDF p.160) — keep-hot rides on the PCDB
+# boiler record (Table 105 keep_hot_facility/timer), NOT a separate cert field.
+# (a) A non-PCDB / generic-SAP-code combi has no keep-hot → "without keep-hot"
+# row 600 × fu × n/365 (fu = V_d/100 when V_d < 100), now the cascade default;
+# the cascade had wrongly defaulted every non-PCDB combi to the flat keep-hot
+# 600 × n/365 row. (b) `pcdb_combi_loss_override` now returns the keep-hot row
+# EXPLICITLY for keep_hot_facility=1/timer=1 (was returning None to lean on the
+# old flat default — so flipping the default had silently turned 190 PCDB
+# keep-hot combis into no-keep-hot). Closes case 49 EXACTLY (cost £726.696,
+# SAP 72 = the worksheet to the digit).
+# Then 0.774 -> 0.761 (within-0.5 73.3% -> 73.6%) via the mislabelled-top-floor
+# roof-exposure fix (RdSAP 10 §3 / §5): a gov-API flat lodged "Mid-floor" but
+# carrying a determined `roof_insulation_location` (an RdSAP code, not "ND")
+# has its own exposed roof — a top-floor flat mislabelled mid-floor — so the
+# roof heat-loss term must NOT be dropped. `_dwelling_exposure` now reads the
+# structured location field (not the dwelling_type label alone). Motivated by
+# property 715363 (uprn 6027561): roof dropped under-read space-heating demand
+# ~32% (1833 vs lodged RHI 2694), over-read SAP +7 (81 vs lodged 74); the
+# correctly labelled top-floor sibling 715871 (same block, same flat roof)
+# already computes 74. roof_insulation_location="ND" ⟺ party ceiling separates
+# the corpus classes with zero disagreement (all 190 party flats lodge "ND");
+# the 4 mid/ground-floor flats this exposes all move toward lodged, 0 away.
+# Then 0.761 -> 0.740 (within-0.5 73.6% -> 74.1%) via the PV dwelling-meter
+# connection gate (RdSAP 10 §11.1 / SAP 10.2 Appendix M): PV is credited to the
+# dwelling only when gov-API `pv_connection == 2` ("connected to the dwelling's
+# meter"); == 1 ("present but NOT connected" — communal / separately metered)
+# now contributes zero to cost/CO2/PE. All 5 pv_connection=1 PV certs move
+# inside ±0.5 (e.g. 100051118081 +6.5 -> +0.5); pv_connection=2 certs (52) keep
+# their credit (corpus MAE 0.98 with vs 10.29 without). Khalim's Elmhurst proof:
+# an identical dwelling rates SAP 87 with "Connected to Dwelling = Yes" (credit
+# -£167) vs SAP 74 with "No" (credit £0). Enum decoded empirically: 0 = no PV,
+# 1 = not connected, 2 = connected (the gov-API does not expose it elsewhere).
+_MAX_SAP_MAE = 0.740
+_MAX_CO2_MAE_TONNES = 0.09      # t CO2 / yr vs co2_emissions_current
+_MAX_PE_PER_M2_MAE = 3.5        # kWh / m2 / yr vs energy_consumption_current
 
 
 def _load_corpus() -> list[dict[str, Any]]:
@@ -147,8 +275,12 @@ def test_api_path_sap_accuracy_on_rdsap_21_0_1_corpus(
     co2_signed_errs_t: list[float] = []      # our − lodged, tonnes/yr
     pe_signed_errs: list[float] = []          # our − lodged, kWh/m²/yr
     skipped = 0
+    _calculator = Sap10Calculator()
 
     # Act — run the API → EpcPropertyData → calculator pipeline per cert.
+    # `Sap10Calculator.calculate` runs both climate cascades (SAP 10.2
+    # Appendix U p.124): the SAP rating on UK-average weather, CO2/PE on
+    # postcode-district weather — exactly the two figures the EPC lodges.
     for doc in corpus:
         lodged_sap = doc.get("energy_rating_current")
         if lodged_sap is None:
@@ -156,9 +288,7 @@ def test_api_path_sap_accuracy_on_rdsap_21_0_1_corpus(
             continue
         try:
             epc = EpcPropertyDataMapper.from_api_response(doc)
-            result = calculate_sap_from_inputs(
-                cert_to_inputs(epc, prices=SAP_10_2_SPEC_PRICES)
-            )
+            result = _calculator.calculate(epc)
         except Exception:
             # A mapper / calculator raise is a coverage gap tracked elsewhere
             # (eval_api_sap_accuracy.py); here we gauge the certs that compute.
diff --git a/tests/infrastructure/postcodes_io/__init__.py b/tests/infrastructure/postcodes_io/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/infrastructure/postcodes_io/test_postcodes_io_client.py b/tests/infrastructure/postcodes_io/test_postcodes_io_client.py
new file mode 100644
index 000000000..4d5e34a0c
--- /dev/null
+++ b/tests/infrastructure/postcodes_io/test_postcodes_io_client.py
@@ -0,0 +1,224 @@
+"""PostcodesIoClient — coordinate/seed postcode → the real unit postcodes near
+it, via postcodes.io's keyless nearest endpoint. Failure degrades to the seed
+alone so broadening never breaks prediction."""
+
+from __future__ import annotations
+
+from typing import Any, Iterator, Optional
+from unittest.mock import MagicMock, patch
+
+import httpx
+import pytest
+
+from domain.geospatial.coordinates import Coordinates
+from infrastructure.postcodes_io.postcodes_io_client import PostcodesIoClient
+
+_MODULE = "infrastructure.postcodes_io.postcodes_io_client"
+
+
+@pytest.fixture(autouse=True)
+def _no_sleep() -> Iterator[MagicMock]:
+    """Never actually sleep during backoff (the shared retry owns the sleep) —
+    just record the calls."""
+    with patch("infrastructure.http_retry.time.sleep") as sleep:
+        yield sleep
+
+
+def _response(
+    payload: Any,
+    *,
+    status_code: int = 200,
+    headers: Optional[dict[str, str]] = None,
+) -> MagicMock:
+    resp = MagicMock()
+    resp.status_code = status_code
+    resp.is_success = 200 <= status_code < 300
+    resp.headers = headers if headers is not None else {}
+    resp.json.return_value = payload
+    return resp
+
+
+def _nearest_payload(postcodes: list[str]) -> dict[str, Any]:
+    return {"result": [{"postcode": p} for p in postcodes]}
+
+
+def test_nearby_with_coordinates_skips_the_centroid_lookup() -> None:
+    """When the target's own coordinates are passed, only the radius search is
+    issued — no postcode→centroid round-trip — and the seed leads the result."""
+    # Arrange
+    client = PostcodesIoClient(radius_m=500, limit=10)
+    coords = Coordinates(longitude=0.1, latitude=51.3)
+
+    with patch(f"{_MODULE}.httpx.get") as mock_get:
+        mock_get.return_value = _response(
+            _nearest_payload(["BR6 6BS", "BR6 6BU", "BR6 6NX"])
+        )
+
+        # Act
+        result = client.nearby("BR6 6BS", coords)
+
+    # Assert — one call (the radius search), seed first, neighbours follow
+    assert result == ["BR6 6BS", "BR6 6BU", "BR6 6NX"]
+    assert mock_get.call_count == 1
+    _, kwargs = mock_get.call_args
+    assert kwargs["params"]["lat"] == 51.3
+    assert kwargs["params"]["lon"] == 0.1
+
+
+def test_nearby_resolves_the_seed_centroid_when_no_coordinates_given() -> None:
+    """Without coordinates the client first resolves the seed's own centroid via
+    postcodes.io, then runs the radius search from it."""
+    # Arrange
+    client = PostcodesIoClient()
+    centroid = {"result": {"latitude": 51.3, "longitude": 0.1}}
+
+    with patch(f"{_MODULE}.httpx.get") as mock_get:
+        mock_get.side_effect = [
+            _response(centroid),
+            _response(_nearest_payload(["BR6 6BS", "BR6 6BU"])),
+        ]
+
+        # Act
+        result = client.nearby("BR6 6BS")
+
+    # Assert — two calls: centroid then radius
+    assert result == ["BR6 6BS", "BR6 6BU"]
+    assert mock_get.call_count == 2
+
+
+def test_nearby_dedupes_the_seed_and_caps_at_limit() -> None:
+    """The seed always leads exactly once even when the radius search echoes it,
+    and the result is capped at ``limit``."""
+    # Arrange
+    client = PostcodesIoClient(limit=3)
+    coords = Coordinates(longitude=0.1, latitude=51.3)
+
+    with patch(f"{_MODULE}.httpx.get") as mock_get:
+        mock_get.return_value = _response(
+            _nearest_payload(["BR6 6BS", "BR6 6BU", "BR6 6NX", "BR6 6AA"])
+        )
+
+        # Act
+        result = client.nearby("BR6 6BS", coords)
+
+    # Assert
+    assert result == ["BR6 6BS", "BR6 6BU", "BR6 6NX"]
+    assert result.count("BR6 6BS") == 1
+
+
+def test_nearby_returns_just_the_seed_after_exhausting_retries(
+    _no_sleep: MagicMock,
+) -> None:
+    """A persistent network error is retried, then degrades to broadening-off:
+    only the seed comes back, and the retries were actually attempted."""
+    # Arrange
+    client = PostcodesIoClient()
+    coords = Coordinates(longitude=0.1, latitude=51.3)
+
+    with patch(
+        f"{_MODULE}.httpx.get", side_effect=httpx.ConnectError("down")
+    ) as mock_get:
+        # Act
+        result = client.nearby("BR6 6BS", coords)
+
+    # Assert — one initial try + MAX_RETRIES, sleeping between each.
+    assert result == ["BR6 6BS"]
+    assert mock_get.call_count == client.MAX_RETRIES + 1
+    assert _no_sleep.call_count == client.MAX_RETRIES
+
+
+def test_nearby_retries_a_transport_error_then_succeeds(_no_sleep: MagicMock) -> None:
+    """A transient transport error is retried, and the subsequent success is
+    returned in full."""
+    # Arrange
+    client = PostcodesIoClient()
+    coords = Coordinates(longitude=0.1, latitude=51.3)
+
+    with patch(f"{_MODULE}.httpx.get") as mock_get:
+        mock_get.side_effect = [
+            httpx.ReadTimeout("slow"),
+            _response(_nearest_payload(["BR6 6BS", "BR6 6BU"])),
+        ]
+
+        # Act
+        result = client.nearby("BR6 6BS", coords)
+
+    # Assert
+    assert result == ["BR6 6BS", "BR6 6BU"]
+    assert mock_get.call_count == 2
+    assert _no_sleep.call_count == 1
+
+
+def test_nearby_retries_a_429_honouring_retry_after(_no_sleep: MagicMock) -> None:
+    """A 429 is retried, and the server's Retry-After drives the backoff delay."""
+    # Arrange
+    client = PostcodesIoClient()
+    coords = Coordinates(longitude=0.1, latitude=51.3)
+
+    with patch(f"{_MODULE}.httpx.get") as mock_get:
+        mock_get.side_effect = [
+            _response(None, status_code=429, headers={"Retry-After": "2"}),
+            _response(_nearest_payload(["BR6 6BS", "BR6 6BU"])),
+        ]
+
+        # Act
+        result = client.nearby("BR6 6BS", coords)
+
+    # Assert — succeeded on the retry, having slept the advertised 2 seconds.
+    assert result == ["BR6 6BS", "BR6 6BU"]
+    assert mock_get.call_count == 2
+    _no_sleep.assert_called_once_with(2.0)
+
+
+def test_nearby_retries_a_server_error_then_succeeds(_no_sleep: MagicMock) -> None:
+    """A 5xx is treated as transient and retried."""
+    # Arrange
+    client = PostcodesIoClient()
+    coords = Coordinates(longitude=0.1, latitude=51.3)
+
+    with patch(f"{_MODULE}.httpx.get") as mock_get:
+        mock_get.side_effect = [
+            _response(None, status_code=503),
+            _response(_nearest_payload(["BR6 6BS"])),
+        ]
+
+        # Act
+        result = client.nearby("BR6 6BS", coords)
+
+    # Assert
+    assert result == ["BR6 6BS"]
+    assert mock_get.call_count == 2
+
+
+def test_nearby_returns_just_the_seed_when_centroid_unresolvable() -> None:
+    """An unknown seed (no coordinates, centroid lookup fails) yields the seed
+    alone rather than raising."""
+    # Arrange
+    client = PostcodesIoClient()
+
+    with patch(f"{_MODULE}.httpx.get") as mock_get:
+        mock_get.return_value = _response(None, status_code=404)
+
+        # Act
+        result: list[str] = client.nearby("ZZ99 9ZZ")
+
+    # Assert — a 404 is non-transient, so no retry was attempted.
+    assert result == ["ZZ99 9ZZ"]
+    assert mock_get.call_count == 1
+
+
+def test_nearby_tolerates_a_null_nearest_result() -> None:
+    """postcodes.io returns ``result: null`` when a point has no neighbours; the
+    client treats that as an empty neighbour set (seed only)."""
+    # Arrange
+    client = PostcodesIoClient()
+    coords: Optional[Coordinates] = Coordinates(longitude=0.1, latitude=51.3)
+
+    with patch(f"{_MODULE}.httpx.get") as mock_get:
+        mock_get.return_value = _response({"result": None})
+
+        # Act
+        result = client.nearby("BR6 6BS", coords)
+
+    # Assert
+    assert result == ["BR6 6BS"]
diff --git a/tests/infrastructure/solar/test_google_solar_api_client.py b/tests/infrastructure/solar/test_google_solar_api_client.py
index d4328fc03..ce55cbc8a 100644
--- a/tests/infrastructure/solar/test_google_solar_api_client.py
+++ b/tests/infrastructure/solar/test_google_solar_api_client.py
@@ -1,15 +1,153 @@
-from typing import Any
-from unittest.mock import MagicMock, patch
+from typing import Any, Optional
+from unittest.mock import MagicMock, call, patch
 
 import pytest
 import requests
 
+from infrastructure.http_retry import TransientHttpError
 from infrastructure.solar.google_solar_api_client import (
     BuildingInsightsNotFoundError,
     GoogleSolarApiClient,
 )
 
 
+def _http_error(
+    status_code: int, *, headers: Optional[dict[str, str]] = None
+) -> requests.exceptions.HTTPError:
+    resp = MagicMock()
+    resp.status_code = status_code
+    resp.headers = headers or {}
+    err = requests.exceptions.HTTPError(str(status_code))
+    err.response = resp
+    return err
+
+
+def _raising_response(err: Exception) -> MagicMock:
+    resp = MagicMock()
+    resp.raise_for_status.side_effect = err
+    return resp
+
+
+def test_get_building_insights_retries_429_then_succeeds() -> None:
+    # Arrange — a rate-limit (429) then a success. The 429 is transient, so the
+    # client backs off and retries rather than failing.
+    client = GoogleSolarApiClient(api_key="test-key")
+    payload: dict[str, Any] = {"solarPotential": {"maxArrayPanelsCount": 20}}
+    ok = MagicMock()
+    ok.json.return_value = payload
+    ok.raise_for_status.return_value = None
+
+    with patch("requests.get", side_effect=[_raising_response(_http_error(429)), ok]) as mock_get:
+        with patch("infrastructure.http_retry.time.sleep"):
+            # Act
+            result = client.get_building_insights(longitude=-0.1278, latitude=51.5074)
+
+    # Assert
+    assert result == payload
+    assert mock_get.call_count == 2
+
+
+def test_get_building_insights_honours_retry_after_on_429() -> None:
+    # Arrange — a persistent 429 advertising Retry-After: 2s. The client sleeps
+    # exactly that (not a jittered computed backoff) and gives up bounded.
+    client = GoogleSolarApiClient(api_key="test-key")
+    err = _http_error(429, headers={"Retry-After": "2"})
+
+    with patch("requests.get", return_value=_raising_response(err)) as mock_get:
+        with patch("infrastructure.http_retry.time.sleep") as sleep:
+            # Act / Assert — exhaustion raises a TransientHttpError, not the raw HTTPError.
+            with pytest.raises(TransientHttpError):
+                client.get_building_insights(longitude=-0.1278, latitude=51.5074)
+
+    # Bounded: MAX_RETRIES retries + the initial attempt; Retry-After honoured.
+    assert mock_get.call_count == GoogleSolarApiClient.MAX_RETRIES + 1
+    assert call(2.0) in sleep.call_args_list
+
+
+def test_get_building_insights_retries_on_500() -> None:
+    # Arrange — a 5xx is transient too; retry then succeed.
+    client = GoogleSolarApiClient(api_key="test-key")
+    payload: dict[str, Any] = {"solarPotential": {}}
+    ok = MagicMock()
+    ok.json.return_value = payload
+    ok.raise_for_status.return_value = None
+
+    with patch("requests.get", side_effect=[_raising_response(_http_error(503)), ok]) as mock_get:
+        with patch("infrastructure.http_retry.time.sleep"):
+            # Act
+            result = client.get_building_insights(longitude=-0.1278, latitude=51.5074)
+
+    # Assert
+    assert result == payload
+    assert mock_get.call_count == 2
+
+
+def test_get_building_insights_does_not_retry_a_400() -> None:
+    # Arrange — a non-transient client error (e.g. bad request) propagates at once.
+    client = GoogleSolarApiClient(api_key="test-key")
+
+    with patch("requests.get", return_value=_raising_response(_http_error(400))) as mock_get:
+        with patch("infrastructure.http_retry.time.sleep"):
+            # Act / Assert
+            with pytest.raises(requests.exceptions.HTTPError):
+                client.get_building_insights(longitude=-0.1278, latitude=51.5074)
+
+    assert mock_get.call_count == 1
+
+
+# ---------------------------------------------------------------------------
+# Throttle: per-instance min-interval keeps the fleet under the 600 QPM cap
+# ---------------------------------------------------------------------------
+
+
+def test_throttle_spaces_consecutive_calls_by_min_interval() -> None:
+    # Arrange — a client paced at a 4s minimum gap between its OWN Solar calls
+    # (quota/N at the 32-wide fleet: 0.8 * 600 QPM / 32 ≈ one call / 4s). The
+    # first call fires immediately; the second must wait out the remainder of the
+    # interval before hitting the API, so the fleet stays under the hard 600 QPM
+    # ceiling instead of sustaining the over-quota burst that 429'd portfolio 796.
+    client = GoogleSolarApiClient(
+        api_key="test-key", min_request_interval_seconds=4.0
+    )
+    ok = MagicMock()
+    ok.json.return_value = {"solarPotential": {}}
+    ok.raise_for_status.return_value = None
+
+    with patch("requests.get", return_value=ok):
+        with patch(
+            "infrastructure.solar.google_solar_api_client.time.sleep"
+        ) as sleep:
+            # Act — two back-to-back calls with no real work between them.
+            client.get_building_insights(longitude=-0.1278, latitude=51.5074)
+            client.get_building_insights(longitude=-0.1278, latitude=51.5074)
+
+    # Assert — first call doesn't wait; second waits ~the full interval (no time
+    # elapsed between them, so the remaining gap is essentially the whole 4s).
+    assert sleep.call_count == 1
+    (waited,), _ = sleep.call_args
+    assert 3.5 <= waited <= 4.0
+
+
+def test_throttle_off_by_default_does_not_sleep() -> None:
+    # Arrange — no interval configured (the interactive backend path): the client
+    # must not pace, preserving today's behaviour.
+    client = GoogleSolarApiClient(api_key="test-key")
+    ok = MagicMock()
+    ok.json.return_value = {"solarPotential": {}}
+    ok.raise_for_status.return_value = None
+
+    with patch("requests.get", return_value=ok):
+        with patch(
+            "infrastructure.solar.google_solar_api_client.time.sleep"
+        ) as sleep:
+            # Act
+            client.get_building_insights(longitude=-0.1278, latitude=51.5074)
+            client.get_building_insights(longitude=-0.1278, latitude=51.5074)
+
+    # Assert
+    sleep.assert_not_called()
+
+
 # ---------------------------------------------------------------------------
 # Slice 1: Successful response returns parsed JSON
 # ---------------------------------------------------------------------------
@@ -94,17 +232,19 @@ def test_get_building_insights_raises_on_entity_not_found() -> None:
 # ---------------------------------------------------------------------------
 
 
-def test_get_building_insights_propagates_exception_after_retry_exhaustion() -> None:
-    # Arrange
+def test_get_building_insights_fails_bounded_after_retry_exhaustion() -> None:
+    # Arrange — a persistent transport failure (no response). It's transient, so
+    # the client retries up to the bound, then surfaces a TransientHttpError for
+    # the caller to fail the subtask on (re-triggerable) — NOT an infinite loop.
     client = GoogleSolarApiClient(api_key="test-key")
 
     error = requests.exceptions.ConnectionError("persistent failure")
     error.response = None  # type: ignore[attr-defined]
 
     with patch("requests.get", side_effect=error) as mock_get:
-        with patch("time.sleep"):
+        with patch("infrastructure.http_retry.time.sleep"):
             # Act / Assert
-            with pytest.raises(requests.exceptions.ConnectionError):
+            with pytest.raises(TransientHttpError):
                 client.get_building_insights(longitude=-0.1278, latitude=51.5074)
 
-    assert mock_get.call_count == GoogleSolarApiClient.MAX_RETRIES
+    assert mock_get.call_count == GoogleSolarApiClient.MAX_RETRIES + 1
diff --git a/tests/infrastructure/test_http_retry.py b/tests/infrastructure/test_http_retry.py
new file mode 100644
index 000000000..13250cdef
--- /dev/null
+++ b/tests/infrastructure/test_http_retry.py
@@ -0,0 +1,166 @@
+"""call_with_retry — the shared transient-failure retry both HTTP source clients
+use. Generic mechanism (exponential backoff, Retry-After), per-client policy
+(what gets raised as transient)."""
+
+from __future__ import annotations
+
+from typing import Iterator
+from unittest.mock import MagicMock, call, patch
+
+import httpx
+import pytest
+
+from infrastructure.http_retry import TransientHttpError, call_with_retry
+
+
+@pytest.fixture(autouse=True)
+def _no_sleep() -> Iterator[MagicMock]:
+    with patch("infrastructure.http_retry.time.sleep") as sleep:
+        yield sleep
+
+
+def test_returns_immediately_on_success(_no_sleep: MagicMock) -> None:
+    # Act
+    result = call_with_retry(lambda: 42)
+
+    # Assert
+    assert result == 42
+    _no_sleep.assert_not_called()
+
+
+def test_retries_a_transient_error_then_succeeds(_no_sleep: MagicMock) -> None:
+    # Arrange — fail twice transiently, then succeed.
+    calls = {"n": 0}
+
+    def fn() -> str:
+        calls["n"] += 1
+        if calls["n"] < 3:
+            raise TransientHttpError("429")
+        return "ok"
+
+    # Act
+    result = call_with_retry(fn)
+
+    # Assert — exponential backoff between the three attempts.
+    assert result == "ok"
+    assert _no_sleep.call_args_list == [call(1.0), call(2.0)]
+
+
+def test_honours_retry_after_over_the_computed_backoff(_no_sleep: MagicMock) -> None:
+    # Arrange
+    raised = {"done": False}
+
+    def fn() -> str:
+        if not raised["done"]:
+            raised["done"] = True
+            raise TransientHttpError("429", retry_after=7.0)
+        return "ok"
+
+    # Act
+    call_with_retry(fn)
+
+    # Assert
+    _no_sleep.assert_called_once_with(7.0)
+
+
+def test_retries_transport_errors(_no_sleep: MagicMock) -> None:
+    # Arrange
+    attempts = {"n": 0}
+
+    def fn() -> str:
+        attempts["n"] += 1
+        if attempts["n"] == 1:
+            raise httpx.ReadTimeout("slow")
+        return "ok"
+
+    # Act
+    result = call_with_retry(fn)
+
+    # Assert
+    assert result == "ok"
+    assert attempts["n"] == 2
+
+
+def test_reraises_the_last_transient_error_once_exhausted(
+    _no_sleep: MagicMock,
+) -> None:
+    # Arrange — always transient.
+    def fn() -> str:
+        raise TransientHttpError("persistent 429")
+
+    # Act / Assert
+    with pytest.raises(TransientHttpError, match="persistent 429"):
+        call_with_retry(fn, max_retries=2)
+    assert _no_sleep.call_count == 2
+
+
+def test_non_transient_error_propagates_without_retry(_no_sleep: MagicMock) -> None:
+    # Arrange
+    attempts = {"n": 0}
+
+    def fn() -> str:
+        attempts["n"] += 1
+        raise ValueError("not transient")
+
+    # Act / Assert
+    with pytest.raises(ValueError, match="not transient"):
+        call_with_retry(fn)
+    assert attempts["n"] == 1
+    _no_sleep.assert_not_called()
+
+
+def test_jitter_full_randomizes_the_computed_backoff(_no_sleep: MagicMock) -> None:
+    # Arrange — fail once transiently (no server Retry-After), then succeed.
+    calls = {"n": 0}
+
+    def fn() -> str:
+        calls["n"] += 1
+        if calls["n"] < 2:
+            raise TransientHttpError("429")
+        return "ok"
+
+    # Act — full jitter draws the sleep uniformly from [0, computed_backoff].
+    with patch("infrastructure.http_retry.random.uniform", return_value=0.4) as runi:
+        result = call_with_retry(fn, jitter=True)
+
+    # Assert — the first computed backoff is 1.0; jitter draws over [0, 1.0]
+    # and the drawn value is what we sleep for (de-syncs concurrent retries).
+    assert result == "ok"
+    runi.assert_called_once_with(0.0, 1.0)
+    _no_sleep.assert_called_once_with(0.4)
+
+
+def test_jitter_does_not_apply_to_a_server_retry_after(_no_sleep: MagicMock) -> None:
+    # Arrange — the server advised an exact Retry-After; jitter must not perturb it.
+    raised = {"done": False}
+
+    def fn() -> str:
+        if not raised["done"]:
+            raised["done"] = True
+            raise TransientHttpError("429", retry_after=7.0)
+        return "ok"
+
+    # Act
+    with patch("infrastructure.http_retry.random.uniform") as runi:
+        call_with_retry(fn, jitter=True)
+
+    # Assert — Retry-After is honoured verbatim, no random draw.
+    runi.assert_not_called()
+    _no_sleep.assert_called_once_with(7.0)
+
+
+def test_retry_after_is_capped_by_max_backoff(_no_sleep: MagicMock) -> None:
+    # Arrange
+    raised = {"done": False}
+
+    def fn() -> str:
+        if not raised["done"]:
+            raised["done"] = True
+            raise TransientHttpError("429", retry_after=999.0)
+        return "ok"
+
+    # Act
+    call_with_retry(fn, max_backoff=60.0)
+
+    # Assert
+    _no_sleep.assert_called_once_with(60.0)
diff --git a/tests/lambdas/__init__.py b/tests/lambdas/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/lambdas/modelling_e2e/__init__.py b/tests/lambdas/modelling_e2e/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/orchestration/fakes.py b/tests/orchestration/fakes.py
index 7b180ca3a..d12942919 100644
--- a/tests/orchestration/fakes.py
+++ b/tests/orchestration/fakes.py
@@ -17,7 +17,8 @@ from domain.modelling.scenario import Scenario
 from domain.property_baseline.property_baseline_performance import PropertyBaselinePerformance
 from domain.property.properties import Properties
 from domain.property.property import Property
-from repositories.plan.plan_repository import PlanRepository
+from repositories.epc.epc_postgres_repository import EpcSaveRequest
+from repositories.plan.plan_repository import PlanRepository, PlanSaveRequest
 from repositories.product.product_repository import ProductRepository
 from repositories.property_baseline.property_baseline_repository import PropertyBaselineRepository
 from repositories.epc.epc_repository import EpcRepository, EpcSource
@@ -130,6 +131,9 @@ class FakeEpcRepo(EpcRepository):
             if property_id in self._predicted_by_property
         }
 
+    def save_batch(self, requests: list[EpcSaveRequest]) -> list[int]:
+        return [self.save(r.data, r.property_id, r.portfolio_id, r.source) for r in requests]
+
 
 class FakeSolarRepo(SolarRepository):
     """In-memory Google Solar insights store keyed by UPRN. Seed `by_uprn` to
@@ -218,6 +222,18 @@ class FakePlanRepository(PlanRepository):
         self._next_id += 1
         return plan_id
 
+    def save_batch(self, requests: list[PlanSaveRequest]) -> list[int]:
+        return [
+            self.save(
+                r.plan,
+                property_id=r.property_id,
+                scenario_id=r.scenario_id,
+                portfolio_id=r.portfolio_id,
+                is_default=r.is_default,
+            )
+            for r in requests
+        ]
+
 
 class _UnsetProductRepo(ProductRepository):
     """Default for a `FakeUnitOfWork` built without a catalogue — raises if a
diff --git a/tests/orchestration/test_ara_first_run_pipeline_integration.py b/tests/orchestration/test_ara_first_run_pipeline_integration.py
index 192f07a55..bed58c759 100644
--- a/tests/orchestration/test_ara_first_run_pipeline_integration.py
+++ b/tests/orchestration/test_ara_first_run_pipeline_integration.py
@@ -192,14 +192,8 @@ def test_first_run_baselines_through_repos_and_is_idempotent_on_rerun(
                     is_active=True,
                     description="Zoned heating controls + cylinder tune-up",
                 ),
-                MaterialRow(
-                    id=9,
-                    type="secondary_heating_removal",
-                    total_cost=250.0,
-                    cost_unit="gbp_per_unit",
-                    is_active=True,
-                    description="Secondary heating removal",
-                ),
+                # secondary_heating_removal is off-catalogue (priced from the
+                # JSON overlay, not the pgEnum-constrained material table).
             ]
         )
         session.commit()
@@ -324,14 +318,10 @@ def test_modelling_optimises_and_persists_a_multi_measure_plan(
                     is_active=True,
                     description="LED bulb",
                 ),
-                MaterialRow(
-                    id=9,
-                    type="secondary_heating_removal",
-                    total_cost=250.0,
-                    cost_unit="gbp_per_unit",
-                    is_active=True,
-                    description="Secondary heating removal",
-                ),
+                # No secondary_heating_removal row: the FE-owned ``material.type``
+                # pgEnum cannot carry that Measure Type, so it is priced from the
+                # committed off-catalogue JSON overlay (£270, no material_id) that
+                # the Unit of Work layers over the catalogue, not from the DB.
             ]
         )
         session.commit()
@@ -374,12 +364,18 @@ def test_modelling_optimises_and_persists_a_multi_measure_plan(
     assert plan.cost_of_works is not None
     assert plan.cost_of_works > 0.0
     # Plan-level energy/bill figures derived from the post-package bill vs the
-    # baseline bill at the run's Fuel Rates (ADR-0014 amendment). The package
-    # improves the property, so it consumes less energy and costs less to run.
+    # baseline bill at the run's Fuel Rates (ADR-0014 amendment). The max-gain
+    # fallback package is ASHP-led on a *gas* dwelling whose suspended floor is
+    # correctly modelled as exposed (is_exposed_floor now round-trips through
+    # persistence — #TBD): it saves a large amount of delivered energy, but the
+    # gas→electricity fuel switch trades cheap gas kWh for pricier electricity
+    # kWh, so the *bill* is roughly neutral (marginally negative). The exact
+    # value is pinned by the telescoping cascade below; here we only assert the
+    # figure is produced (sign is not load-bearing for a SAP-max fallback).
     assert plan.post_energy_bill is not None and plan.post_energy_bill > 0.0
     assert plan.post_energy_consumption is not None
     assert plan.post_energy_consumption > 0.0
-    assert plan.energy_bill_savings is not None and plan.energy_bill_savings > 0.0
+    assert plan.energy_bill_savings is not None
     assert plan.energy_consumption_savings is not None
     assert plan.energy_consumption_savings > 0.0
 
@@ -402,13 +398,17 @@ def test_modelling_optimises_and_persists_a_multi_measure_plan(
         "air_source_heat_pump",
         "secondary_heating_removal",
     }
-    # Each persisted measure carries the catalogue id of the Product it installs
+    # Each catalogue-sourced measure carries the id of the Product it installs
     # (the MaterialRow ids seeded above), replacing the retired
     # recommendation_materials BOM with a single material_id on the row.
     assert by_type["air_source_heat_pump"].material_id == 5
     assert by_type["suspended_floor_insulation"].material_id == 2
     assert by_type["low_energy_lighting"].material_id == 4
-    assert by_type["secondary_heating_removal"].material_id == 9
+    # Secondary heating removal is priced from the off-catalogue JSON overlay
+    # (£270 flat per-dwelling, ADR-0028), so it carries no catalogue material_id.
+    assert by_type["secondary_heating_removal"].material_id is None
+    assert by_type["secondary_heating_removal"].estimated_cost is not None
+    assert abs(by_type["secondary_heating_removal"].estimated_cost - 270.0) <= 1e-6
     for rec in rec_rows:
         assert rec.default is True
         assert rec.already_installed is False
@@ -498,14 +498,8 @@ def test_modelling_recommends_nothing_when_already_at_the_target_band(
                     is_active=True,
                     description="LED bulb",
                 ),
-                MaterialRow(
-                    id=9,
-                    type="secondary_heating_removal",
-                    total_cost=250.0,
-                    cost_unit="gbp_per_unit",
-                    is_active=True,
-                    description="Secondary heating removal",
-                ),
+                # secondary_heating_removal is off-catalogue (priced from the
+                # JSON overlay, not the pgEnum-constrained material table).
             ]
         )
         session.commit()
diff --git a/tests/orchestration/test_landlord_description_overrides_orchestrator.py b/tests/orchestration/test_landlord_description_overrides_orchestrator.py
index bf5b13ce9..2339c615b 100644
--- a/tests/orchestration/test_landlord_description_overrides_orchestrator.py
+++ b/tests/orchestration/test_landlord_description_overrides_orchestrator.py
@@ -4,9 +4,9 @@ from enum import Enum
 from typing import Any, Optional
 
 from domain.addresses.unstandardised_address import AddressList, UnstandardisedAddress
-from domain.epc.built_form_type import BuiltFormType
-from domain.epc.property_type import PropertyType
-from domain.epc.wall_type import WallType
+from domain.epc.property_overrides.built_form_type import BuiltFormType
+from domain.epc.property_overrides.property_type import PropertyType
+from domain.epc.property_overrides.wall_type import WallType
 from domain.postcode import Postcode
 from domain.data_transformation.column_classifier import ColumnClassifier
 from orchestration.classifiable_column import ClassifiableColumn
diff --git a/tests/orchestration/test_property_baseline_orchestrator.py b/tests/orchestration/test_property_baseline_orchestrator.py
index 9183a8b39..76ee42ce1 100644
--- a/tests/orchestration/test_property_baseline_orchestrator.py
+++ b/tests/orchestration/test_property_baseline_orchestrator.py
@@ -158,13 +158,92 @@ class _ScoringRebaseliner(Rebaseliner):
         self._result = result
 
     def rebaseline(
-        self, property_id: int, effective_epc: EpcPropertyData, lodged: Performance
+        self,
+        property_id: int,
+        effective_epc: EpcPropertyData,
+        lodged: Performance,
+        *,
+        physical_state_changed: bool = False,
     ) -> RebaselineResult:
         return RebaselineResult(
             effective=lodged, reason="none", sap_result=self._result
         )
 
 
+def _property_without_rhi(*, sap_version: float = 10.2) -> Property:
+    """A predicted-style property whose EPC carries no lodged RHI block (ADR-0031
+    predicted EPCs deep-copy a template that may lack RHI)."""
+    epc = object.__new__(EpcPropertyData)
+    epc.energy_rating_current = 72
+    epc.current_energy_efficiency_band = Epc.C
+    epc.co2_emissions_current = 1.8
+    epc.energy_consumption_current = 180
+    epc.sap_version = sap_version
+    epc.renewable_heat_incentive = None
+    return Property(
+        identity=PropertyIdentity(
+            portfolio_id=1, postcode="A0 0AA", address="1 Some Street", uprn=123
+        ),
+        epc=epc,
+    )
+
+
+def _sap_result_with_heating(*, space_kwh: float, water_kwh: float) -> SapResult:
+    result = _sap_result_with_lighting()
+    object.__setattr__(result, "space_heating_kwh_per_yr", space_kwh)
+    object.__setattr__(result, "hot_water_kwh_per_yr", water_kwh)
+    # hot-water kWh must carry a fuel code for Bill Derivation (1 = mains gas).
+    object.__setattr__(result, "hot_water_fuel_code", 1)
+    return result
+
+
+def test_run_falls_back_to_computed_kwh_when_epc_has_no_rhi() -> None:
+    # Arrange — a predicted property with no lodged RHI, scored by a rebaseliner
+    # that returns a SapResult carrying the property's own computed energy.
+    property_baseline_repo = FakePropertyBaselineRepo()
+    uow = FakeUnitOfWork(
+        property=FakePropertyRepo({10: _property_without_rhi()}),
+        property_baseline=property_baseline_repo,
+    )
+    orchestrator = PropertyBaselineOrchestrator(
+        unit_of_work=lambda: uow,
+        rebaseliner=_ScoringRebaseliner(
+            _sap_result_with_heating(space_kwh=4200.0, water_kwh=1600.0)
+        ),
+        fuel_rates=FuelRatesStaticFileRepository(),
+    )
+
+    # Act
+    orchestrator.run([10])
+
+    # Assert — baseline kWh come from the computed SapResult, not a (missing) RHI.
+    (baseline, _) = property_baseline_repo.saved[0]
+    assert baseline.space_heating_kwh == 4200.0
+    assert baseline.water_heating_kwh == 1600.0
+    assert uow.commits == 1
+
+
+def test_run_raises_when_no_rhi_and_no_scored_result() -> None:
+    # Arrange — no lodged RHI AND the stub rebaseliner scores nothing: there is
+    # genuinely no source for baseline kWh, so the batch must fail noisily.
+    property_baseline_repo = FakePropertyBaselineRepo()
+    uow = FakeUnitOfWork(
+        property=FakePropertyRepo({10: _property_without_rhi()}),
+        property_baseline=property_baseline_repo,
+    )
+    orchestrator = PropertyBaselineOrchestrator(
+        unit_of_work=lambda: uow,
+        rebaseliner=StubRebaseliner(),
+        fuel_rates=FuelRatesStaticFileRepository(),
+    )
+
+    # Act / Assert
+    with pytest.raises(ValueError, match="renewable_heat_incentive"):
+        orchestrator.run([10])
+    assert property_baseline_repo.saved == []
+    assert uow.commits == 0
+
+
 def test_run_derives_and_persists_a_bill_when_the_rebaseliner_scores() -> None:
     # Arrange — a rebaseliner that hands back a SapResult with lighting energy,
     # so the orchestrator prices it into a Bill at the committed snapshot.
diff --git a/tests/orchestration/test_task_orchestrator.py b/tests/orchestration/test_task_orchestrator.py
index ae89991df..8767c8c15 100644
--- a/tests/orchestration/test_task_orchestrator.py
+++ b/tests/orchestration/test_task_orchestrator.py
@@ -195,3 +195,87 @@ def test_run_subtask_failing_work_marks_failed_and_reraises(
 
     assert harness.subtasks.get(subtask.id).status is SubTaskStatus.FAILED
     assert harness.tasks.get(task.id).status is TaskStatus.FAILED
+
+
+def test_run_subtasks_creates_runs_and_completes_a_whole_batch(
+    harness: Harness,
+) -> None:
+    """run_subtasks fans the parent into one child per item, runs each, and
+    leaves every child COMPLETE with the parent cascaded to COMPLETE."""
+    # arrange — a parent task whose coordinator subtask is done
+    task, coordinator = harness.orchestrator.create_task_with_subtask(
+        task_source="manual:test"
+    )
+    harness.orchestrator.complete_subtask(coordinator.id)
+
+    # act
+    results = harness.orchestrator.run_subtasks(
+        task.id,
+        [{"property_id": 1}, {"property_id": 2}, {"property_id": 3}],
+        work=lambda st: (st.inputs or {})["property_id"] * 10,
+    )
+
+    # assert — results in order, all children COMPLETE, parent COMPLETE
+    assert results == [10, 20, 30]
+    children = [s for s in harness.subtasks.list_by_task(task.id) if s.id != coordinator.id]
+    assert len(children) == 3
+    assert all(c.status is SubTaskStatus.COMPLETE for c in children)
+    assert {(c.inputs or {})["property_id"] for c in children} == {1, 2, 3}
+    assert harness.tasks.get(task.id).status is TaskStatus.COMPLETE
+
+
+def test_run_subtasks_isolates_a_failing_item_and_continues(
+    harness: Harness,
+) -> None:
+    """A raising item is marked FAILED with its error recorded, its siblings still
+    complete (result None for the failure), and the parent cascades to FAILED."""
+    # arrange
+    task, coordinator = harness.orchestrator.create_task_with_subtask(
+        task_source="manual:test"
+    )
+    harness.orchestrator.complete_subtask(coordinator.id)
+
+    def _work(st: SubTask) -> int:
+        pid = (st.inputs or {})["property_id"]
+        if pid == 2:
+            raise RuntimeError("property 2 exploded")
+        return pid
+
+    # act — does NOT raise; failure is isolated
+    results = harness.orchestrator.run_subtasks(
+        task.id,
+        [{"property_id": 1}, {"property_id": 2}, {"property_id": 3}],
+        work=_work,
+    )
+
+    # assert
+    assert results == [1, None, 3]
+    children = {
+        (c.inputs or {})["property_id"]: c
+        for c in harness.subtasks.list_by_task(task.id)
+        if c.id != coordinator.id
+    }
+    assert children[1].status is SubTaskStatus.COMPLETE
+    assert children[3].status is SubTaskStatus.COMPLETE
+    assert children[2].status is SubTaskStatus.FAILED
+    assert children[2].outputs == {"error": "property 2 exploded"}
+    # any FAILED child → parent FAILED
+    assert harness.tasks.get(task.id).status is TaskStatus.FAILED
+
+
+def test_cascade_short_circuits_once_task_already_failed(harness: Harness) -> None:
+    """Once the Task is FAILED, completing another SubTask leaves it FAILED — the
+    terminal state is not recomputed away."""
+    # arrange — two children; fail the first so the task is FAILED
+    task, coordinator = harness.orchestrator.create_task_with_subtask(
+        task_source="manual:test"
+    )
+    second = harness.orchestrator.create_child_subtask(task.id)
+    harness.orchestrator.fail_subtask(coordinator.id, RuntimeError("boom"))
+    assert harness.tasks.get(task.id).status is TaskStatus.FAILED
+
+    # act — complete the other child
+    harness.orchestrator.complete_subtask(second.id)
+
+    # assert — task stays FAILED (cascade short-circuited on the terminal state)
+    assert harness.tasks.get(task.id).status is TaskStatus.FAILED
diff --git a/tests/repositories/comparable_properties/test_epc_comparable_properties_repository.py b/tests/repositories/comparable_properties/test_epc_comparable_properties_repository.py
index 662d5b756..1a0b918ea 100644
--- a/tests/repositories/comparable_properties/test_epc_comparable_properties_repository.py
+++ b/tests/repositories/comparable_properties/test_epc_comparable_properties_repository.py
@@ -9,6 +9,8 @@ from datetime import date
 from pathlib import Path
 from typing import Any, Optional
 
+import pytest
+
 from datatypes.epc.domain.epc_property_data import EpcPropertyData
 from datatypes.epc.domain.mapper import EpcPropertyDataMapper
 from datatypes.epc.search.epc_search_result import EpcSearchResult
@@ -126,3 +128,209 @@ def test_no_certs_in_the_postcode_yields_no_candidates() -> None:
     # Assert — no candidates, and the postcode was searched (normalisation/IO ran).
     assert candidates == []
     assert client.searched_postcode == "LS6 1AA"
+
+
+# ---------------------------------------------------------------------------
+# Broadened cohort — candidates_near (ADR-0034 nearby-postcode broadening)
+# ---------------------------------------------------------------------------
+
+
+class _MultiPostcodeEpcClient:
+    """Serves a different cohort per postcode and records every search, so the
+    broadened walk's reach and ordering can be asserted."""
+
+    def __init__(self, by_postcode: dict[str, list[EpcSearchResult]]) -> None:
+        self._by_postcode = by_postcode
+        self.searched: list[str] = []
+
+    def search_by_postcode(self, postcode: str) -> list[EpcSearchResult]:
+        self.searched.append(postcode)
+        return self._by_postcode.get(postcode, [])
+
+    def get_by_certificate_number(self, cert_num: str) -> EpcPropertyData:
+        return _epc()
+
+
+class _FakeNearbyPostcodes:
+    """Returns a fixed nearest-first list and records the seed it was asked for."""
+
+    def __init__(self, postcodes: list[str]) -> None:
+        self._postcodes = postcodes
+        self.calls: list[tuple[str, Optional[Coordinates]]] = []
+
+    def nearby(
+        self, postcode: str, coordinates: Optional[Coordinates] = None
+    ) -> list[str]:
+        self.calls.append((postcode, coordinates))
+        return self._postcodes
+
+
+def test_candidates_near_aggregates_and_dedupes_across_nearby_postcodes() -> None:
+    # Arrange — three nearby postcodes; CERT-1 is re-lodged in two of them.
+    client = _MultiPostcodeEpcClient(
+        {
+            "P0": [_result("CERT-1", uprn=1)],
+            "P1": [_result("CERT-2", uprn=2), _result("CERT-1", uprn=1)],
+            "P2": [_result("CERT-3", uprn=3)],
+        }
+    )
+    nearby = _FakeNearbyPostcodes(["P0", "P1", "P2"])
+    repo = EpcComparablePropertiesRepository(
+        client, _FakeGeospatial({}), nearby_postcodes=nearby
+    )
+
+    # Act — no early-stop predicate, so the whole nearby set is visited.
+    candidates = repo.candidates_near("P0", None)
+
+    # Assert — one candidate per distinct cert, all three postcodes searched.
+    certs = {c.certificate_number for c in candidates}
+    assert certs == {"CERT-1", "CERT-2", "CERT-3"}
+    assert client.searched == ["P0", "P1", "P2"]
+
+
+def test_candidates_near_stops_early_once_enough_match() -> None:
+    # Arrange — the seed postcode alone already yields enough matches; the two
+    # further postcodes must not be fetched.
+    client = _MultiPostcodeEpcClient(
+        {
+            "P0": [_result(f"MATCH-{i}", uprn=i) for i in range(5)],
+            "P1": [_result("OTHER-1", uprn=99)],
+            "P2": [_result("OTHER-2", uprn=98)],
+        }
+    )
+    nearby = _FakeNearbyPostcodes(["P0", "P1", "P2"])
+    repo = EpcComparablePropertiesRepository(
+        client, _FakeGeospatial({}), nearby_postcodes=nearby
+    )
+
+    # Act
+    candidates = repo.candidates_near(
+        "P0",
+        None,
+        enough=lambda c: c.certificate_number.startswith("MATCH"),
+        minimum=5,
+    )
+
+    # Assert — walk halted after the seed; the further postcodes were never hit.
+    assert client.searched == ["P0"]
+    assert len(candidates) == 5
+
+
+def test_candidates_near_passes_coordinates_to_the_nearby_source() -> None:
+    # Arrange
+    here = Coordinates(longitude=0.1, latitude=51.3)
+    client = _MultiPostcodeEpcClient({"P0": []})
+    nearby = _FakeNearbyPostcodes(["P0"])
+    repo = EpcComparablePropertiesRepository(
+        client, _FakeGeospatial({}), nearby_postcodes=nearby
+    )
+
+    # Act
+    repo.candidates_near("P0", here)
+
+    # Assert — the target's own coordinates seed the radius search.
+    assert nearby.calls == [("P0", here)]
+
+
+def test_candidates_near_without_a_source_uses_only_the_seed() -> None:
+    # Arrange — no NearbyPostcodes configured (broadening unavailable).
+    client = _MultiPostcodeEpcClient({"P0": [_result("CERT-1", uprn=1)]})
+    repo = EpcComparablePropertiesRepository(client, _FakeGeospatial({}))
+
+    # Act
+    candidates = repo.candidates_near("P0", None)
+
+    # Assert — degrades to the seed postcode alone.
+    assert client.searched == ["P0"]
+    assert [c.certificate_number for c in candidates] == ["CERT-1"]
+
+
+# ---------------------------------------------------------------------------
+# Unmappable cohort certs are skipped + recorded, not allowed to sink the cohort
+# ---------------------------------------------------------------------------
+
+
+class _FakeEpcClientRaising:
+    """Serves the cohort, but raises the given exception for specific certs."""
+
+    def __init__(
+        self, results: list[EpcSearchResult], failures: dict[str, Exception]
+    ) -> None:
+        self._results = results
+        self._failures = failures
+
+    def search_by_postcode(self, postcode: str) -> list[EpcSearchResult]:
+        return self._results
+
+    def get_by_certificate_number(self, cert_num: str) -> EpcPropertyData:
+        if cert_num in self._failures:
+            raise self._failures[cert_num]
+        return _epc()
+
+
+def test_unmappable_cohort_cert_is_skipped_and_recorded() -> None:
+    # Arrange — two certs share the postcode; one can't be mapped (the mapper
+    # raises ValueError for a missing required field, as the gov-API 16.x / sparse
+    # certs do).
+    here = Coordinates(longitude=-1.55, latitude=53.81)
+    client = _FakeEpcClientRaising(
+        [_result("CERT-OK", uprn=12345), _result("CERT-BAD", uprn=67890)],
+        failures={
+            "CERT-BAD": ValueError(
+                "RdSapSchema17_1: missing required field 'window'"
+            )
+        },
+    )
+    geospatial = _FakeGeospatial({12345: here})
+    repo = EpcComparablePropertiesRepository(client, geospatial)
+
+    # Act
+    candidates = repo.candidates_for("LS6 1AA")
+
+    # Assert — the unmappable cert is excluded (does NOT sink the cohort) and the
+    # good one survives; the skip is recorded with the cert number + error so the
+    # mapper gap can be reported and closed later.
+    assert [c.certificate_number for c in candidates] == ["CERT-OK"]
+    assert len(repo.skipped) == 1
+    assert repo.skipped[0].certificate_number == "CERT-BAD"
+    assert "missing required field 'window'" in repo.skipped[0].error
+
+
+def test_malformed_cert_shape_attributeerror_is_skipped_and_recorded() -> None:
+    # Arrange — a cohort cert lodges a field in the wrong shape (e.g.
+    # `photovoltaic_supply` as a list), so the mapper raises AttributeError
+    # ("'list' object has no attribute 'none_or_no_details'") — a mapper-shape
+    # error like the missing-field ValueErrors, so it must skip + record, not abort.
+    client = _FakeEpcClientRaising(
+        [_result("CERT-OK", uprn=12345), _result("CERT-BAD", uprn=67890)],
+        failures={
+            "CERT-BAD": AttributeError(
+                "'list' object has no attribute 'none_or_no_details'"
+            )
+        },
+    )
+    repo = EpcComparablePropertiesRepository(client, _FakeGeospatial({}))
+
+    # Act
+    candidates = repo.candidates_for("LS6 1AA")
+
+    # Assert — bad cert skipped + recorded; good cert survives.
+    assert [c.certificate_number for c in candidates] == ["CERT-OK"]
+    assert len(repo.skipped) == 1
+    assert repo.skipped[0].certificate_number == "CERT-BAD"
+    assert "none_or_no_details" in repo.skipped[0].error
+
+
+def test_transient_fetch_error_is_not_swallowed_as_unmappable() -> None:
+    # Arrange — a non-ValueError (e.g. a transient API failure) must NOT be
+    # silently skipped as "unmappable"; it propagates so the run fails loudly.
+    client = _FakeEpcClientRaising(
+        [_result("CERT-1", uprn=12345)],
+        failures={"CERT-1": RuntimeError("EPC API error 503")},
+    )
+    repo = EpcComparablePropertiesRepository(client, _FakeGeospatial({}))
+
+    # Act / Assert
+    with pytest.raises(RuntimeError, match="503"):
+        repo.candidates_for("LS6 1AA")
+    assert repo.skipped == []
diff --git a/tests/repositories/epc/test_epc_batch_save.py b/tests/repositories/epc/test_epc_batch_save.py
new file mode 100644
index 000000000..c31e22b28
--- /dev/null
+++ b/tests/repositories/epc/test_epc_batch_save.py
@@ -0,0 +1,167 @@
+"""Batch EPC write path — save_batch() correctness and safety tests.
+
+Guards the four user stories from #1348:
+  1. FK mis-wiring regression: building-part IDs must not be crossed between
+     properties in the same save_batch() call.
+  2. save()/save_batch() parity: the single-property delegation path is loss-free.
+  3. Batch idempotency: a second save_batch() with the same requests replaces,
+     not duplicates.
+  4. Source isolation: lodged and predicted slots coexist after separate
+     save_batch() calls on the same property IDs.
+"""
+
+from __future__ import annotations
+
+import json
+from dataclasses import replace
+from pathlib import Path
+from typing import Any
+
+from sqlalchemy import Engine
+from sqlmodel import Session
+
+from datatypes.epc.domain.epc_property_data import EpcPropertyData
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
+from repositories.epc.epc_postgres_repository import EpcPostgresRepository, EpcSaveRequest
+
+_JSON_SAMPLES = Path(__file__).resolve().parents[3] / "backend/epc_api/json_samples"
+
+
+def _load_epc(schema_dir: str = "RdSAP-Schema-21.0.0") -> EpcPropertyData:
+    raw: dict[str, Any] = json.loads(
+        (_JSON_SAMPLES / schema_dir / "epc.json").read_text()
+    )
+    return EpcPropertyDataMapper.from_api_response(raw)
+
+
+def _with_floor_areas(epc: EpcPropertyData, areas_m2: list[float]) -> EpcPropertyData:
+    """Replace the building parts with variants that have a single floor dimension
+    carrying the given total_floor_area_m2 — making them easy to distinguish after
+    a round-trip without changing anything else about the EPC."""
+    template_bp = epc.sap_building_parts[0]
+    template_dim = template_bp.sap_floor_dimensions[0]
+    new_parts = [
+        replace(template_bp, sap_floor_dimensions=[replace(template_dim, total_floor_area_m2=a)])
+        for a in areas_m2
+    ]
+    return replace(epc, sap_building_parts=new_parts)
+
+
+# ---------------------------------------------------------------------------
+# Tracer bullet: single-request save_batch() is loss-free vs save()
+# ---------------------------------------------------------------------------
+
+def test_single_request_save_batch_matches_save(db_engine: Engine) -> None:
+    # Arrange
+    epc = _load_epc()
+
+    with Session(db_engine) as session:
+        repo = EpcPostgresRepository(session)
+        epc_id_via_save = repo.save(epc, property_id=1001)
+        epc_id_via_batch = repo.save_batch([EpcSaveRequest(epc, property_id=1002)])[0]
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        repo = EpcPostgresRepository(session)
+        via_save = repo.get(epc_id_via_save)
+        via_batch = repo.get(epc_id_via_batch)
+
+    # Assert — both paths reconstruct the original exactly.
+    assert via_save == epc
+    assert via_batch == epc
+
+
+# ---------------------------------------------------------------------------
+# FK mis-wiring regression: building-part IDs must not be crossed
+# ---------------------------------------------------------------------------
+
+def test_multi_property_building_part_ids_are_not_crossed(db_engine: Engine) -> None:
+    # Arrange — property A has 2 parts with distinctive areas; B has 1 with a
+    # third distinctive area. If part IDs are mis-wired the floor-dimension FK
+    # rows end up under the wrong property.
+    base = _load_epc()
+    epc_a = _with_floor_areas(base, [10.0, 20.0])
+    epc_b = _with_floor_areas(base, [99.0])
+
+    with Session(db_engine) as session:
+        repo = EpcPostgresRepository(session)
+        repo.save_batch([
+            EpcSaveRequest(epc_a, property_id=2001),
+            EpcSaveRequest(epc_b, property_id=2002),
+        ])
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        repo = EpcPostgresRepository(session)
+        reloaded_a = repo.get_for_property(2001)
+        reloaded_b = repo.get_for_property(2002)
+
+    # Assert — each property's building parts carry its own floor areas.
+    assert reloaded_a is not None
+    assert reloaded_b is not None
+    areas_a = sorted(
+        dim.total_floor_area_m2
+        for part in reloaded_a.sap_building_parts
+        for dim in part.sap_floor_dimensions
+    )
+    areas_b = sorted(
+        dim.total_floor_area_m2
+        for part in reloaded_b.sap_building_parts
+        for dim in part.sap_floor_dimensions
+    )
+    assert areas_a == [10.0, 20.0]
+    assert areas_b == [99.0]
+
+
+# ---------------------------------------------------------------------------
+# Idempotency: second save_batch() replaces, not duplicates
+# ---------------------------------------------------------------------------
+
+def test_save_batch_is_idempotent(db_engine: Engine) -> None:
+    # Arrange
+    epc = _load_epc()
+    requests = [EpcSaveRequest(epc, property_id=3001)]
+
+    with Session(db_engine) as session:
+        EpcPostgresRepository(session).save_batch(requests)
+        session.commit()
+
+    # Act — re-save the same batch.
+    with Session(db_engine) as session:
+        EpcPostgresRepository(session).save_batch(requests)
+        session.commit()
+
+    # Assert — exactly one EPC survives (no duplicate rows).
+    with Session(db_engine) as session:
+        result = EpcPostgresRepository(session).get_for_property(3001)
+
+    assert result == epc
+
+
+# ---------------------------------------------------------------------------
+# Source isolation: lodged and predicted slots survive separate batch saves
+# ---------------------------------------------------------------------------
+
+def test_lodged_and_predicted_batch_slots_are_independent(db_engine: Engine) -> None:
+    # Arrange — two properties each get a lodged EPC and then a predicted EPC
+    # via separate save_batch() calls.
+    epc = _load_epc()
+    property_ids = [4001, 4002]
+
+    with Session(db_engine) as session:
+        repo = EpcPostgresRepository(session)
+        repo.save_batch([EpcSaveRequest(epc, property_id=pid, source="lodged") for pid in property_ids])
+        repo.save_batch([EpcSaveRequest(epc, property_id=pid, source="predicted") for pid in property_ids])
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        repo = EpcPostgresRepository(session)
+        lodged = repo.get_for_properties(property_ids)
+        predicted = repo.get_predicted_for_properties(property_ids)
+
+    # Assert — both slots are populated for both properties.
+    assert lodged == {4001: epc, 4002: epc}
+    assert predicted == {4001: epc, 4002: epc}
diff --git a/tests/repositories/epc/test_epc_persistence_field_coverage.py b/tests/repositories/epc/test_epc_persistence_field_coverage.py
new file mode 100644
index 000000000..4f0c8faa3
--- /dev/null
+++ b/tests/repositories/epc/test_epc_persistence_field_coverage.py
@@ -0,0 +1,176 @@
+"""Structural guard: every `EpcPropertyData` field — top-level AND nested — must
+round-trip.
+
+The deep-equality round-trip test (`test_epc_round_trip.py`) only catches a
+dropped field when a *fixture populates it* — the existing gaps (conservatory,
+roof windows, solar-HW collector, **PV arrays**, **floor heat-loss flags**) were
+latent precisely because no fixture exercised them (see
+`docs/migrations/epc-property-round-trip-fidelity.md`).
+
+This guard closes that blind spot structurally. It walks every domain dataclass
+reachable from `EpcPropertyData` (transitively, through Optionals and lists) and
+asserts each field is either reconstructed by an `EpcPostgresRepository`
+`_compose` / `_to_*` mapper or listed — with a reason — in the allow-list below.
+The earlier version only inspected `EpcPropertyData`'s *top-level* fields, so a
+dropped field on a *nested* object (`SapEnergySource.photovoltaic_arrays`,
+`SapFloorDimension.is_above_partially_heated_space`) slipped straight through.
+
+Adding a new domain field — at any depth — therefore forces a conscious
+persist-or-justify decision; persisting a previously-gapped field means deleting
+its allow-list entry. ADR-0036.
+"""
+
+from __future__ import annotations
+
+import ast
+import dataclasses
+import inspect
+import textwrap
+import typing
+
+from datatypes.epc.domain.epc_property_data import EpcPropertyData
+from repositories.epc.epc_postgres_repository import EpcPostgresRepository
+
+# Fields NOT reconstructed by the repo mappers, each with its reason. Keyed by
+# ``ClassName.field`` (a single field) or ``ClassName`` (the whole dataclass is
+# an un-persisted, tracked gap awaiting its FE columns / child table).
+_UNPERSISTED_ALLOWLIST: dict[str, str] = {
+    # Not read by the calculator (dormant); no DB column yet.
+    "EpcPropertyData.air_tightness": "dormant — not read by the calculator; no FE column",
+    "EpcPropertyData.lzc_energy_sources": "dormant — not read by the calculator; no FE column",
+    # Scoring-relevant round-trip gaps awaiting FE columns / child tables
+    # (tracked follow-ups; see docs/migrations/epc-property-round-trip-fidelity.md).
+    "EpcPropertyData.sap_roof_windows": "FE child table pending — tracked round-trip gap",
+    "SapRoofWindow": "FE child table pending — tracked round-trip gap (sap_roof_windows)",
+    "EpcPropertyData.solar_hw_collector_orientation": "FE column pending — tracked round-trip gap",
+    "EpcPropertyData.solar_hw_collector_pitch_deg": "FE column pending — tracked round-trip gap",
+    "EpcPropertyData.solar_hw_overshading": "FE column pending — tracked round-trip gap",
+    "SapAlternativeWall.u_value": "FE column pending — tracked round-trip gap",
+    "SapAlternativeWall.wall_thickness_mm": "FE column pending — tracked round-trip gap",
+    # Room-in-roof detail: only floor_area + age_band reconstruct from the
+    # inlined columns; the geometry / surface detail awaits an FE child table
+    # (tracked round-trip gap, docs/migrations §2).
+    "SapRoomInRoof.common_wall_height_m": "FE child table pending — room-in-roof detail",
+    "SapRoomInRoof.common_wall_length_m": "FE child table pending — room-in-roof detail",
+    "SapRoomInRoof.detailed_surfaces": "FE child table pending — room-in-roof detail",
+    "SapRoomInRoof.gable_1_height_m": "FE child table pending — room-in-roof detail",
+    "SapRoomInRoof.gable_1_length_m": "FE child table pending — room-in-roof detail",
+    "SapRoomInRoof.gable_2_height_m": "FE child table pending — room-in-roof detail",
+    "SapRoomInRoof.gable_2_length_m": "FE child table pending — room-in-roof detail",
+    "SapRoomInRoofSurface": "FE child table pending — room-in-roof surface detail",
+    # --- Nested gaps the calculator does NOT read (dormant); no FE column.
+    "SapAlternativeWall.is_basement": "dormant — not read by the calculator; no FE column",
+    "SapBuildingPart.floor_u_value": "dormant — not read by the calculator (column exists, unread)",
+    "SapBuildingPart.rafter_insulation_thickness": "dormant — not read by the calculator; no FE column",
+    "SapBuildingPart.roof_u_value": "dormant — not read by the calculator; no FE column",
+    "SapBuildingPart.wall_is_basement": "dormant — not read by the calculator; no FE column",
+    "SapBuildingPart.wall_u_value": "dormant — not read by the calculator; no FE column",
+    "SapHeating.cylinder_heat_loss": "dormant — not read by the calculator; no FE column",
+}
+
+
+def _unwrap(annotation: object) -> list[object]:
+    """The concrete types inside an annotation — peeling `Optional`, `Union` and
+    `list[...]` so a field typed `Optional[list[SapWindow]]` yields `SapWindow`."""
+    args = typing.get_args(annotation)
+    if not args:
+        return [annotation]
+    origin = typing.get_origin(annotation)
+    out: list[object] = []
+    if origin is list:
+        out.extend(_unwrap(args[0]))
+    else:  # Union / Optional
+        for arg in args:
+            out.extend(_unwrap(arg))
+    return out
+
+
+def _reachable_dataclasses() -> dict[str, type]:
+    """Every domain dataclass reachable from `EpcPropertyData`, transitively,
+    keyed by class name."""
+    seen: dict[str, type] = {}
+    stack: list[type] = [EpcPropertyData]
+    while stack:
+        cls = stack.pop()
+        if not dataclasses.is_dataclass(cls) or cls.__name__ in seen:
+            continue
+        seen[cls.__name__] = cls
+        for field in dataclasses.fields(cls):
+            for inner in _unwrap(field.type):
+                if isinstance(inner, type) and dataclasses.is_dataclass(inner):
+                    stack.append(inner)
+    return seen
+
+
+def _reconstructed_by_class() -> dict[str, set[str]]:
+    """For each domain-dataclass name, the keyword argument names passed to ANY
+    `ClassName(...)` construction inside `EpcPostgresRepository` — i.e. the fields
+    its `_compose` / `_to_*` mappers reconstruct from the DB rows."""
+    source = textwrap.dedent(inspect.getsource(EpcPostgresRepository))
+    tree = ast.parse(source)
+    by_class: dict[str, set[str]] = {}
+    for node in ast.walk(tree):
+        if isinstance(node, ast.Call) and isinstance(node.func, ast.Name):
+            kwargs = {kw.arg for kw in node.keywords if kw.arg is not None}
+            by_class.setdefault(node.func.id, set()).update(kwargs)
+    return by_class
+
+
+def test_every_epc_property_data_field_is_persisted_or_allowlisted() -> None:
+    # Arrange — every field of every reachable domain dataclass, and the fields
+    # the repo mappers reconstruct.
+    reachable = _reachable_dataclasses()
+    reconstructed = _reconstructed_by_class()
+
+    # Act — fields neither reconstructed nor explicitly excused (per-field or
+    # whole-class allow-list entry).
+    silently_dropped: list[str] = []
+    for name, cls in reachable.items():
+        if name in _UNPERSISTED_ALLOWLIST:  # whole class excused
+            continue
+        recon = reconstructed.get(name, set())
+        for field in dataclasses.fields(cls):
+            key = f"{name}.{field.name}"
+            if field.name not in recon and key not in _UNPERSISTED_ALLOWLIST:
+                silently_dropped.append(key)
+
+    # Assert — nothing falls through the round-trip unnoticed, at any depth.
+    assert silently_dropped == [], (
+        "EpcPropertyData field(s) are dropped on DB round-trip without a "
+        f"documented reason: {sorted(silently_dropped)}. Either reconstruct them "
+        "in EpcPostgresRepository (_compose / a _to_* mapper), or add them to "
+        "_UNPERSISTED_ALLOWLIST with a justification."
+    )
+
+
+def test_allowlist_has_no_stale_entries() -> None:
+    # Arrange
+    reachable = _reachable_dataclasses()
+    reconstructed = _reconstructed_by_class()
+
+    # Act — allow-list entries that are now fully reconstructed, or name a
+    # class/field that no longer exists.
+    redundant: list[str] = []
+    for entry in _UNPERSISTED_ALLOWLIST:
+        class_name, _, field_name = entry.partition(".")
+        cls = reachable.get(class_name)
+        if cls is None:
+            redundant.append(entry)
+            continue
+        if not field_name:
+            # Whole-class entry: stale once ANY field is reconstructed (the class
+            # is now wired into the round-trip).
+            if reconstructed.get(class_name):
+                redundant.append(entry)
+            continue
+        field_names = {f.name for f in dataclasses.fields(cls)}
+        if field_name not in field_names or field_name in reconstructed.get(
+            class_name, set()
+        ):
+            redundant.append(entry)
+
+    # Assert — the allow-list stays honest as gaps are closed.
+    assert redundant == [], (
+        f"stale _UNPERSISTED_ALLOWLIST entries (now persisted or removed): "
+        f"{sorted(redundant)} — delete them."
+    )
diff --git a/tests/repositories/epc/test_epc_round_trip.py b/tests/repositories/epc/test_epc_round_trip.py
index 8233bda39..5def5e7e8 100644
--- a/tests/repositories/epc/test_epc_round_trip.py
+++ b/tests/repositories/epc/test_epc_round_trip.py
@@ -50,6 +50,164 @@ def test_epc_property_data_round_trips(schema_dir: str, db_engine: Engine) -> No
     assert reloaded == original
 
 
+def test_non_separated_conservatory_round_trips(db_engine: Engine) -> None:
+    # RdSAP 10 §6.1 — a non-separated conservatory (conservatory_type=4) maps to
+    # `EpcPropertyData.sap_conservatory` (the glazed BP is split out of the
+    # fabric parts). Persistence must round-trip it: scoring reads the reloaded
+    # picture, so a dropped `sap_conservatory` silently disregards the
+    # conservatory (persist != score). We inject the conservatory onto the
+    # known-clean 21.0.1 sample so the ONLY thing that can break deep-equality
+    # is `sap_conservatory` itself.
+
+    # Arrange — known-clean base + a non-separated double-glazed conservatory.
+    raw: dict[str, Any] = json.loads(
+        (_JSON_SAMPLES / "RdSAP-Schema-21.0.1" / "epc.json").read_text()
+    )
+    raw["conservatory_type"] = 4
+    raw["sap_building_parts"].append(
+        {
+            "floor_area": 12.0,
+            "room_height": 1,
+            "double_glazed": "Y",
+            "glazed_perimeter": 9.0,
+        }
+    )
+    original = EpcPropertyDataMapper.from_api_response(raw)
+    assert original.sap_conservatory is not None, "mapper must split the conservatory"
+
+    # Act
+    with Session(db_engine) as session:
+        epc_property_id = EpcPostgresRepository(session).save(original)
+        session.commit()
+    with Session(db_engine) as session:
+        reloaded = EpcPostgresRepository(session).get(epc_property_id)
+
+    # Assert — the conservatory survives the round-trip, deep-equal.
+    assert reloaded == original
+
+
+def test_photovoltaic_arrays_round_trip(db_engine: Engine) -> None:
+    # SAP 10.2 Appendix M — a dwelling's solar PV arrays generate electricity that
+    # offsets demand, worth a large slice of the SAP score (≈12 points on an
+    # electrically-heated dwelling). `sap_energy_source.photovoltaic_arrays` had
+    # no table, so every array was dropped on save (persist != score). We inject
+    # two arrays (distinct, so ORDER is observable) onto a clean PV-free fixture
+    # so the ONLY thing that can break deep-equality is the array list itself.
+    from dataclasses import replace
+
+    from datatypes.epc.domain.epc_property_data import PhotovoltaicArray
+
+    # Arrange — a green fixture with no PV, plus two ordered arrays.
+    original = _load_epc("RdSAP-Schema-21.0.1")
+    assert original.sap_energy_source.photovoltaic_arrays is None, (
+        "fixture must start PV-free so the array list is the only variable"
+    )
+    arrays = [
+        PhotovoltaicArray(peak_power=3.24, pitch=3, overshading=1, orientation=3),
+        PhotovoltaicArray(peak_power=1.5, pitch=2, overshading=2, orientation=None),
+    ]
+    original = replace(
+        original,
+        sap_energy_source=replace(
+            original.sap_energy_source, photovoltaic_arrays=arrays
+        ),
+    )
+
+    # Act
+    with Session(db_engine) as session:
+        epc_property_id = EpcPostgresRepository(session).save(original)
+        session.commit()
+    with Session(db_engine) as session:
+        reloaded = EpcPostgresRepository(session).get(epc_property_id)
+
+    # Assert — both arrays survive in order, deep-equal.
+    assert reloaded == original
+
+
+def test_calculator_read_fields_round_trip(db_engine: Engine) -> None:
+    # Seven fields the SAP calculator reads (cert_to_inputs / heat_transmission)
+    # that had no DB column, so they were silently dropped on save (persist !=
+    # score). FE columns now exist; inject all seven onto a clean fixture and
+    # prove they survive the round-trip deep-equal.
+    from dataclasses import replace
+
+    # Arrange
+    original = _load_epc("RdSAP-Schema-21.0.1")
+    bp0 = original.sap_building_parts[0]
+    assert bp0.sap_alternative_wall_1 is not None, "fixture must carry an alt wall"
+    bp0 = replace(
+        bp0,
+        sap_alternative_wall_1=replace(bp0.sap_alternative_wall_1, is_sheltered=True),
+        wall_insulation_thermal_conductivity=35,  # Union[int,str] → JSONB int
+    )
+    heating = original.sap_heating
+    mh0 = replace(
+        heating.main_heating_details[0],
+        community_heating_boiler_fuel_type=35,
+        community_heating_chp_fraction=0.35,
+    )
+    heating = replace(
+        heating,
+        main_heating_details=[mh0, *heating.main_heating_details[1:]],
+        cylinder_volume_measured_l=180,
+    )
+    original = replace(
+        original,
+        sap_building_parts=[bp0, *original.sap_building_parts[1:]],
+        sap_heating=heating,
+        sap_energy_source=replace(original.sap_energy_source, pv_diverter_present=True),
+        sap_ventilation=replace(
+            original.sap_ventilation, air_permeability_ap50_m3_h_m2=7.5
+        ),
+    )
+
+    # Act
+    with Session(db_engine) as session:
+        epc_property_id = EpcPostgresRepository(session).save(original)
+        session.commit()
+    with Session(db_engine) as session:
+        reloaded = EpcPostgresRepository(session).get(epc_property_id)
+
+    # Assert — all seven calculator-read fields survive, deep-equal.
+    assert reloaded == original
+
+
+def test_floor_dimension_heat_loss_flags_round_trip(db_engine: Engine) -> None:
+    # SAP 10.2 §3.3 — `is_exposed_floor` and `is_above_partially_heated_space`
+    # are heat-loss flags on a `SapFloorDimension`: the calculator routes a floor
+    # over outside air / over a partially-heated space through a different
+    # U-value path. They had no `epc_floor_dimension` column, so a True flag
+    # round-tripped back to the `False` default and silently flipped the floor's
+    # heat loss (persist != score). We force both True on a clean fixture so the
+    # ONLY thing that can break deep-equality is these two flags.
+    from dataclasses import replace
+
+    # Arrange — a green fixture with a floor dimension, both flags forced True.
+    original = _load_epc("RdSAP-Schema-21.0.0")
+    assert original.sap_building_parts, "fixture must have a building part"
+    bp0 = original.sap_building_parts[0]
+    assert bp0.sap_floor_dimensions, "fixture building part must have a floor dimension"
+    dim0 = replace(
+        bp0.sap_floor_dimensions[0],
+        is_exposed_floor=True,
+        is_above_partially_heated_space=True,
+    )
+    bp0 = replace(bp0, sap_floor_dimensions=[dim0, *bp0.sap_floor_dimensions[1:]])
+    original = replace(
+        original, sap_building_parts=[bp0, *original.sap_building_parts[1:]]
+    )
+
+    # Act
+    with Session(db_engine) as session:
+        epc_property_id = EpcPostgresRepository(session).save(original)
+        session.commit()
+    with Session(db_engine) as session:
+        reloaded = EpcPostgresRepository(session).get(epc_property_id)
+
+    # Assert — both flags survive the round-trip, deep-equal.
+    assert reloaded == original
+
+
 def test_building_part_wall_insulation_thickness_preserves_int(
     db_engine: Engine,
 ) -> None:
diff --git a/tests/repositories/fuel_rates/test_fuel_rates_static_file_repository.py b/tests/repositories/fuel_rates/test_fuel_rates_static_file_repository.py
index 6b1772963..fd5f038f6 100644
--- a/tests/repositories/fuel_rates/test_fuel_rates_static_file_repository.py
+++ b/tests/repositories/fuel_rates/test_fuel_rates_static_file_repository.py
@@ -44,8 +44,32 @@ def test_coal_and_heat_network_carry_proxy_rates() -> None:
     assert rates.standing_charge_p_per_day(Fuel.HEAT_NETWORK) == 69.4
 
 
-def test_off_peak_remains_unpriced_pending_the_day_night_accessor() -> None:
-    # Arrange — off-peak still needs the day/night split a later slice adds (ADR-0014).
+def test_dual_fuel_carries_a_derived_midpoint_rate() -> None:
+    # Arrange — dual fuel (mineral + wood) has no retail blend price, so the
+    # snapshot prices it as the COAL-proxy/WOOD_LOGS midpoint (see the JSON
+    # _note) — mirroring SAP Table-32's own dual-fuel construction.
+    rates = FuelRatesStaticFileRepository().get_current()
+
+    # Act / Assert — (7.13 + 8.25) / 2 = 7.69
+    assert rates.unit_rate_p_per_kwh(Fuel.DUAL_FUEL_MINERAL_AND_WOOD) == 7.69
+    assert rates.standing_charge_p_per_day(Fuel.DUAL_FUEL_MINERAL_AND_WOOD) == 0.0
+
+
+def test_off_peak_meter_prices_day_night_from_the_snapshot() -> None:
+    # Arrange — the committed snapshot's off-peak entry carries a day/night
+    # split (ADR-0014 2026-06-24 amendment); the repo loads it as an OffPeakRate.
+    rates = FuelRatesStaticFileRepository().get_current()
+
+    # Act / Assert — an all-night load bills at the night rate, an all-day load
+    # at the day rate, and the off-peak meter carries its own standing charge.
+    assert rates.off_peak_blended_p_per_kwh(high_rate_fraction=0.0) == 13.89
+    assert rates.off_peak_blended_p_per_kwh(high_rate_fraction=1.0) == 29.73
+    assert rates.standing_charge_p_per_day(Fuel.ELECTRICITY_OFF_PEAK) == 56.99
+
+
+def test_off_peak_has_no_single_unit_rate() -> None:
+    # Arrange — off-peak has no single blended unit rate; callers must price it
+    # day/night via a High-Rate Fraction, so unit_rate_p_per_kwh still raises.
     rates = FuelRatesStaticFileRepository().get_current()
 
     # Act / Assert
diff --git a/tests/repositories/landlord_overrides/postgres/test_landlord_overrides_postgres_repository.py b/tests/repositories/landlord_overrides/postgres/test_landlord_overrides_postgres_repository.py
index 1ce4e9972..31ca2b175 100644
--- a/tests/repositories/landlord_overrides/postgres/test_landlord_overrides_postgres_repository.py
+++ b/tests/repositories/landlord_overrides/postgres/test_landlord_overrides_postgres_repository.py
@@ -25,8 +25,8 @@ import pytest
 from sqlalchemy import Engine, Table
 from sqlmodel import Session, SQLModel, select
 
-from domain.epc.property_type import PropertyType
-from domain.epc.wall_type import WallType
+from domain.epc.property_overrides.property_type import PropertyType
+from domain.epc.property_overrides.wall_type import WallType
 from infrastructure.landlord_overrides.landlord_overrides_postgres_repository import (
     LandlordOverridesRepository,
 )
diff --git a/tests/repositories/plan/test_plan_batch_save.py b/tests/repositories/plan/test_plan_batch_save.py
new file mode 100644
index 000000000..400b2cdf7
--- /dev/null
+++ b/tests/repositories/plan/test_plan_batch_save.py
@@ -0,0 +1,183 @@
+"""Batch plan write path — save_batch() correctness and safety tests.
+
+Guards the four user stories from #1355:
+  1. save()/save_batch() parity: a single-element save_batch() produces
+     identical DB state (plan row + recommendation rows) as the equivalent
+     save() call.
+  2. Recommendation FK isolation: two properties in the same save_batch() each
+     get their own recommendation rows; no FK cross-wiring between properties.
+  3. Demote correctness: a second save_batch() for the same properties demotes
+     the prior default Plans and inserts fresh ones (history preserved).
+  4. Non-default batch: a save_batch() where all writes have is_default=False
+     leaves any pre-existing default Plan untouched.
+"""
+
+from __future__ import annotations
+
+from sqlalchemy import Engine
+from sqlmodel import Session, col, select
+
+from domain.modelling.measure_type import MeasureType
+from domain.modelling.plan import Plan, PlanMeasure
+from domain.modelling.recommendation import Cost
+from domain.modelling.scoring.package_scorer import Score
+from domain.modelling.scoring.scoring import MeasureImpact
+from infrastructure.postgres.modelling import PlanModel, RecommendationModel
+from repositories.plan.plan_postgres_repository import PlanPostgresRepository
+from repositories.plan.plan_repository import PlanSaveRequest
+
+
+def _plan(*, sap: float = 70.0, measures: int = 1) -> Plan:
+    ms: tuple[PlanMeasure, ...] = tuple(
+        PlanMeasure(
+            measure_type=MeasureType.CAVITY_WALL_INSULATION,
+            description="Cavity wall insulation",
+            cost=Cost(total=1000.0, contingency_rate=0.10),
+            impact=MeasureImpact(
+                sap_points=8.0,
+                co2_savings_kg_per_yr=500.0,
+                energy_savings_kwh_per_yr=2000.0,
+            ),
+            kwh_savings=1500.0,
+            energy_cost_savings=300.0,
+        )
+        for _ in range(measures)
+    )
+    return Plan(
+        measures=ms,
+        baseline=Score(sap_continuous=40.0, co2_kg_per_yr=4000.0, primary_energy_kwh_per_yr=20000.0),
+        post_retrofit=Score(sap_continuous=sap, co2_kg_per_yr=3500.0, primary_energy_kwh_per_yr=18000.0),
+    )
+
+
+# ---------------------------------------------------------------------------
+# Tracer bullet: single-element save_batch() is loss-free vs save()
+# ---------------------------------------------------------------------------
+
+def test_single_request_save_batch_matches_save(db_engine: Engine) -> None:
+    # Arrange
+    plan = _plan()
+    scenario_id = 7
+
+    with Session(db_engine) as session:
+        repo = PlanPostgresRepository(session)
+        save_id = repo.save(plan, property_id=5001, scenario_id=scenario_id, portfolio_id=1, is_default=True)
+        batch_id = repo.save_batch([PlanSaveRequest(plan, property_id=5002, scenario_id=scenario_id, portfolio_id=1, is_default=True)])[0]
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        via_save = session.get(PlanModel, save_id)
+        via_batch = session.get(PlanModel, batch_id)
+        recs_save = session.exec(select(RecommendationModel).where(col(RecommendationModel.plan_id) == save_id)).all()
+        recs_batch = session.exec(select(RecommendationModel).where(col(RecommendationModel.plan_id) == batch_id)).all()
+
+    # Assert — both paths produce one plan row + one recommendation row with the
+    # same field values (modulo property_id which differs by design).
+    assert via_save is not None
+    assert via_batch is not None
+    assert via_save.is_default is True
+    assert via_batch.is_default is True
+    assert via_save.post_sap_points == via_batch.post_sap_points
+    assert via_save.post_co2_emissions == via_batch.post_co2_emissions
+    assert via_save.co2_savings == via_batch.co2_savings
+    assert len(recs_save) == 1
+    assert len(recs_batch) == 1
+    assert recs_save[0].type == recs_batch[0].type
+    assert recs_save[0].estimated_cost == recs_batch[0].estimated_cost
+    assert recs_save[0].sap_points == recs_batch[0].sap_points
+    assert recs_batch[0].plan_id == batch_id
+
+
+# ---------------------------------------------------------------------------
+# FK isolation: recommendation rows must not be crossed between properties
+# ---------------------------------------------------------------------------
+
+def test_multi_property_recommendation_fks_are_not_crossed(db_engine: Engine) -> None:
+    # Arrange — property A gets 2 measures, property B gets 1 measure.
+    plan_a = _plan(measures=2)
+    plan_b = _plan(measures=1)
+
+    with Session(db_engine) as session:
+        [id_a, id_b] = PlanPostgresRepository(session).save_batch([
+            PlanSaveRequest(plan_a, property_id=6001, scenario_id=7, portfolio_id=1, is_default=True),
+            PlanSaveRequest(plan_b, property_id=6002, scenario_id=7, portfolio_id=1, is_default=True),
+        ])
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        recs_a = session.exec(select(RecommendationModel).where(col(RecommendationModel.plan_id) == id_a)).all()
+        recs_b = session.exec(select(RecommendationModel).where(col(RecommendationModel.plan_id) == id_b)).all()
+
+    # Assert — A has 2 rows, B has 1; none cross-wired.
+    assert len(recs_a) == 2
+    assert len(recs_b) == 1
+    assert all(r.plan_id == id_a and r.property_id == 6001 for r in recs_a)
+    assert all(r.plan_id == id_b and r.property_id == 6002 for r in recs_b)
+
+
+# ---------------------------------------------------------------------------
+# Demote correctness: second save_batch() demotes prior defaults
+# ---------------------------------------------------------------------------
+
+def test_second_save_batch_demotes_prior_default_plans(db_engine: Engine) -> None:
+    # Arrange — first batch creates default Plans for two properties.
+    plan = _plan()
+    requests = [
+        PlanSaveRequest(plan, property_id=7001, scenario_id=7, portfolio_id=1, is_default=True),
+        PlanSaveRequest(plan, property_id=7002, scenario_id=7, portfolio_id=1, is_default=True),
+    ]
+    with Session(db_engine) as session:
+        first_ids = PlanPostgresRepository(session).save_batch(requests)
+        session.commit()
+
+    # Act — re-run the same batch; new Plans should become default, old ones demoted.
+    with Session(db_engine) as session:
+        second_ids = PlanPostgresRepository(session).save_batch(requests)
+        session.commit()
+
+    # Assert — history is preserved (4 plan rows total); exactly one default per property.
+    with Session(db_engine) as session:
+        rows_7001 = session.exec(select(PlanModel).where(col(PlanModel.property_id) == 7001)).all()
+        rows_7002 = session.exec(select(PlanModel).where(col(PlanModel.property_id) == 7002)).all()
+
+    by_id_7001 = {p.id: p for p in rows_7001}
+    by_id_7002 = {p.id: p for p in rows_7002}
+
+    assert len(rows_7001) == 2
+    assert len(rows_7002) == 2
+    assert by_id_7001[first_ids[0]].is_default is False
+    assert by_id_7001[second_ids[0]].is_default is True
+    assert by_id_7002[first_ids[1]].is_default is False
+    assert by_id_7002[second_ids[1]].is_default is True
+
+
+# ---------------------------------------------------------------------------
+# Non-default batch: existing default Plan is untouched
+# ---------------------------------------------------------------------------
+
+def test_non_default_save_batch_does_not_demote_existing_default(db_engine: Engine) -> None:
+    # Arrange — a default Plan already exists for the property.
+    plan = _plan()
+    with Session(db_engine) as session:
+        default_id = PlanPostgresRepository(session).save(
+            plan, property_id=8001, scenario_id=7, portfolio_id=1, is_default=True
+        )
+        session.commit()
+
+    # Act — save a non-default Plan via save_batch(); no demote UPDATE should fire.
+    with Session(db_engine) as session:
+        PlanPostgresRepository(session).save_batch([
+            PlanSaveRequest(plan, property_id=8001, scenario_id=7, portfolio_id=1, is_default=False),
+        ])
+        session.commit()
+
+    # Assert — the original default Plan is still the default.
+    with Session(db_engine) as session:
+        rows = session.exec(select(PlanModel).where(col(PlanModel.property_id) == 8001)).all()
+        by_id = {p.id: p for p in rows}
+
+    assert len(rows) == 2
+    assert by_id[default_id].is_default is True
+    assert sum(1 for p in rows if p.is_default) == 1
diff --git a/tests/repositories/plan/test_plan_postgres_repository.py b/tests/repositories/plan/test_plan_postgres_repository.py
index 3e428bd8a..200c38d6b 100644
--- a/tests/repositories/plan/test_plan_postgres_repository.py
+++ b/tests/repositories/plan/test_plan_postgres_repository.py
@@ -2,10 +2,11 @@
 Plan Measures to the live ``plan`` / ``recommendation`` tables (ADR-0017).
 
 The Plan is the parent; each selected Plan Measure is a ``recommendation`` row
-linked by the new ``plan_id`` FK. A re-run replaces (delete the Plan for the
-(property, scenario) → cascade its recommendations → insert fresh), so the
-batch write is idempotent (ADR-0012). CO₂ is stored in tonnes (calculator kg
-÷ 1000) to match the live column contract.
+linked by the new ``plan_id`` FK. A re-run INSERTs a fresh Plan and keeps the
+prior one as history (no cascade delete); when the new Plan is the default it
+demotes prior default Plans for the (property, scenario) to ``is_default=False``
+(ADR-0012). CO₂ is stored in tonnes (calculator kg ÷ 1000) to match the live
+column contract.
 """
 
 from __future__ import annotations
@@ -147,31 +148,61 @@ def test_save_persists_null_per_measure_savings_when_unbilled(
     assert rec_rows[0].energy_cost_savings is None
 
 
-def test_save_is_idempotent_on_rerun_for_the_same_property_and_scenario(
+def test_rerun_keeps_history_and_demotes_the_prior_default_plan(
     db_engine: Engine,
 ) -> None:
-    # Arrange — first run
+    # Arrange — first (default) run
     with Session(db_engine) as session:
-        PlanPostgresRepository(session).save(
+        first_id = PlanPostgresRepository(session).save(
             _plan(), property_id=10, scenario_id=7, portfolio_id=1, is_default=True
         )
         session.commit()
 
-    # Act — re-run the same (property, scenario)
+    # Act — re-run the same (property, scenario) as the default
     with Session(db_engine) as session:
-        PlanPostgresRepository(session).save(
+        second_id = PlanPostgresRepository(session).save(
             _plan(), property_id=10, scenario_id=7, portfolio_id=1, is_default=True
         )
         session.commit()
 
-    # Assert — replaced, not duplicated (cascade removed the old measures)
+    # Assert — the prior Plan is kept as history (no delete), and only the new
+    # Plan is the default; exactly one Plan for the pair stays is_default=True.
     with Session(db_engine) as session:
         plan_rows = session.exec(
             select(PlanModel).where(col(PlanModel.property_id) == 10)
         ).all()
-        rec_rows = session.exec(
-            select(RecommendationModel).where(col(RecommendationModel.property_id) == 10)
-        ).all()
+        by_id = {p.id: p for p in plan_rows}
 
-    assert len(plan_rows) == 1
-    assert len(rec_rows) == 1
+    assert len(plan_rows) == 2
+    assert first_id != second_id
+    assert by_id[first_id].is_default is False  # demoted
+    assert by_id[second_id].is_default is True  # the current default
+    assert sum(1 for p in plan_rows if p.is_default) == 1
+
+
+def test_rerun_as_non_default_does_not_demote_the_prior_default(
+    db_engine: Engine,
+) -> None:
+    # Arrange — a default Plan exists
+    with Session(db_engine) as session:
+        first_id = PlanPostgresRepository(session).save(
+            _plan(), property_id=12, scenario_id=7, portfolio_id=1, is_default=True
+        )
+        session.commit()
+
+    # Act — re-run as NON-default (e.g. a non-default scenario); no demotion runs
+    with Session(db_engine) as session:
+        PlanPostgresRepository(session).save(
+            _plan(), property_id=12, scenario_id=7, portfolio_id=1, is_default=False
+        )
+        session.commit()
+
+    # Assert — the prior default is untouched (we only demote when saving a default)
+    with Session(db_engine) as session:
+        plan_rows = session.exec(
+            select(PlanModel).where(col(PlanModel.property_id) == 12)
+        ).all()
+        by_id = {p.id: p for p in plan_rows}
+
+    assert len(plan_rows) == 2
+    assert by_id[first_id].is_default is True
diff --git a/tests/repositories/product/test_composite_product_repository.py b/tests/repositories/product/test_composite_product_repository.py
new file mode 100644
index 000000000..4c47b89b7
--- /dev/null
+++ b/tests/repositories/product/test_composite_product_repository.py
@@ -0,0 +1,109 @@
+"""Behaviour of the composite ProductRepository: an off-catalogue override
+source checked first, the live catalogue as fallback. The override holds costs
+the ``material`` catalogue cannot supply (today ``secondary_heating_removal``,
+whose Measure Type the ``material.type`` pgEnum does not carry). Resolving it
+from the override keeps that Measure Type away from the DB entirely, while every
+other Measure Type falls through to the catalogue unchanged."""
+
+import pytest
+
+from domain.modelling.product import Product
+from repositories.product.composite_product_repository import (
+    OFF_CATALOGUE_COSTS_PATH,
+    CompositeProductRepository,
+)
+from repositories.product.product_json_repository import ProductJsonRepository
+from repositories.product.product_repository import ProductNotFound, ProductRepository
+
+
+class _StaticRepo(ProductRepository):
+    """A ProductRepository over a fixed measure-type → Product map."""
+
+    def __init__(self, products: dict[str, Product]) -> None:
+        self._products = products
+
+    def get(self, measure_type: str) -> Product:
+        product = self._products.get(measure_type)
+        if product is None:
+            raise ProductNotFound(f"no product for measure type {measure_type!r}")
+        return product
+
+
+class _ExplodingRepo(ProductRepository):
+    """A fallback that must never be reached — any read fails the test loudly,
+    standing in for the catalogue whose pgEnum query would poison the session."""
+
+    def get(self, measure_type: str) -> Product:
+        raise AssertionError(
+            f"fallback was queried for {measure_type!r}; the override should have "
+            "resolved it without touching the catalogue"
+        )
+
+
+def _product(measure_type: str, unit_cost: float) -> Product:
+    return Product(
+        measure_type=measure_type, unit_cost_per_m2=unit_cost, contingency_rate=0.25
+    )
+
+
+def test_get_returns_the_override_without_touching_the_fallback() -> None:
+    # Arrange — the override supplies the off-catalogue cost; the fallback would
+    # raise if consulted (mirroring the live pgEnum DataError on this type).
+    override = _StaticRepo(
+        {"secondary_heating_removal": _product("secondary_heating_removal", 270.0)}
+    )
+    repo = CompositeProductRepository(override=override, fallback=_ExplodingRepo())
+
+    # Act
+    product: Product = repo.get("secondary_heating_removal")
+
+    # Assert
+    assert product.measure_type == "secondary_heating_removal"
+    assert abs(product.unit_cost_per_m2 - 270.0) <= 1e-9
+
+
+def test_get_falls_through_to_the_fallback_when_the_override_misses() -> None:
+    # Arrange — the override has nothing for this type; the catalogue does.
+    override = _StaticRepo({})
+    fallback = _StaticRepo(
+        {"cavity_wall_insulation": _product("cavity_wall_insulation", 18.5)}
+    )
+    repo = CompositeProductRepository(override=override, fallback=fallback)
+
+    # Act
+    product: Product = repo.get("cavity_wall_insulation")
+
+    # Assert
+    assert product.measure_type == "cavity_wall_insulation"
+    assert abs(product.unit_cost_per_m2 - 18.5) <= 1e-9
+
+
+def test_get_raises_product_not_found_when_neither_source_has_it() -> None:
+    # Arrange
+    repo = CompositeProductRepository(
+        override=_StaticRepo({}), fallback=_StaticRepo({})
+    )
+
+    # Act / Assert
+    with pytest.raises(ProductNotFound):
+        repo.get("loft_insulation")
+
+
+def test_committed_override_file_prices_secondary_heating_removal() -> None:
+    # The committed overlay carries the flat per-dwelling decommission cost
+    # (ADR-0028, ported from the legacy heater_removal: (£25 + £200) × 1.2 VAT);
+    # contingency 0.25 is joined from config.
+    product: Product = ProductJsonRepository(OFF_CATALOGUE_COSTS_PATH).get(
+        "secondary_heating_removal"
+    )
+
+    assert abs(product.unit_cost_per_m2 - 270.0) <= 1e-9
+    assert abs(product.contingency_rate - 0.25) <= 1e-9
+
+
+def test_committed_override_file_prices_the_glazing_gaps() -> None:
+    # Glazing is absent from the live catalogue (no active rows), so the overlay
+    # carries per-window costs the generator uses directly (count x unit cost).
+    repo = ProductJsonRepository(OFF_CATALOGUE_COSTS_PATH)
+    assert abs(repo.get("double_glazing").unit_cost_per_m2 - 550.0) <= 1e-9
+    assert abs(repo.get("secondary_glazing").unit_cost_per_m2 - 400.0) <= 1e-9
diff --git a/tests/repositories/product/test_material_snapshot_repository.py b/tests/repositories/product/test_material_snapshot_repository.py
new file mode 100644
index 000000000..acdf3886c
--- /dev/null
+++ b/tests/repositories/product/test_material_snapshot_repository.py
@@ -0,0 +1,170 @@
+"""Behaviour of the in-memory catalogue snapshot. It must price exactly as the
+live ``ProductPostgresRepository`` does — same drift mapping, same lowest-id
+pick, same errors — but after the read Session that built it has closed, so the
+modelling_e2e Lambda can hold a single DB connection per invocation."""
+
+import pytest
+from sqlalchemy import Engine
+from sqlmodel import Session
+
+from domain.modelling.product import Product
+from infrastructure.postgres.product_table import MaterialRow
+from repositories.product.product_postgres_repository import (
+    MaterialSnapshotRepository,
+    ProductPostgresRepository,
+)
+from repositories.product.product_repository import ProductNotFound
+
+
+def test_snapshot_prices_after_the_loading_session_is_closed(
+    db_engine: Engine,
+) -> None:
+    # Arrange
+    with Session(db_engine) as session:
+        session.add(
+            MaterialRow(
+                id=1,
+                type="cavity_wall_insulation",
+                total_cost=18.5,
+                cost_unit="gbp_per_m2",
+                is_active=True,
+                description="Cavity wall insulation",
+            )
+        )
+        session.commit()
+
+    # Act — load the snapshot, then close the Session before pricing.
+    with Session(db_engine) as session:
+        snapshot = MaterialSnapshotRepository.load(session)
+    product: Product = snapshot.get("cavity_wall_insulation")
+
+    # Assert — same mapping as the live repository, no Session needed.
+    assert product.measure_type == "cavity_wall_insulation"
+    assert abs(product.unit_cost_per_m2 - 18.5) <= 1e-9
+    assert abs(product.contingency_rate - 0.10) <= 1e-9
+    assert product.id == 1
+
+
+def test_snapshot_resolves_a_drifted_measure_type_to_the_catalogue_spelling(
+    db_engine: Engine,
+) -> None:
+    # Arrange — the domain type drifts from the catalogue's ``material.type``.
+    with Session(db_engine) as session:
+        session.add(
+            MaterialRow(
+                id=1,
+                type="low_energy_lighting_installation",
+                total_cost=5.0,
+                cost_unit="gbp_per_unit",
+                is_active=True,
+                description="Low energy lighting",
+            )
+        )
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        snapshot = MaterialSnapshotRepository.load(session)
+    product: Product = snapshot.get("low_energy_lighting")
+
+    # Assert — keeps the domain measure type, prices the catalogue row.
+    assert product.measure_type == "low_energy_lighting"
+    assert abs(product.unit_cost_per_m2 - 5.0) <= 1e-9
+
+
+def test_snapshot_picks_the_lowest_id_when_several_active_rows_share_a_type(
+    db_engine: Engine,
+) -> None:
+    # Arrange — many active rows per type; the pick must be deterministic.
+    with Session(db_engine) as session:
+        session.add_all(
+            [
+                MaterialRow(
+                    id=7,
+                    type="solar_pv",
+                    total_cost=99.0,
+                    cost_unit="gbp_per_unit",
+                    is_active=True,
+                    description="Solar PV (higher id)",
+                ),
+                MaterialRow(
+                    id=3,
+                    type="solar_pv",
+                    total_cost=42.0,
+                    cost_unit="gbp_per_unit",
+                    is_active=True,
+                    description="Solar PV (lowest id)",
+                ),
+            ]
+        )
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        snapshot = MaterialSnapshotRepository.load(session)
+    product: Product = snapshot.get("solar_pv")
+
+    # Assert — lowest-id active row wins, matching the live repository.
+    assert product.id == 3
+    assert abs(product.unit_cost_per_m2 - 42.0) <= 1e-9
+
+
+def test_snapshot_excludes_inactive_rows_and_raises_product_not_found(
+    db_engine: Engine,
+) -> None:
+    # Arrange — only an inactive row exists.
+    with Session(db_engine) as session:
+        session.add(
+            MaterialRow(
+                id=1,
+                type="cavity_wall_insulation",
+                total_cost=18.5,
+                cost_unit="gbp_per_m2",
+                is_active=False,
+                description="Cavity wall insulation (retired)",
+            )
+        )
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        snapshot = MaterialSnapshotRepository.load(session)
+
+    # Assert — no active row, so the benign ProductNotFound (a ValueError).
+    with pytest.raises(ProductNotFound):
+        snapshot.get("cavity_wall_insulation")
+
+
+def test_snapshot_matches_the_live_repository_across_a_mixed_catalogue(
+    db_engine: Engine,
+) -> None:
+    # Arrange — a catalogue with a drifted type, duplicate active rows, and an
+    # inactive row: the snapshot and the live repo must agree row-for-row.
+    with Session(db_engine) as session:
+        session.add_all(
+            [
+                MaterialRow(id=1, type="cavity_wall_insulation", total_cost=18.5,
+                            is_active=True),
+                MaterialRow(id=2, type="solar_pv", total_cost=99.0, is_active=True),
+                MaterialRow(id=5, type="solar_pv", total_cost=42.0, is_active=True),
+                MaterialRow(id=6, type="low_energy_lighting_installation",
+                            total_cost=5.0, is_active=True),
+                MaterialRow(id=9, type="loft_insulation", total_cost=12.0,
+                            is_active=False),
+            ]
+        )
+        session.commit()
+
+    # Act
+    with Session(db_engine) as session:
+        snapshot = MaterialSnapshotRepository.load(session)
+        live = ProductPostgresRepository(session)
+        for measure_type in [
+            "cavity_wall_insulation",
+            "solar_pv",
+            "low_energy_lighting",
+        ]:
+            live_product = live.get(measure_type)
+            snapshot_product = snapshot.get(measure_type)
+            # Assert — identical pricing for every priced measure.
+            assert snapshot_product == live_product
diff --git a/tests/repositories/property/test_in_memory_property_overrides_reader.py b/tests/repositories/property/test_in_memory_property_overrides_reader.py
new file mode 100644
index 000000000..5cf64f0bb
--- /dev/null
+++ b/tests/repositories/property/test_in_memory_property_overrides_reader.py
@@ -0,0 +1,66 @@
+"""Behaviour of the pre-fetched in-memory overrides reader: it serves snapshots
+keyed by Property, and resolves a Property with no entry to no overrides — exactly
+as the Postgres reader returns an empty snapshot for a Property with no rows."""
+
+from repositories.property.in_memory_property_overrides_reader import (
+    InMemoryPropertyOverridesReader,
+)
+from repositories.property.property_overrides_reader import (
+    ResolvedPropertyOverride,
+    ResolvedPropertyOverrides,
+)
+
+
+def test_serves_the_prefetched_snapshot_for_a_known_property() -> None:
+    # Arrange
+    snapshot = ResolvedPropertyOverrides(
+        rows=(
+            ResolvedPropertyOverride(
+                override_component="property_type",
+                building_part=0,
+                override_value="House",
+            ),
+        )
+    )
+    reader = InMemoryPropertyOverridesReader({42: snapshot})
+
+    # Act
+    resolved = reader.overrides_for(42)
+
+    # Assert
+    assert resolved is snapshot
+    assert resolved.value("property_type", 0) == "House"
+
+
+def test_unknown_property_resolves_to_no_overrides() -> None:
+    # Arrange — only property 42 was pre-fetched.
+    reader = InMemoryPropertyOverridesReader({42: ResolvedPropertyOverrides(rows=())})
+
+    # Act
+    resolved = reader.overrides_for(999)
+
+    # Assert — empty snapshot, not an error (mirrors the Postgres reader).
+    assert resolved.rows == ()
+    assert resolved.value("property_type", 0) is None
+
+
+def test_does_not_alias_the_caller_mapping() -> None:
+    # Arrange — a mutable mapping handed to the reader.
+    backing: dict[int, ResolvedPropertyOverrides] = {
+        1: ResolvedPropertyOverrides(rows=())
+    }
+    reader = InMemoryPropertyOverridesReader(backing)
+
+    # Act — mutate the caller's mapping after construction.
+    backing[2] = ResolvedPropertyOverrides(
+        rows=(
+            ResolvedPropertyOverride(
+                override_component="built_form_type",
+                building_part=0,
+                override_value="Detached",
+            ),
+        )
+    )
+
+    # Assert — the reader took its own copy; the late insert is invisible.
+    assert reader.overrides_for(2).rows == ()
diff --git a/tests/repositories/property/test_landlord_override_overlays.py b/tests/repositories/property/test_landlord_override_overlays.py
index 20c79c1f6..1f790aa88 100644
--- a/tests/repositories/property/test_landlord_override_overlays.py
+++ b/tests/repositories/property/test_landlord_override_overlays.py
@@ -47,6 +47,88 @@ def test_each_resolvable_component_produces_an_overlay() -> None:
     assert len(overlays) == 4
 
 
+def test_main_fuel_row_produces_a_heating_fuel_overlay() -> None:
+    # Arrange
+    overrides = ResolvedPropertyOverrides(
+        rows=(ResolvedPropertyOverride("main_fuel", 0, "mains gas"),)
+    )
+
+    # Act
+    overlays = overlays_from(overrides)
+
+    # Assert
+    assert len(overlays) == 1
+    assert overlays[0].heating is not None
+    assert overlays[0].heating.main_fuel_type == 26
+
+
+def test_glazing_row_produces_a_glazing_overlay() -> None:
+    # Arrange
+    overrides = ResolvedPropertyOverrides(
+        rows=(ResolvedPropertyOverride("glazing", 0, "Double glazing, 2002 or later"),)
+    )
+
+    # Act
+    overlays = overlays_from(overrides)
+
+    # Assert
+    assert len(overlays) == 1
+    assert overlays[0].glazing is not None
+    assert overlays[0].glazing.glazing_type == 2
+
+
+def test_construction_age_band_row_produces_a_building_part_overlay() -> None:
+    # Arrange
+    overrides = ResolvedPropertyOverrides(
+        rows=(ResolvedPropertyOverride("construction_age_band", 0, "B"),)
+    )
+
+    # Act
+    overlays = overlays_from(overrides)
+
+    # Assert
+    assert len(overlays) == 1
+    main = overlays[0].building_parts[BuildingPartIdentifier.MAIN]
+    assert main.construction_age_band == "B"
+
+
+def test_water_heating_row_produces_a_heating_overlay() -> None:
+    # Arrange
+    overrides = ResolvedPropertyOverrides(
+        rows=(
+            ResolvedPropertyOverride(
+                "water_heating", 0, "From main system, mains gas"
+            ),
+        )
+    )
+
+    # Act
+    overlays = overlays_from(overrides)
+
+    # Assert
+    assert len(overlays) == 1
+    assert overlays[0].heating is not None
+    assert overlays[0].heating.water_heating_code == 901
+    assert overlays[0].heating.water_heating_fuel == 26
+
+
+def test_main_heating_system_row_produces_a_heating_overlay() -> None:
+    # Arrange
+    overrides = ResolvedPropertyOverrides(
+        rows=(
+            ResolvedPropertyOverride("main_heating_system", 0, "Gas boiler, combi"),
+        )
+    )
+
+    # Act
+    overlays = overlays_from(overrides)
+
+    # Assert
+    assert len(overlays) == 1
+    assert overlays[0].heating is not None
+    assert overlays[0].heating.sap_main_heating_code == 104
+
+
 def test_unresolvable_rows_are_skipped() -> None:
     # Arrange — an "Unknown" property type and an unmapped wall material.
     overrides = ResolvedPropertyOverrides(
diff --git a/tests/repositories/property/test_override_component_consistency.py b/tests/repositories/property/test_override_component_consistency.py
new file mode 100644
index 000000000..d3801b0da
--- /dev/null
+++ b/tests/repositories/property/test_override_component_consistency.py
@@ -0,0 +1,35 @@
+"""Every override component must be wired through the WHOLE chain.
+
+The finaliser reader (`_ROW_TYPES`, component -> landlord table) and the overlay
+registry (`_COMPONENT_OVERLAYS`, component -> overlay mapper) must cover exactly
+the same set of components. If a component is classified + stored but has no
+reader entry, the finaliser silently never writes its `property_overrides` rows;
+if it has no overlay entry, the row never reaches the calculator. This guard
+keeps the two registries in lock-step (it would have caught the missing
+main_fuel / glazing / construction_age_band reader entries).
+"""
+
+from __future__ import annotations
+
+from typing import cast
+
+from infrastructure.landlord_overrides.landlord_override_reader_postgres_repository import (
+    _ROW_TYPES,  # pyright: ignore[reportPrivateUsage]
+)
+from infrastructure.postgres.property_override_table import override_component_sa_enum
+from repositories.property.landlord_override_overlays import (
+    _COMPONENT_OVERLAYS,  # pyright: ignore[reportPrivateUsage]
+)
+
+
+def test_reader_and_overlay_registries_cover_the_same_components() -> None:
+    # Assert
+    assert set(_ROW_TYPES) == set(_COMPONENT_OVERLAYS)
+
+
+def test_override_component_pgenum_covers_every_component() -> None:
+    # The property_overrides.override_component pgEnum mirror must list every
+    # component, or writing/reading a new-component row through it throws a
+    # LookupError against Postgres (caught live on the Hyde portfolio-796 run).
+    pgenum_values = cast(list[str], getattr(override_component_sa_enum, "enums"))
+    assert set(pgenum_values) == set(_COMPONENT_OVERLAYS)
diff --git a/tests/repositories/property/test_property_overrides_postgres_reader.py b/tests/repositories/property/test_property_overrides_postgres_reader.py
index 053af9a2f..0aec3afc9 100644
--- a/tests/repositories/property/test_property_overrides_postgres_reader.py
+++ b/tests/repositories/property/test_property_overrides_postgres_reader.py
@@ -115,3 +115,45 @@ def test_property_without_overrides_reads_empty(db_engine: Engine) -> None:
     # Assert
     assert resolved.rows == ()
     assert resolved.value("property_type", 0) is None
+
+
+def test_overrides_for_many_reads_every_property_in_one_pass(
+    db_engine: Engine,
+) -> None:
+    """The batch read returns an entry for every requested Property — each
+    Property's own rows, faithfully, and an empty snapshot for one with none."""
+    # Arrange — Property 7 has two overrides, Property 8 has one, Property 9 none.
+    with Session(db_engine) as session:
+        _seed(
+            session,
+            property_id=7,
+            override_component="property_type",
+            override_value="House",
+        )
+        _seed(
+            session,
+            property_id=7,
+            building_part=1,
+            override_component="wall_type",
+            override_value="Solid brick, with internal insulation",
+        )
+        _seed(
+            session,
+            property_id=8,
+            override_component="property_type",
+            override_value="Flat",
+        )
+        session.commit()
+
+    reader = PropertyOverridesPostgresReader(lambda: Session(db_engine))
+
+    # Act
+    resolved = reader.overrides_for_many([7, 8, 9])
+
+    # Assert — every requested id present; rows attributed to the right Property.
+    assert set(resolved) == {7, 8, 9}
+    assert len(resolved[7].rows) == 2
+    assert resolved[7].value("property_type", 0) == "House"
+    assert resolved[7].value("wall_type", 1) == "Solid brick, with internal insulation"
+    assert resolved[8].value("property_type", 0) == "Flat"
+    assert resolved[9].rows == ()
diff --git a/tests/repositories/solar/test_solar_repository.py b/tests/repositories/solar/test_solar_repository.py
index 3cbfd3949..c18a5cbea 100644
--- a/tests/repositories/solar/test_solar_repository.py
+++ b/tests/repositories/solar/test_solar_repository.py
@@ -41,3 +41,23 @@ def test_get_returns_none_when_no_insights_stored(db_engine: Engine) -> None:
 
     # Assert
     assert reloaded is None
+
+
+def test_get_many_returns_entry_for_every_requested_uprn(db_engine: Engine) -> None:
+    """get_many reads many UPRNs in one query: stored UPRNs return their
+    insights, unstored ones map to None, and every requested UPRN is present."""
+    # Arrange
+    insights_10: dict[str, Any] = {"name": "buildings/A"}
+    insights_20: dict[str, Any] = {"name": "buildings/B"}
+    with Session(db_engine) as session:
+        repo = SolarPostgresRepository(session)
+        repo.save(10, longitude=-0.1, latitude=51.5, insights=insights_10)
+        repo.save(20, longitude=-0.2, latitude=52.0, insights=insights_20)
+        session.commit()
+
+    # Act — 30 has no stored row
+    with Session(db_engine) as session:
+        loaded = SolarPostgresRepository(session).get_many([10, 20, 30])
+
+    # Assert
+    assert loaded == {10: insights_10, 20: insights_20, 30: None}
diff --git a/tests/repositories/tasks/postgres/test_subtask_postgres_repository.py b/tests/repositories/tasks/postgres/test_subtask_postgres_repository.py
index 9cec52ea8..81cdbad19 100644
--- a/tests/repositories/tasks/postgres/test_subtask_postgres_repository.py
+++ b/tests/repositories/tasks/postgres/test_subtask_postgres_repository.py
@@ -98,3 +98,68 @@ def test_get_missing_raises(session: Session) -> None:
     # act / assert
     with pytest.raises(ValueError, match="not found"):
         repo.get(uuid4())
+
+
+def test_create_many_persists_every_subtask(session: Session) -> None:
+    # arrange
+    repo = SubTaskPostgresRepository(session=session)
+    task_id = _persisted_task_id(session)
+    subtasks = [
+        SubTask.create(task_id=task_id, inputs={"property_id": pid})
+        for pid in (1, 2, 3)
+    ]
+
+    # act
+    repo.create_many(subtasks)
+
+    # assert — all three persisted, in WAITING, with their inputs
+    persisted = {
+        (s.inputs or {})["property_id"]: s for s in repo.list_by_task(task_id)
+    }
+    assert set(persisted) == {1, 2, 3}
+    assert all(s.status is SubTaskStatus.WAITING for s in persisted.values())
+
+
+def test_create_many_empty_is_a_noop(session: Session) -> None:
+    # arrange / act / assert — does not raise, writes nothing
+    SubTaskPostgresRepository(session=session).create_many([])
+
+
+def test_save_many_persists_each_subtasks_terminal_state(session: Session) -> None:
+    # arrange — three created subtasks
+    repo = SubTaskPostgresRepository(session=session)
+    task_id = _persisted_task_id(session)
+    subtasks = [
+        SubTask.create(task_id=task_id, inputs={"property_id": pid})
+        for pid in (1, 2, 3)
+    ]
+    repo.create_many(subtasks)
+
+    # act — move each to a terminal state in memory, then one bulk save
+    subtasks[0].complete({"ok": True})
+    subtasks[1].fail(RuntimeError("nope"))
+    subtasks[2].complete()
+    repo.save_many(subtasks)
+
+    # assert
+    persisted = {
+        (s.inputs or {})["property_id"]: s for s in repo.list_by_task(task_id)
+    }
+    assert persisted[1].status is SubTaskStatus.COMPLETE
+    assert persisted[1].outputs == {"result": {"ok": True}}
+    assert persisted[2].status is SubTaskStatus.FAILED
+    assert persisted[2].outputs == {"error": "nope"}
+    assert persisted[3].status is SubTaskStatus.COMPLETE
+
+
+def test_save_many_raises_when_a_subtask_does_not_exist(session: Session) -> None:
+    # arrange — one persisted, one never created
+    repo = SubTaskPostgresRepository(session=session)
+    task_id = _persisted_task_id(session)
+    persisted = SubTask.create(task_id=task_id)
+    repo.create_many([persisted])
+    ghost = SubTask.create(task_id=task_id)
+
+    # act / assert
+    with pytest.raises(ValueError, match="not found"):
+        repo.save_many([persisted, ghost])
diff --git a/tests/repositories/test_unit_of_work.py b/tests/repositories/test_unit_of_work.py
index 5008d4c63..43f6f14e3 100644
--- a/tests/repositories/test_unit_of_work.py
+++ b/tests/repositories/test_unit_of_work.py
@@ -1,25 +1,45 @@
 from __future__ import annotations
 
+import json
 from collections.abc import Callable
+from pathlib import Path
+from typing import Any
 
 import pytest
 from sqlalchemy import Engine
-from sqlmodel import Session
+from sqlmodel import Session, create_engine
 
 from datatypes.epc.domain.epc import Epc
+from datatypes.epc.domain.epc_property_data import (
+    BuildingPartIdentifier,
+    EpcPropertyData,
+)
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
 from domain.property_baseline.property_baseline_performance import PropertyBaselinePerformance
 from domain.property_baseline.performance import Performance
+from infrastructure.postgres.property_override_table import PropertyOverrideRow
+from infrastructure.postgres.property_table import PropertyRow
+from repositories.epc.epc_postgres_repository import EpcPostgresRepository
 from repositories.plan.plan_repository import PlanRepository
 from repositories.postgres_unit_of_work import PostgresUnitOfWork
 from repositories.product.product_repository import ProductRepository
 from repositories.scenario.scenario_repository import ScenarioRepository
 from repositories.spatial.spatial_repository import SpatialRepository
 
+_JSON_SAMPLES = Path(__file__).resolve().parents[2] / "backend/epc_api/json_samples"
+
 
 def _session_factory(db_engine: Engine) -> Callable[[], Session]:
     return lambda: Session(db_engine)
 
 
+def _epc() -> EpcPropertyData:
+    raw: dict[str, Any] = json.loads(
+        (_JSON_SAMPLES / "RdSAP-Schema-21.0.0" / "epc.json").read_text()
+    )
+    return EpcPropertyDataMapper.from_api_response(raw)
+
+
 def _baseline() -> PropertyBaselinePerformance:
     perf = Performance(
         sap_score=72, epc_band=Epc.C, co2_emissions=1.8, primary_energy_intensity=180
@@ -86,6 +106,108 @@ def test_unit_exposes_the_spatial_cache_repo_bound_to_its_session(
         assert isinstance(uow.spatial, SpatialRepository)
 
 
+def test_unit_hydrates_a_property_with_its_landlord_overrides_folded(
+    db_engine: Engine,
+) -> None:
+    """A Property re-hydrated through the unit folds its Landlord Overrides onto
+    the Effective EPC (ADR-0032) — the same overlay the live modelling path
+    applies. Without this the Baseline Performance the orchestrator scores off
+    ``uow.property`` diverges from the Plan, which does apply the overrides.
+    """
+    # Arrange — a lodged EPC (cavity main wall, 4) plus a solid-brick / internal
+    # wall override, persisted through the unit.
+    with PostgresUnitOfWork(_session_factory(db_engine)) as uow:
+        row = PropertyRow(portfolio_id=1, postcode="A0 0AA", address="1 St", uprn=1)
+        uow._session.add(row)  # pyright: ignore[reportPrivateUsage]
+        uow._session.flush()  # pyright: ignore[reportPrivateUsage]
+        property_id = row.id
+        assert property_id is not None
+        EpcPostgresRepository(uow._session).save(  # pyright: ignore[reportPrivateUsage]
+            _epc(), property_id=property_id
+        )
+        uow._session.add(  # pyright: ignore[reportPrivateUsage]
+            PropertyOverrideRow(
+                property_id=property_id,
+                portfolio_id=1,
+                building_part=0,
+                override_component="wall_type",
+                override_value="Solid brick, with internal insulation",
+                original_spreadsheet_description="solid brick, insulated",
+            )
+        )
+        uow.commit()
+
+    # Act — re-hydrate through a fresh unit.
+    with PostgresUnitOfWork(_session_factory(db_engine)) as uow:
+        prop = uow.property.get(property_id)
+
+    main = next(
+        part
+        for part in prop.effective_epc.sap_building_parts
+        if part.identifier is BuildingPartIdentifier.MAIN
+    )
+
+    # Assert — the override is folded: cavity (4) → solid brick (3) / internal (3).
+    assert main.wall_construction == 3
+    assert main.wall_insulation_type == 3
+
+
+def test_hydrating_a_property_with_overrides_stays_on_one_connection(
+    db_engine: Engine,
+) -> None:
+    """Resolving Landlord Overrides during re-hydration must read on the unit's
+    OWN session, not open a second one. The modelling_e2e Lambda runs on a
+    single-connection pool (``pool_size=1, max_overflow=0``); a second session
+    opened while the unit's read transaction is still open checks out a second
+    connection and deadlocks ("QueuePool limit of size 1 overflow 0 reached,
+    connection timed out"). This pins that the unit holds exactly one connection
+    while it hydrates a Property that has overrides.
+    """
+    # Arrange — seed a property + EPC + an override (committed reference data).
+    with PostgresUnitOfWork(_session_factory(db_engine)) as uow:
+        row = PropertyRow(portfolio_id=1, postcode="A0 0AA", address="1 St", uprn=1)
+        uow._session.add(row)  # pyright: ignore[reportPrivateUsage]
+        uow._session.flush()  # pyright: ignore[reportPrivateUsage]
+        property_id = row.id
+        assert property_id is not None
+        EpcPostgresRepository(uow._session).save(  # pyright: ignore[reportPrivateUsage]
+            _epc(), property_id=property_id
+        )
+        uow._session.add(  # pyright: ignore[reportPrivateUsage]
+            PropertyOverrideRow(
+                property_id=property_id,
+                portfolio_id=1,
+                building_part=0,
+                override_component="wall_type",
+                override_value="Solid brick, with internal insulation",
+                original_spreadsheet_description="solid brick, insulated",
+            )
+        )
+        uow.commit()
+
+    # A pool that admits exactly one connection and fails fast (not after 30s) if
+    # a second is requested — the production modelling_e2e shape.
+    single_connection = create_engine(
+        db_engine.url, pool_size=1, max_overflow=0, pool_timeout=2
+    )
+    try:
+        # Act — hydrate through the unit; this resolves the override.
+        with PostgresUnitOfWork(_session_factory(single_connection)) as uow:
+            prop = uow.property.get(property_id)
+    finally:
+        single_connection.dispose()
+
+    # Assert — reached here without a QueuePool timeout, and the override folded:
+    # cavity (4) → solid brick (3) / internal (3).
+    main = next(
+        part
+        for part in prop.effective_epc.sap_building_parts
+        if part.identifier is BuildingPartIdentifier.MAIN
+    )
+    assert main.wall_construction == 3
+    assert main.wall_insulation_type == 3
+
+
 def test_leaving_the_block_without_commit_persists_nothing(db_engine: Engine) -> None:
     # Arrange
     new_unit = lambda: PostgresUnitOfWork(_session_factory(db_engine))
diff --git a/tests/utilities/aws_lambda/test_task_handler.py b/tests/utilities/aws_lambda/test_task_handler.py
new file mode 100644
index 000000000..418669bcd
--- /dev/null
+++ b/tests/utilities/aws_lambda/test_task_handler.py
@@ -0,0 +1,131 @@
+from collections.abc import Generator, Iterator
+from contextlib import contextmanager
+from dataclasses import dataclass
+from typing import Any
+from uuid import UUID
+
+import pytest
+from sqlalchemy import Engine
+from sqlmodel import Session
+
+from domain.tasks.tasks import Source
+from orchestration.task_orchestrator import TaskOrchestrator
+from repositories.tasks.subtask_postgres_repository import SubTaskPostgresRepository
+from repositories.tasks.task_postgres_repository import TaskPostgresRepository
+from utilities.aws_lambda.task_handler import task_handler
+
+
+@dataclass
+class Harness:
+    orchestrator: TaskOrchestrator
+    tasks: TaskPostgresRepository
+    subtasks: SubTaskPostgresRepository
+
+    @contextmanager
+    def factory(self) -> Generator[TaskOrchestrator, None, None]:
+        yield self.orchestrator
+
+
+@pytest.fixture
+def harness(db_engine: Engine) -> Iterator[Harness]:
+    with Session(db_engine) as session:
+        tasks = TaskPostgresRepository(session=session)
+        subtasks = SubTaskPostgresRepository(session=session)
+        yield Harness(
+            orchestrator=TaskOrchestrator(task_repo=tasks, subtask_repo=subtasks),
+            tasks=tasks,
+            subtasks=subtasks,
+        )
+
+
+def _direct_event(property_id: str) -> dict[str, Any]:
+    return {"property_id": property_id}
+
+
+def test_task_handler_records_cloudwatch_url_on_subtask(
+    harness: Harness, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    # arrange
+    monkeypatch.setenv("AWS_REGION", "eu-west-2")
+    monkeypatch.setenv(
+        "AWS_LAMBDA_LOG_GROUP_NAME", "/aws/lambda/modelling-e2e"
+    )
+    monkeypatch.setenv(
+        "AWS_LAMBDA_LOG_STREAM_NAME", "2026/05/20/[$LATEST]abc123"
+    )
+
+    @task_handler(
+        task_source="modelling_e2e",
+        source=Source.PROPERTY,
+        orchestrator_cm=harness.factory,
+    )
+    def handler(body: dict[str, Any], context: Any) -> None:
+        return None
+
+    # act
+    result = handler(_direct_event("prop-1"), context=None)
+
+    # assert
+    subtask_id = result[0]["subtask_id"]
+    saved_url = harness.subtasks.get(UUID(subtask_id)).cloud_logs_url
+    assert saved_url is not None
+    assert saved_url.startswith(
+        "https://eu-west-2.console.aws.amazon.com/cloudwatch/home"
+    )
+    # Log group / stream are console-encoded ("/" -> "$252F").
+    assert "$252Faws$252Flambda$252Fmodelling-e2e" in saved_url
+    assert "$255B$2524LATEST$255D" in saved_url
+
+
+def test_task_handler_passes_orchestrator_and_task_id_when_flag_is_true(
+    harness: Harness,
+) -> None:
+    # Arrange
+    received: list[tuple[TaskOrchestrator, UUID]] = []
+
+    @task_handler(
+        task_source="modelling_e2e",
+        source=Source.PROPERTY,
+        orchestrator_cm=harness.factory,
+        pass_task_orchestrator=True,
+    )
+    def _handler(
+        body: dict[str, Any], context: Any, orchestrator: TaskOrchestrator, task_id: UUID
+    ) -> None:
+        received.append((orchestrator, task_id))
+
+    # Act
+    result = _handler(_direct_event("prop-1"), context=None)
+
+    # Assert
+    assert len(received) == 1
+    recv_orchestrator, recv_task_id = received[0]
+    assert recv_orchestrator is harness.orchestrator
+    assert recv_task_id == UUID(result[0]["task_id"])
+
+
+def test_task_handler_leaves_cloudwatch_url_unset_outside_lambda(
+    harness: Harness, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    # arrange
+    for var in (
+        "AWS_REGION",
+        "AWS_LAMBDA_LOG_GROUP_NAME",
+        "AWS_LAMBDA_LOG_STREAM_NAME",
+    ):
+        monkeypatch.delenv(var, raising=False)
+
+    @task_handler(
+        task_source="modelling_e2e",
+        source=Source.PROPERTY,
+        orchestrator_cm=harness.factory,
+    )
+    def handler(body: dict[str, Any], context: Any) -> None:
+        return None
+
+    # act
+    result = handler(_direct_event("prop-1"), context=None)
+
+    # assert
+    subtask_id = result[0]["subtask_id"]
+    assert harness.subtasks.get(UUID(subtask_id)).cloud_logs_url is None
diff --git a/utilities/aws_lambda/cloud_logs.py b/utilities/aws_lambda/cloud_logs.py
new file mode 100644
index 000000000..9a8da920a
--- /dev/null
+++ b/utilities/aws_lambda/cloud_logs.py
@@ -0,0 +1,27 @@
+"""Build a CloudWatch console deep-link for the running Lambda invocation.
+
+Shared by @task_handler and @subtask_handler so both persist the same
+`cloud_logs_url` onto the SubTask they run.
+"""
+
+import os
+from typing import Optional
+from urllib.parse import quote
+
+
+def _console_encode(value: str) -> str:
+    return quote(value, safe="").replace("%", "$25")
+
+
+def cloudwatch_url() -> Optional[str]:
+    """Deep-link to this invocation's log stream, or None outside Lambda."""
+    region = os.environ.get("AWS_REGION")
+    log_group = os.environ.get("AWS_LAMBDA_LOG_GROUP_NAME")
+    log_stream = os.environ.get("AWS_LAMBDA_LOG_STREAM_NAME")
+    if not (region and log_group and log_stream):
+        return None
+    return (
+        f"https://{region}.console.aws.amazon.com/cloudwatch/home"
+        f"?region={region}#logsV2:log-groups/log-group/"
+        f"{_console_encode(log_group)}/log-events/{_console_encode(log_stream)}"
+    )
diff --git a/utilities/aws_lambda/default_orchestrator.py b/utilities/aws_lambda/default_orchestrator.py
index f78886b9a..cd4c7d1e6 100644
--- a/utilities/aws_lambda/default_orchestrator.py
+++ b/utilities/aws_lambda/default_orchestrator.py
@@ -2,6 +2,7 @@ import os
 from collections.abc import Generator
 from contextlib import contextmanager
 
+from sqlalchemy.pool import NullPool
 from sqlmodel import Session
 
 from infrastructure.postgres.config import PostgresConfig
@@ -17,8 +18,11 @@ def default_orchestrator() -> Generator[TaskOrchestrator, None, None]:
 
     Connection params come from os.environ via PostgresConfig.from_env. Each
     handler invocation gets its own session, cleaned up on context exit.
+
+    NullPool is intentional: a new engine is created on every invocation, so
+    pooling would accumulate idle connections across warm Lambda containers.
     """
-    engine = make_engine(PostgresConfig.from_env(dict(os.environ)))
+    engine = make_engine(PostgresConfig.from_env(dict(os.environ)), poolclass=NullPool)
     with Session(engine) as session:
         yield TaskOrchestrator(
             task_repo=TaskPostgresRepository(session=session),
diff --git a/utilities/aws_lambda/subtask_handler.py b/utilities/aws_lambda/subtask_handler.py
index e5ac086a6..6b513ba49 100644
--- a/utilities/aws_lambda/subtask_handler.py
+++ b/utilities/aws_lambda/subtask_handler.py
@@ -6,12 +6,11 @@ TaskOrchestrator.run_subtask(...) calls.
 
 import json
 import logging
-import os
 from contextlib import AbstractContextManager
 from functools import wraps
 from typing import Any, Callable, Optional, cast
-from urllib.parse import quote
 
+from utilities.aws_lambda.cloud_logs import cloudwatch_url
 from utilities.aws_lambda.default_orchestrator import default_orchestrator
 from utilities.aws_lambda.subtask_trigger_body import SubtaskTriggerBody
 from orchestration.task_orchestrator import TaskOrchestrator
@@ -42,7 +41,7 @@ def subtask_handler(
 
         @wraps(func)
         def wrapper(event: dict[str, Any], context: Any) -> None:
-            cloud_logs_url = _cloudwatch_url()
+            cloud_logs_url = cloudwatch_url()
             with factory() as orchestrator:
                 for record in _records(event):
                     body = _parse_body(record)
@@ -95,20 +94,3 @@ def _records(event: dict[str, Any]) -> list[dict[str, Any]]:
     if isinstance(raw_records, list):
         return [r for r in cast(list[Any], raw_records) if isinstance(r, dict)]
     return [event]
-
-
-def _console_encode(value: str) -> str:
-    return quote(value, safe="").replace("%", "$25")
-
-
-def _cloudwatch_url() -> Optional[str]:
-    region = os.environ.get("AWS_REGION")
-    log_group = os.environ.get("AWS_LAMBDA_LOG_GROUP_NAME")
-    log_stream = os.environ.get("AWS_LAMBDA_LOG_STREAM_NAME")
-    if not (region and log_group and log_stream):
-        return None
-    return (
-        f"https://{region}.console.aws.amazon.com/cloudwatch/home"
-        f"?region={region}#logsV2:log-groups/log-group/"
-        f"{_console_encode(log_group)}/log-events/{_console_encode(log_stream)}"
-    )
diff --git a/utilities/aws_lambda/task_handler.py b/utilities/aws_lambda/task_handler.py
index 82c7198ea..f2064f573 100644
--- a/utilities/aws_lambda/task_handler.py
+++ b/utilities/aws_lambda/task_handler.py
@@ -5,14 +5,18 @@ TaskOrchestrator.create_task_with_subtask(...) + run_subtask(...).
 """
 
 import json
+import logging
 from contextlib import AbstractContextManager
 from functools import wraps
 from typing import Any, Callable, Optional, cast
 
+from utilities.aws_lambda.cloud_logs import cloudwatch_url
 from utilities.aws_lambda.default_orchestrator import default_orchestrator
 from domain.tasks.tasks import Source
 from orchestration.task_orchestrator import TaskOrchestrator
 
+logger = logging.getLogger(__name__)
+
 OrchestratorCM = Callable[[], AbstractContextManager[TaskOrchestrator]]
 
 
@@ -21,6 +25,7 @@ def task_handler(
     task_source: str,
     source: Source,
     orchestrator_cm: Optional[OrchestratorCM] = None,
+    pass_task_orchestrator: bool = False,
 ) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
     """Run the wrapped function as the body of a freshly-created Task + SubTask.
 
@@ -38,8 +43,9 @@ def task_handler(
     def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
         @wraps(func)
         def wrapper(event: dict[str, Any], context: Any) -> Any:
+            cloud_logs_url = cloudwatch_url()
             with factory() as orchestrator:
-                results: list[Any] = []
+                task_ids: list[dict[str, str]] = []
                 failures: list[dict[str, Any]] = []
 
                 for record in _records(event):
@@ -49,20 +55,35 @@ def task_handler(
                         str(raw_source_id) if raw_source_id is not None else None
                     )
 
-                    _, subtask = orchestrator.create_task_with_subtask(
+                    task, subtask = orchestrator.create_task_with_subtask(
                         task_source=task_source,
                         inputs=body,
                         source=source,
                         source_id=source_id,
                     )
+                    task_ids.append(
+                        {"task_id": str(task.id), "subtask_id": str(subtask.id)}
+                    )
 
                     try:
-                        result = orchestrator.run_subtask(
-                            subtask.id,
-                            work=lambda body=body: func(body, context),
-                        )
-                        results.append(result)
+                        if pass_task_orchestrator:
+                            orchestrator.run_subtask(
+                                subtask.id,
+                                work=lambda: func(body, context, orchestrator, task.id),
+                                cloud_logs_url=cloud_logs_url,
+                            )
+                        else:
+                            orchestrator.run_subtask(
+                                subtask.id,
+                                work=lambda: func(body, context),
+                                cloud_logs_url=cloud_logs_url,
+                            )
                     except Exception:
+                        logger.exception(
+                            "subtask failed (task_source=%s source_id=%s)",
+                            task_source,
+                            source_id,
+                        )
                         if "Records" in event:
                             message_id = record.get("messageId", "")
                             failures.append({"itemIdentifier": message_id})
@@ -70,8 +91,8 @@ def task_handler(
                             raise
 
                 if "Records" in event:
-                    return {"batchItemFailures": failures}
-                return results
+                    return {"batchItemFailures": failures, "tasks": task_ids}
+                return task_ids
 
         return wrapper