From b99069a7d42d68d7b52bbcd881f3a93c90955cb6 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Fri, 13 Jun 2025 11:57:49 +0100
Subject: [PATCH] Working on remote assessment modal ui

---
 src/app/components/portfolio/Toolbar.tsx      |    5 +-
 .../migrations/0100_wakeful_doctor_doom.sql   |    1 +
 src/app/db/migrations/meta/0100_snapshot.json | 2988 +++++++++++++++++
 src/app/db/migrations/meta/_journal.json      |    7 +
 src/app/db/schema/recommendations.ts          |    2 +-
 .../portfolio/[slug]/(portfolio)/layout.tsx   |    6 +-
 .../components/RemoteAssessmentModal.tsx      |  513 +--
 .../components/SelectScenarioDropdown.tsx     |   80 +
 src/app/portfolio/[slug]/utils.ts             |   12 +
 9 files changed, 3384 insertions(+), 230 deletions(-)
 create mode 100644 src/app/db/migrations/0100_wakeful_doctor_doom.sql
 create mode 100644 src/app/db/migrations/meta/0100_snapshot.json
 create mode 100644 src/app/portfolio/[slug]/components/SelectScenarioDropdown.tsx

diff --git a/src/app/components/portfolio/Toolbar.tsx b/src/app/components/portfolio/Toolbar.tsx
index 35d7718e..1ba07b6a 100644
--- a/src/app/components/portfolio/Toolbar.tsx
+++ b/src/app/components/portfolio/Toolbar.tsx
@@ -17,16 +17,18 @@ import UploadCsvModal from "@/app/portfolio/[slug]/components/UploadCsvModal";
 import RemoteAssessmentModal from "@/app/portfolio/[slug]/components/RemoteAssessmentModal";
 import { useState } from "react";
 import { useRouter } from "next/navigation";
+import { ScenarioSelect } from "@/app/db/schema/recommendations";
 
 interface ToolbarProps {
   portfolioId: string;
+  scenarios: ScenarioSelect[];
 }
 
 const navigationMenuTriggerStyle = cva(
   "bg-gray-50 cursor-pointer group inline-flex h-10 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-gray-200 hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-[active]:bg-accent/50 data-[state=open]:bg-gray-200 "
 );
 
-export function Toolbar({ portfolioId }: ToolbarProps) {
+export function Toolbar({ portfolioId, scenarios }: ToolbarProps) {
   const router = useRouter();
 
   function handleClickSettings() {
@@ -94,6 +96,7 @@ export function Toolbar({ portfolioId }: ToolbarProps) {
         isOpen={isRemoteAssessmentOpen}
         setIsOpen={setIsRemoteAssessmentOpen}
         portfolioId={portfolioId}
+        scenarios={scenarios}
       />
       <UploadCsvModal
         isOpen={modalIsOpen}
diff --git a/src/app/db/migrations/0100_wakeful_doctor_doom.sql b/src/app/db/migrations/0100_wakeful_doctor_doom.sql
new file mode 100644
index 00000000..27c0a87d
--- /dev/null
+++ b/src/app/db/migrations/0100_wakeful_doctor_doom.sql
@@ -0,0 +1 @@
+ALTER TABLE "scenario" ADD COLUMN "goal_value" text;
\ No newline at end of file
diff --git a/src/app/db/migrations/meta/0100_snapshot.json b/src/app/db/migrations/meta/0100_snapshot.json
new file mode 100644
index 00000000..312aeb21
--- /dev/null
+++ b/src/app/db/migrations/meta/0100_snapshot.json
@@ -0,0 +1,2988 @@
+{
+  "version": "5",
+  "dialect": "pg",
+  "id": "55fba457-401b-4f68-9b8a-a674b1975251",
+  "prevId": "48db0dd4-acc9-4535-9b99-9fd566f87a91",
+  "tables": {
+    "energy_assessments": {
+      "name": "energy_assessments",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn_source": {
+          "name": "uprn_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_type": {
+          "name": "property_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "building_reference_number": {
+          "name": "building_reference_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_efficiency": {
+          "name": "current_energy_efficiency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "current_energy_rating": {
+          "name": "current_energy_rating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address1": {
+          "name": "address1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address2": {
+          "name": "address2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address3": {
+          "name": "address3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "posttown": {
+          "name": "posttown",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address": {
+          "name": "address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "county": {
+          "name": "county",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency": {
+          "name": "constituency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency_label": {
+          "name": "constituency_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "low_energy_fixed_light_count": {
+          "name": "low_energy_fixed_light_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "construction_age_band": {
+          "name": "construction_age_band",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_energy_eff": {
+          "name": "mainheat_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_env_eff": {
+          "name": "windows_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_energy_eff": {
+          "name": "lighting_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment_impact_potential": {
+          "name": "environment_impact_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatcont_description": {
+          "name": "mainheatcont_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sheating_energy_eff": {
+          "name": "sheating_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "local_authority": {
+          "name": "local_authority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "local_authority_label": {
+          "name": "local_authority_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "fixed_lighting_outlets_count": {
+          "name": "fixed_lighting_outlets_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_tariff": {
+          "name": "energy_tariff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mechanical_ventilation": {
+          "name": "mechanical_ventilation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "solar_water_heating_flag": {
+          "name": "solar_water_heating_flag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emissions_potential": {
+          "name": "co2_emissions_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_heated_rooms": {
+          "name": "number_heated_rooms",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_description": {
+          "name": "floor_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_consumption_potential": {
+          "name": "energy_consumption_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "built_form": {
+          "name": "built_form",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_open_fireplaces": {
+          "name": "number_open_fireplaces",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_description": {
+          "name": "windows_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "glazed_area": {
+          "name": "glazed_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inspection_date": {
+          "name": "inspection_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mains_gas_flag": {
+          "name": "mains_gas_flag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emiss_curr_per_floor_area": {
+          "name": "co2_emiss_curr_per_floor_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_loss_corridor": {
+          "name": "heat_loss_corridor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unheated_corridor_length": {
+          "name": "unheated_corridor_length",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "flat_storey_count": {
+          "name": "flat_storey_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_energy_eff": {
+          "name": "roof_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_floor_area": {
+          "name": "total_floor_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment_impact_current": {
+          "name": "environment_impact_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "roof_description": {
+          "name": "roof_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_energy_eff": {
+          "name": "floor_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_habitable_rooms": {
+          "name": "number_habitable_rooms",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_env_eff": {
+          "name": "hot_water_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatc_energy_eff": {
+          "name": "mainheatc_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "main_fuel": {
+          "name": "main_fuel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_env_eff": {
+          "name": "lighting_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_energy_eff": {
+          "name": "windows_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_env_eff": {
+          "name": "floor_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sheating_env_eff": {
+          "name": "sheating_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_description": {
+          "name": "lighting_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "roof_env_eff": {
+          "name": "roof_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_energy_eff": {
+          "name": "walls_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "photo_supply": {
+          "name": "photo_supply",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_cost_potential": {
+          "name": "lighting_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_env_eff": {
+          "name": "mainheat_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "multi_glaze_proportion": {
+          "name": "multi_glaze_proportion",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "main_heating_controls": {
+          "name": "main_heating_controls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "flat_top_storey": {
+          "name": "flat_top_storey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "secondheat_description": {
+          "name": "secondheat_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_env_eff": {
+          "name": "walls_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "transaction_type": {
+          "name": "transaction_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "extension_count": {
+          "name": "extension_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatc_env_eff": {
+          "name": "mainheatc_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lmk_key": {
+          "name": "lmk_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wind_turbine_count": {
+          "name": "wind_turbine_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tenure": {
+          "name": "tenure",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_level": {
+          "name": "floor_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "potential_energy_efficiency": {
+          "name": "potential_energy_efficiency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "potential_energy_rating": {
+          "name": "potential_energy_rating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_energy_eff": {
+          "name": "hot_water_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "low_energy_lighting": {
+          "name": "low_energy_lighting",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_description": {
+          "name": "walls_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hotwater_description": {
+          "name": "hotwater_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emissions_current": {
+          "name": "co2_emissions_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heating_cost_current": {
+          "name": "heating_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heating_cost_potential": {
+          "name": "heating_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_cost_current": {
+          "name": "hot_water_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_cost_potential": {
+          "name": "hot_water_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_cost_current": {
+          "name": "lighting_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_consumption_current": {
+          "name": "energy_consumption_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lodgement_date": {
+          "name": "lodgement_date",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lodgement_datetime": {
+          "name": "lodgement_datetime",
+          "type": "timestamp (6)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_description": {
+          "name": "mainheat_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_height": {
+          "name": "floor_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "glazed_type": {
+          "name": "glazed_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_location": {
+          "name": "file_location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor_name": {
+          "name": "surveyor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor_company": {
+          "name": "surveyor_company",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "space_heating_kwh": {
+          "name": "space_heating_kwh",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "water_heating_kwh": {
+          "name": "water_heating_kwh",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_doors": {
+          "name": "number_of_doors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_insulated_doors": {
+          "name": "number_of_insulated_doors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_floors": {
+          "name": "number_of_floors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "insulation_wall_area": {
+          "name": "insulation_wall_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_loss_perimeter": {
+          "name": "heat_loss_perimeter",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "party_wall_length": {
+          "name": "party_wall_length",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "perimeter": {
+          "name": "perimeter",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "rooms_with_bath_and_or_shower": {
+          "name": "rooms_with_bath_and_or_shower",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rooms_with_mixer_shower_no_bath": {
+          "name": "rooms_with_mixer_shower_no_bath",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "room_with_bath_and_mixer_shower": {
+          "name": "room_with_bath_and_mixer_shower",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "percent_draftproofed": {
+          "name": "percent_draftproofed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_hot_water_cylinder": {
+          "name": "has_hot_water_cylinder",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_insulation_type": {
+          "name": "cylinder_insulation_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_insulation_thickness": {
+          "name": "cylinder_insulation_thickness",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_thermostat": {
+          "name": "cylinder_thermostat",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_dwelling_ground_floor_area": {
+          "name": "main_dwelling_ground_floor_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_windows": {
+          "name": "number_of_windows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_area": {
+          "name": "windows_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {}
+    },
+    "energy_assessment_documents": {
+      "name": "energy_assessment_documents",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_assessment_id": {
+          "name": "energy_assessment_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_type": {
+          "name": "document_type",
+          "type": "document_type",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_location": {
+          "name": "document_location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "scenario_id": {
+          "name": "scenario_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "energy_assessment_documents_energy_assessment_id_energy_assessments_id_fk": {
+          "name": "energy_assessment_documents_energy_assessment_id_energy_assessments_id_fk",
+          "tableFrom": "energy_assessment_documents",
+          "tableTo": "energy_assessments",
+          "columnsFrom": [
+            "energy_assessment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "energy_assessment_documents_scenario_id_energy_assessment_scenarios_id_fk": {
+          "name": "energy_assessment_documents_scenario_id_energy_assessment_scenarios_id_fk",
+          "tableFrom": "energy_assessment_documents",
+          "tableTo": "energy_assessment_scenarios",
+          "columnsFrom": [
+            "scenario_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "energy_assessment_scenarios": {
+      "name": "energy_assessment_scenarios",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "scenario_name": {
+          "name": "scenario_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_assessment_id": {
+          "name": "energy_assessment_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "energy_assessment_scenarios_energy_assessment_id_energy_assessments_id_fk": {
+          "name": "energy_assessment_scenarios_energy_assessment_id_energy_assessments_id_fk",
+          "tableFrom": "energy_assessment_scenarios",
+          "tableTo": "energy_assessments",
+          "columnsFrom": [
+            "energy_assessment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "material": {
+      "name": "material",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "type",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "depth": {
+          "name": "depth",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "depth_unit": {
+          "name": "depth_unit",
+          "type": "depth_unit",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_unit": {
+          "name": "cost_unit",
+          "type": "cost_unit",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "r_value_per_mm": {
+          "name": "r_value_per_mm",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "r_value_unit": {
+          "name": "r_value_unit",
+          "type": "r_value_unit",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "thermal_conductivity": {
+          "name": "thermal_conductivity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "thermal_conductivity_unit": {
+          "name": "thermal_conductivity_unit",
+          "type": "thermal_conductivity_unit",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "link": {
+          "name": "link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "prime_material_cost": {
+          "name": "prime_material_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "material_cost": {
+          "name": "material_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_cost": {
+          "name": "labour_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_hours_per_unit": {
+          "name": "labour_hours_per_unit",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plant_cost": {
+          "name": "plant_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_cost": {
+          "name": "total_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_installer_quote": {
+          "name": "is_installer_quote",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {}
+    },
+    "portfolio": {
+      "name": "portfolio",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "budget": {
+          "name": "budget",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "status",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal": {
+          "name": "goal",
+          "type": "goal",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_properties": {
+          "name": "number_of_properties",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rental_yield_increase": {
+          "name": "rental_yield_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "epc_breakdown_pre_retrofit": {
+          "name": "epc_breakdown_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_post_retrofit": {
+          "name": "epc_breakdown_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "n_units_to_retrofit": {
+          "name": "n_units_to_retrofit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_pre_retrofit": {
+          "name": "co2_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_post_retrofit": {
+          "name": "co2_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_pre_retrofit": {
+          "name": "energy_bill_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_post_retrofit": {
+          "name": "energy_bill_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_pre_retrofit": {
+          "name": "energy_consumption_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_post_retrofit": {
+          "name": "energy_consumption_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_improvement_per_unit": {
+          "name": "valuation_improvement_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_unit": {
+          "name": "cost_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_co2_saved": {
+          "name": "cost_per_co2_saved",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_sap_point": {
+          "name": "cost_per_sap_point",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_return_on_investment": {
+          "name": "valuation_return_on_investment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {}
+    },
+    "portfolioUsers": {
+      "name": "portfolioUsers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "role",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "portfolioUsers_user_id_user_id_fk": {
+          "name": "portfolioUsers_user_id_user_id_fk",
+          "tableFrom": "portfolioUsers",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "portfolioUsers_portfolio_id_portfolio_id_fk": {
+          "name": "portfolioUsers_portfolio_id_portfolio_id_fk",
+          "tableFrom": "portfolioUsers",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "non_intrusive_survey": {
+      "name": "non_intrusive_survey",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "survey_date": {
+          "name": "survey_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor": {
+          "name": "surveyor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {}
+    },
+    "non_intrusive_survey_notes": {
+      "name": "non_intrusive_survey_notes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "survey_id": {
+          "name": "survey_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "note": {
+          "name": "note",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "non_intrusive_survey_notes_survey_id_non_intrusive_survey_id_fk": {
+          "name": "non_intrusive_survey_notes_survey_id_non_intrusive_survey_id_fk",
+          "tableFrom": "non_intrusive_survey_notes",
+          "tableTo": "non_intrusive_survey",
+          "columnsFrom": [
+            "survey_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "property": {
+      "name": "property",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "creation_status": {
+          "name": "creation_status",
+          "type": "creation_status",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "building_reference_number": {
+          "name": "building_reference_number",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "status",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "address": {
+          "name": "address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_pre_condition_report": {
+          "name": "has_pre_condition_report",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_recommendations": {
+          "name": "has_recommendations",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "property_type": {
+          "name": "property_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "built_form": {
+          "name": "built_form",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "local_authority": {
+          "name": "local_authority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency": {
+          "name": "constituency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_rooms": {
+          "name": "number_of_rooms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "year_built": {
+          "name": "year_built",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tenure": {
+          "name": "tenure",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_epc_rating": {
+          "name": "current_epc_rating",
+          "type": "epc",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_sap_points": {
+          "name": "current_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_valuation": {
+          "name": "current_valuation",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "property_portfolio_id_portfolio_id_fk": {
+          "name": "property_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "property_details_epc": {
+      "name": "property_details_epc",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "full_address": {
+          "name": "full_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_floor_area": {
+          "name": "total_floor_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "walls": {
+          "name": "walls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "walls_rating": {
+          "name": "walls_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof": {
+          "name": "roof",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_rating": {
+          "name": "roof_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor": {
+          "name": "floor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_rating": {
+          "name": "floor_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows": {
+          "name": "windows",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_rating": {
+          "name": "windows_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating": {
+          "name": "heating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_rating": {
+          "name": "heating_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_controls": {
+          "name": "heating_controls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_controls_rating": {
+          "name": "heating_controls_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water": {
+          "name": "hot_water",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water_rating": {
+          "name": "hot_water_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting": {
+          "name": "lighting",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting_rating": {
+          "name": "lighting_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mainfuel": {
+          "name": "mainfuel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation": {
+          "name": "ventilation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "solar_pv": {
+          "name": "solar_pv",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "solar_hot_water": {
+          "name": "solar_hot_water",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wind_turbine": {
+          "name": "wind_turbine",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_height": {
+          "name": "floor_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_heated_rooms": {
+          "name": "number_heated_rooms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_loss_corridor": {
+          "name": "heat_loss_corridor",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "unheated_corridor_length": {
+          "name": "unheated_corridor_length",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_open_fireplaces": {
+          "name": "number_of_open_fireplaces",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_extensions": {
+          "name": "number_of_extensions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_storeys": {
+          "name": "number_of_storeys",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mains_gas": {
+          "name": "mains_gas",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_tariff": {
+          "name": "energy_tariff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "primary_energy_consumption": {
+          "name": "primary_energy_consumption",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_emissions": {
+          "name": "co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_demand": {
+          "name": "current_energy_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_demand_heating_hotwater": {
+          "name": "current_energy_demand_heating_hotwater",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "estimated": {
+          "name": "estimated",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "heating_cost_current": {
+          "name": "heating_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water_cost_current": {
+          "name": "hot_water_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting_cost_current": {
+          "name": "lighting_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "appliances_cost_current": {
+          "name": "appliances_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gas_standing_charge": {
+          "name": "gas_standing_charge",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "electricity_standing_charge": {
+          "name": "electricity_standing_charge",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "property_details_epc_property_id_property_id_fk": {
+          "name": "property_details_epc_property_id_property_id_fk",
+          "tableFrom": "property_details_epc",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "property_details_epc_portfolio_id_portfolio_id_fk": {
+          "name": "property_details_epc_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_details_epc",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "property_details_meter": {
+      "name": "property_details_meter",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_supplier": {
+          "name": "energy_supplier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gas_supplier": {
+          "name": "gas_supplier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_total": {
+          "name": "meter_reading_total",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_electricity": {
+          "name": "meter_reading_electricity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_gas": {
+          "name": "meter_reading_gas",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {}
+    },
+    "property_details_spatial": {
+      "name": "property_details_spatial",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "x_coordinate": {
+          "name": "x_coordinate",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "y_coordinate": {
+          "name": "y_coordinate",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "latitude": {
+          "name": "latitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "longitude": {
+          "name": "longitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "conservation_status": {
+          "name": "conservation_status",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_listed_building": {
+          "name": "is_listed_building",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_heritage_building": {
+          "name": "is_heritage_building",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {}
+    },
+    "property_targets": {
+      "name": "property_targets",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "epc": {
+          "name": "epc",
+          "type": "epc",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_demand": {
+          "name": "heat_demand",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "property_targets_property_id_property_id_fk": {
+          "name": "property_targets_property_id_property_id_fk",
+          "tableFrom": "property_targets",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "property_targets_portfolio_id_portfolio_id_fk": {
+          "name": "property_targets_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_targets",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "plan": {
+      "name": "plan",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scenario_id": {
+          "name": "scenario_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "valuation_increase_lower_bound": {
+          "name": "valuation_increase_lower_bound",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_increase_upper_bound": {
+          "name": "valuation_increase_upper_bound",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_increase_average": {
+          "name": "valuation_increase_average",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "plan_portfolio_id_portfolio_id_fk": {
+          "name": "plan_portfolio_id_portfolio_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_property_id_property_id_fk": {
+          "name": "plan_property_id_property_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_scenario_id_scenario_id_fk": {
+          "name": "plan_scenario_id_scenario_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "scenario",
+          "columnsFrom": [
+            "scenario_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "plan_recommendations": {
+      "name": "plan_recommendations",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan_id": {
+          "name": "plan_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "recommendation_id": {
+          "name": "recommendation_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "plan_recommendations_plan_id_plan_id_fk": {
+          "name": "plan_recommendations_plan_id_plan_id_fk",
+          "tableFrom": "plan_recommendations",
+          "tableTo": "plan",
+          "columnsFrom": [
+            "plan_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_recommendations_recommendation_id_recommendation_id_fk": {
+          "name": "plan_recommendations_recommendation_id_recommendation_id_fk",
+          "tableFrom": "plan_recommendations",
+          "tableTo": "recommendation",
+          "columnsFrom": [
+            "recommendation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "recommendation": {
+      "name": "recommendation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_type": {
+          "name": "measure_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "estimated_cost": {
+          "name": "estimated_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "default": {
+          "name": "default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "starting_u_value": {
+          "name": "starting_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "new_u_value": {
+          "name": "new_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sap_points": {
+          "name": "sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_demand": {
+          "name": "heat_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "kwh_savings": {
+          "name": "kwh_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rental_yield_increase": {
+          "name": "rental_yield_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "already_installed": {
+          "name": "already_installed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "recommendation_property_id_property_id_fk": {
+          "name": "recommendation_property_id_property_id_fk",
+          "tableFrom": "recommendation",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "recommendation_materials": {
+      "name": "recommendation_materials",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "recommendation_id": {
+          "name": "recommendation_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "material_id": {
+          "name": "material_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "depth": {
+          "name": "depth",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quantity_unit": {
+          "name": "quantity_unit",
+          "type": "unit_quantity",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "estimated_cost": {
+          "name": "estimated_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "recommendation_materials_recommendation_id_recommendation_id_fk": {
+          "name": "recommendation_materials_recommendation_id_recommendation_id_fk",
+          "tableFrom": "recommendation_materials",
+          "tableTo": "recommendation",
+          "columnsFrom": [
+            "recommendation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "recommendation_materials_material_id_material_id_fk": {
+          "name": "recommendation_materials_material_id_material_id_fk",
+          "tableFrom": "recommendation_materials",
+          "tableTo": "material",
+          "columnsFrom": [
+            "material_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "scenario": {
+      "name": "scenario",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "budget": {
+          "name": "budget",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "housing_type": {
+          "name": "housing_type",
+          "type": "housing_type",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal": {
+          "name": "goal",
+          "type": "goal",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal_value": {
+          "name": "goal_value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_file_path": {
+          "name": "trigger_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "already_installed_file_path": {
+          "name": "already_installed_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "patches_file_path": {
+          "name": "patches_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "non_invasive_recommendations_file_path": {
+          "name": "non_invasive_recommendations_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "exclusions": {
+          "name": "exclusions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "multi_plan": {
+          "name": "multi_plan",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_pre_retrofit": {
+          "name": "epc_breakdown_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_post_retrofit": {
+          "name": "epc_breakdown_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_properties": {
+          "name": "number_of_properties",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "n_units_to_retrofit": {
+          "name": "n_units_to_retrofit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_pre_retrofit": {
+          "name": "co2_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_post_retrofit": {
+          "name": "co2_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_pre_retrofit": {
+          "name": "energy_bill_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_post_retrofit": {
+          "name": "energy_bill_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_pre_retrofit": {
+          "name": "energy_consumption_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_post_retrofit": {
+          "name": "energy_consumption_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_improvement_per_unit": {
+          "name": "valuation_improvement_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_unit": {
+          "name": "cost_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_co2_saved": {
+          "name": "cost_per_co2_saved",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_sap_point": {
+          "name": "cost_per_sap_point",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_return_on_investment": {
+          "name": "valuation_return_on_investment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "scenario_portfolio_id_portfolio_id_fk": {
+          "name": "scenario_portfolio_id_portfolio_id_fk",
+          "tableFrom": "scenario",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "solar": {
+      "name": "solar",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "longitude": {
+          "name": "longitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "latitude": {
+          "name": "latitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "google_api_response": {
+          "name": "google_api_response",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {}
+    },
+    "solar_scenario": {
+      "name": "solar_scenario",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "solar_id": {
+          "name": "solar_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scenario_type": {
+          "name": "scenario_type",
+          "type": "scenario_type",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_panels": {
+          "name": "number_panels",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "array_kwhp": {
+          "name": "array_kwhp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lifetime_dc_kwh": {
+          "name": "lifetime_dc_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "yearly_dc_kwh": {
+          "name": "yearly_dc_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lifetime_ac_kwh": {
+          "name": "lifetime_ac_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "yearly_ac_kwh": {
+          "name": "yearly_ac_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expected_payback_years": {
+          "name": "expected_payback_years",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "panelled_roof_area": {
+          "name": "panelled_roof_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "solar_scenario_solar_id_solar_id_fk": {
+          "name": "solar_scenario_solar_id_solar_id_fk",
+          "tableFrom": "solar_scenario",
+          "tableTo": "solar",
+          "columnsFrom": [
+            "solar_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {}
+    },
+    "user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "firstName": {
+          "name": "firstName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "oauth_id": {
+          "name": "oauth_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "oauth_provider": {
+          "name": "oauth_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {}
+    }
+  },
+  "enums": {
+    "document_type": {
+      "name": "document_type",
+      "values": {
+        "EPR": "EPR",
+        "Condition Report": "Condition Report",
+        "Evidence Report": "Evidence Report",
+        "Summary Information": "Summary Information",
+        "Floor Plan": "Floor Plan",
+        "Scenario Draft EPC": "Scenario Draft EPC",
+        "Scenario Site Notes": "Scenario Site Notes"
+      }
+    },
+    "cost_unit": {
+      "name": "cost_unit",
+      "values": {
+        "gbp_sq_meter": "gbp_sq_meter",
+        "gbp_per_unit": "gbp_per_unit",
+        "gbp_per_m2": "gbp_per_m2",
+        "gbp_per_m": "gbp_per_m"
+      }
+    },
+    "depth_unit": {
+      "name": "depth_unit",
+      "values": {
+        "mm": "mm"
+      }
+    },
+    "type": {
+      "name": "type",
+      "values": {
+        "suspended_floor_insulation": "suspended_floor_insulation",
+        "solid_floor_insulation": "solid_floor_insulation",
+        "external_wall_insulation": "external_wall_insulation",
+        "internal_wall_insulation": "internal_wall_insulation",
+        "cavity_wall_insulation": "cavity_wall_insulation",
+        "mechanical_ventilation": "mechanical_ventilation",
+        "loft_insulation": "loft_insulation",
+        "exposed_floor_insulation": "exposed_floor_insulation",
+        "flat_roof_insulation": "flat_roof_insulation",
+        "room_roof_insulation": "room_roof_insulation",
+        "cavity_wall_extraction": "cavity_wall_extraction",
+        "iwi_wall_demolition": "iwi_wall_demolition",
+        "iwi_vapour_barrier": "iwi_vapour_barrier",
+        "iwi_redecoration": "iwi_redecoration",
+        "suspended_floor_demolition": "suspended_floor_demolition",
+        "suspended_floor_redecoration": "suspended_floor_redecoration",
+        "suspended_floor_vapour_barrier": "suspended_floor_vapour_barrier",
+        "solid_floor_demolition": "solid_floor_demolition",
+        "solid_floor_preparation": "solid_floor_preparation",
+        "solid_floor_vapour_barrier": "solid_floor_vapour_barrier",
+        "solid_floor_redecoration": "solid_floor_redecoration",
+        "ewi_wall_demolition": "ewi_wall_demolition",
+        "ewi_wall_preparation": "ewi_wall_preparation",
+        "ewi_wall_redecoration": "ewi_wall_redecoration",
+        "low_energy_lighting_installation": "low_energy_lighting_installation",
+        "flat_roof_preparation": "flat_roof_preparation",
+        "flat_roof_vapour_barrier": "flat_roof_vapour_barrier",
+        "flat_roof_waterproofing": "flat_roof_waterproofing",
+        "windows_glazing": "windows_glazing"
+      }
+    },
+    "r_value_unit": {
+      "name": "r_value_unit",
+      "values": {
+        "square_meter_kelvin_per_watt": "square_meter_kelvin_per_watt"
+      }
+    },
+    "thermal_conductivity_unit": {
+      "name": "thermal_conductivity_unit",
+      "values": {
+        "watt_per_meter_kelvin": "watt_per_meter_kelvin"
+      }
+    },
+    "goal": {
+      "name": "goal",
+      "values": {
+        "Valuation Improvement": "Valuation Improvement",
+        "Increasing EPC": "Increasing EPC",
+        "Reducing CO2 emissions": "Reducing CO2 emissions",
+        "Energy Savings": "Energy Savings",
+        "None": "None"
+      }
+    },
+    "role": {
+      "name": "role",
+      "values": {
+        "creator": "creator",
+        "admin": "admin",
+        "read": "read",
+        "write": "write"
+      }
+    },
+    "status": {
+      "name": "status",
+      "values": {
+        "scoping": "scoping",
+        "survey": "survey",
+        "assessment": "assessment",
+        "tendering": "tendering",
+        "project underway": "project underway",
+        "completion; status: on track": "completion; status: on track",
+        "completion; status: delayed": "completion; status: delayed",
+        "completion; status: at risk": "completion; status: at risk",
+        "completion; status: completed": "completion; status: completed",
+        "needs review": "needs review"
+      }
+    },
+    "epc": {
+      "name": "epc",
+      "values": {
+        "A": "A",
+        "B": "B",
+        "C": "C",
+        "D": "D",
+        "E": "E",
+        "F": "F",
+        "G": "G"
+      }
+    },
+    "creation_status": {
+      "name": "creation_status",
+      "values": {
+        "LOADING": "LOADING",
+        "READY": "READY",
+        "ERROR": "ERROR"
+      }
+    },
+    "housing_type": {
+      "name": "housing_type",
+      "values": {
+        "Private": "Private",
+        "Social": "Social"
+      }
+    },
+    "unit_quantity": {
+      "name": "unit_quantity",
+      "values": {
+        "m2": "m2",
+        "part": "part"
+      }
+    },
+    "scenario_type": {
+      "name": "scenario_type",
+      "values": {
+        "unit": "unit",
+        "building": "building"
+      }
+    }
+  },
+  "schemas": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}
\ No newline at end of file
diff --git a/src/app/db/migrations/meta/_journal.json b/src/app/db/migrations/meta/_journal.json
index 51f5753d..3195bd05 100644
--- a/src/app/db/migrations/meta/_journal.json
+++ b/src/app/db/migrations/meta/_journal.json
@@ -701,6 +701,13 @@
       "when": 1742138715788,
       "tag": "0099_faulty_nicolaos",
       "breakpoints": true
+    },
+    {
+      "idx": 100,
+      "version": "5",
+      "when": 1749810028140,
+      "tag": "0100_wakeful_doctor_doom",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/app/db/schema/recommendations.ts b/src/app/db/schema/recommendations.ts
index 9e88c4b7..0f861afa 100644
--- a/src/app/db/schema/recommendations.ts
+++ b/src/app/db/schema/recommendations.ts
@@ -13,7 +13,6 @@ import {
 } from "drizzle-orm/pg-core";
 import { Material, material } from "./materials";
 import { InferModel } from "drizzle-orm";
-import { ar } from "drizzle-orm/column.d-b7dc3bdb";
 
 export const recommendation = pgTable("recommendation", {
   id: bigserial("id", { mode: "bigint" }).primaryKey(),
@@ -108,6 +107,7 @@ export const scenario = pgTable("scenario", {
   createdAt: timestamp("created_at").notNull().defaultNow(),
   housingType: housingTypeEnum("housing_type").notNull(),
   goal: goalEnum("goal").notNull(),
+  goalValue: text("goal_value"),
   triggerFilePath: text("trigger_file_path"),
   alreadyInstalledFilePath: text("already_installed_file_path"),
   patchesFilePath: text("patches_file_path"),
diff --git a/src/app/portfolio/[slug]/(portfolio)/layout.tsx b/src/app/portfolio/[slug]/(portfolio)/layout.tsx
index 430a1006..23477005 100644
--- a/src/app/portfolio/[slug]/(portfolio)/layout.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/layout.tsx
@@ -1,5 +1,5 @@
 import { Toolbar } from "@/app/components/portfolio/Toolbar";
-import { getPortfolio } from "../utils";
+import { getPortfolio, getPortfolioScenarios } from "../utils";
 
 export default async function PortfolioLayout({
   children, // will be a page or nested layout
@@ -10,6 +10,8 @@ export default async function PortfolioLayout({
 }) {
   const portfolioId = params.slug;
   const { name: portfolioName } = await getPortfolio(portfolioId);
+  // We retrieve the scenarios associated with the portfolio
+  const scenarios = await getPortfolioScenarios(portfolioId);
 
   return (
     <section>
@@ -21,7 +23,7 @@ export default async function PortfolioLayout({
       <div className="flex justify-center">
         <div className="grid grid-cols-8 w-full max-w-8xl">
           <div className="col-span-12 justify-center bg-gray-50 py-2">
-            <Toolbar portfolioId={portfolioId} />
+            <Toolbar portfolioId={portfolioId} scenarios={scenarios} />
           </div>
         </div>
       </div>
diff --git a/src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx b/src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx
index 8b119d9d..01586f42 100644
--- a/src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx
+++ b/src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx
@@ -20,6 +20,9 @@ import {
   FormDescription,
 } from "@/app/shadcn_components/ui/form";
 import { useToast } from "@/app/hooks/use-toast";
+import { ScenarioSelect } from "@/app/db/schema/recommendations";
+import { useState } from "react";
+import { SelectScenarioDropdown } from "./SelectScenarioDropdown";
 
 type Option = {
   label: string;
@@ -175,7 +178,7 @@ export function SelectDropdown({
     <Menu as="div" className="relative inline-block text-left w-full">
       <Float>
         <Menu.Button className="inline-flex justify-center w-1/2 px-4 py-2 text-sm font-medium text-white bg-brandblue rounded-md focus:outline-none focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-opacity-75">
-          {selectedOption || "Select an option"}
+          {selectedOption || "Select option"}
           <ChevronDownIcon
             className="ml-2 -mr-1 h-5 w-5 text-violet-200 hover:text-violet-100"
             aria-hidden="true"
@@ -227,7 +230,7 @@ export function SelectUpDropdown({
     <Menu as="div" className="relative inline-block text-left w-full">
       <Float placement="right-end" offset={4} shift>
         <Menu.Button className={menuButtonStyle(width)}>
-          {selectedOption || "Select an option"}
+          {selectedOption || "Select option"}
           <ChevronRightIcon
             className="ml-2 -mr-1 h-5 w-5 text-violet-200 hover:text-violet-100"
             aria-hidden="true"
@@ -520,14 +523,32 @@ function useCreateRemoteAssessment({
 }
 
 export default function RemoteAssessmentModal({
-  portfolioId,
   isOpen,
   setIsOpen,
+  portfolioId,
+  scenarios,
 }: {
   isOpen: boolean;
-  setIsOpen: (isOpen: boolean) => void;
+  setIsOpen: (open: boolean) => void;
   portfolioId: string;
+  scenarios: ScenarioSelect[];
 }) {
+  const NEW_SENTINEL = "__new__";
+  const [selectedScenario, setSelectedScenario] = useState<string | null>(null);
+  const { toast } = useToast();
+
+  const scenarioOptions: Option[] = useMemo(
+    () => [
+      { label: "Create new scenario…", value: NEW_SENTINEL, disabled: false },
+      ...scenarios.map((s) => ({
+        label: s.name,
+        value: s.name,
+        disabled: false,
+      })),
+    ],
+    [scenarios]
+  );
+
   const form = useForm<FormValues>({
     resolver: zodResolver(formSchema),
     defaultValues: {
@@ -539,45 +560,62 @@ export default function RemoteAssessmentModal({
       postcode: "",
       uprn: 0,
       valuation: 0,
+      propertyType: null,
+      builtForm: null,
     },
   });
+  const { reset, setValue } = form;
 
-  // const [toastState, setToastState] = useState<any>([]);
-  const { toast } = useToast();
+  const {
+    handleSubmit: triggerAssessment,
+    presignedUrlIsLoading,
+    presignedUrlIsError,
+  } = useCreateRemoteAssessment({
+    portfolioId,
+    uprn: form.watch("uprn"),
+    addressLineOne: form.watch("addressLineOne"),
+    postcode: form.watch("postcode"),
+    valuation: form.watch("valuation"),
+    propertyType: form.watch("propertyType"),
+    builtForm: form.watch("builtForm"),
+  });
 
-  const onSubmit = async (data: FormValues) => {
-    try {
-      await handleSubmit(data);
-      form.reset();
-      setIsOpen(false);
-      toast({
-        title: "The Remote Assesment has been sent",
-        description: "",
+  const onSelectScenario = (opt: Option) => {
+    setSelectedScenario(opt.value);
+    if (opt.value === NEW_SENTINEL) {
+      reset({
+        ...form.getValues(),
+        scenario: "",
+        housingType: "",
+        goal: "",
+        goalValue: "",
       });
-    } catch (error) {
-      console.error("Error submitting form:", error);
+    } else {
+      const picked = scenarios.find((s) => s.name === opt.value);
+      if (!picked) return;
+      setValue("scenario", picked.name);
+      setValue("housingType", picked.housingType);
+      setValue("goal", picked.goal);
+      setValue("goalValue", picked.goalValue);
     }
   };
 
-  const { handleSubmit, presignedUrlIsLoading, presignedUrlIsError } =
-    useCreateRemoteAssessment({
-      portfolioId,
-      uprn: form.watch("uprn"),
-      addressLineOne: form.watch("addressLineOne"),
-      postcode: form.watch("postcode"),
-      valuation: form.watch("valuation"),
-      propertyType: form.watch("propertyType"),
-      builtForm: form.watch("builtForm"),
-    });
+  const onSubmit = form.handleSubmit(async (data) => {
+    console.log("Triggered");
+    await triggerAssessment(data);
+    form.reset();
+    setIsOpen(false);
+    toast({ title: "Remote assessment sent" });
+  });
 
   return (
-    <>
-      <Transition appear show={isOpen} as={Fragment}>
-        <Dialog
-          as="div"
-          className="relative z-10"
-          onClose={() => setIsOpen(false)}
-        >
+    <Transition show={isOpen} as={Fragment}>
+      <Dialog
+        as="div"
+        className="fixed inset-0 z-10 overflow-y-auto"
+        onClose={() => setIsOpen(false)}
+      >
+        <div className="min-h-screen px-4 text-center">
           <Transition.Child
             as={Fragment}
             enter="ease-out duration-300"
@@ -587,32 +625,51 @@ export default function RemoteAssessmentModal({
             leaveFrom="opacity-100"
             leaveTo="opacity-0"
           >
-            <div className="fixed inset-0 bg-black bg-opacity-25" />
+            <Dialog.Overlay className="fixed inset-0 bg-black bg-opacity-25" />
           </Transition.Child>
 
-          <div className="fixed inset-0 overflow-y-auto">
-            <div className="flex min-h-full items-center justify-center p-4 text-center">
-              <Transition.Child
-                as={Fragment}
-                enter="ease-out duration-300"
-                enterFrom="opacity-0 scale-95"
-                enterTo="opacity-100 scale-100"
-                leave="ease-in duration-200"
-                leaveFrom="opacity-100 scale-100"
-                leaveTo="opacity-0 scale-95"
-              >
-                <Dialog.Panel className="w-1/2 max-w-screen-md transform overflow-hidden rounded-2xl bg-white p-6 text-left align-middle shadow-xl transition-all">
-                  <Dialog.Title
-                    as="h3"
-                    className="text-lg font-medium leading-6 text-gray-900"
-                  >
-                    Remote Assessment Details
-                  </Dialog.Title>
-                  <FormProvider {...form}>
-                    <form
-                      onSubmit={form.handleSubmit(onSubmit)}
-                      className="space-y-6"
-                    >
+          {/* Spacer for centering */}
+          <span
+            className="inline-block h-screen align-middle"
+            aria-hidden="true"
+          >
+            &#8203;
+          </span>
+
+          <Transition.Child
+            as={Fragment}
+            enter="ease-out duration-300"
+            enterFrom="opacity-0 scale-95"
+            enterTo="opacity-100 scale-100"
+            leave="ease-in duration-200"
+            leaveFrom="opacity-100 scale-100"
+            leaveTo="opacity-0 scale-95"
+          >
+            <div className="inline-block w-full max-w-2xl p-6 my-8 overflow-hidden text-left align-middle transition-all transform bg-white shadow-xl rounded-2xl">
+              <Dialog.Title className="text-lg font-medium">
+                Remote Assessment Details
+              </Dialog.Title>
+
+              <FormProvider {...form}>
+                <form onSubmit={onSubmit} className="space-y-6 mt-4">
+                  {/* Scenario selector */}
+                  <FormItem>
+                    <FormLabel>Select scenario</FormLabel>
+                    <FormControl>
+                      <SelectScenarioDropdown
+                        scenarios={scenarios.map((s) => ({
+                          label: s.name,
+                          value: s.name,
+                        }))}
+                        selectedValue={selectedScenario}
+                        onSelect={onSelectScenario}
+                      />
+                    </FormControl>
+                  </FormItem>
+
+                  {selectedScenario !== null && (
+                    <>
+                      {/* 2) Scenario Name */}
                       <FormField
                         control={form.control}
                         name="scenario"
@@ -622,6 +679,7 @@ export default function RemoteAssessmentModal({
                             <FormControl>
                               <Input
                                 placeholder="Enter scenario name"
+                                disabled={selectedScenario !== NEW_SENTINEL}
                                 {...field}
                               />
                             </FormControl>
@@ -630,6 +688,7 @@ export default function RemoteAssessmentModal({
                         )}
                       />
 
+                      {/* 3) Housing Type */}
                       <FormField
                         control={form.control}
                         name="housingType"
@@ -637,19 +696,24 @@ export default function RemoteAssessmentModal({
                           <FormItem>
                             <FormLabel>Housing Type</FormLabel>
                             <FormControl>
-                              <SelectDropdown
-                                options={selecthousingTypeOptions}
-                                selectedOption={field.value}
-                                onSelectOption={(option) =>
-                                  field.onChange(option.value)
-                                }
-                              />
+                              {selectedScenario === NEW_SENTINEL ? (
+                                <SelectDropdown
+                                  options={selecthousingTypeOptions}
+                                  selectedOption={field.value}
+                                  onSelectOption={(o) =>
+                                    field.onChange(o.value)
+                                  }
+                                />
+                              ) : (
+                                <Input value={field.value} disabled />
+                              )}
                             </FormControl>
                             <FormMessage />
                           </FormItem>
                         )}
                       />
 
+                      {/* 4) Goal */}
                       <FormField
                         control={form.control}
                         name="goal"
@@ -657,19 +721,24 @@ export default function RemoteAssessmentModal({
                           <FormItem>
                             <FormLabel>Goal</FormLabel>
                             <FormControl>
-                              <SelectDropdown
-                                options={selectGoalOptions}
-                                selectedOption={field.value}
-                                onSelectOption={(option) =>
-                                  field.onChange(option.value)
-                                }
-                              />
+                              {selectedScenario === NEW_SENTINEL ? (
+                                <SelectDropdown
+                                  options={selectGoalOptions}
+                                  selectedOption={field.value}
+                                  onSelectOption={(o) =>
+                                    field.onChange(o.value)
+                                  }
+                                />
+                              ) : (
+                                <Input value={field.value} disabled />
+                              )}
                             </FormControl>
                             <FormMessage />
                           </FormItem>
                         )}
                       />
 
+                      {/* 5) Goal Value */}
                       <FormField
                         control={form.control}
                         name="goalValue"
@@ -677,181 +746,173 @@ export default function RemoteAssessmentModal({
                           <FormItem>
                             <FormLabel>Goal Value</FormLabel>
                             <FormControl>
-                              <SelectDropdown
-                                options={goalValueOptions}
+                              {selectedScenario === NEW_SENTINEL ? (
+                                <SelectDropdown
+                                  options={goalValueOptions}
+                                  selectedOption={field.value}
+                                  onSelectOption={(o) =>
+                                    field.onChange(o.value)
+                                  }
+                                />
+                              ) : (
+                                <Input value={field.value} disabled />
+                              )}
+                            </FormControl>
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+                    </>
+                  )}
+
+                  <FormField
+                    control={form.control}
+                    name="addressLineOne"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Address</FormLabel>
+                        <FormControl>
+                          <Input placeholder="Enter address" {...field} />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name="postcode"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Postcode</FormLabel>
+                        <FormControl>
+                          <Input placeholder="Enter postcode" {...field} />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name="uprn"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>UPRN</FormLabel>
+                        <FormControl>
+                          <Input
+                            type="number"
+                            placeholder="Enter UPRN"
+                            {...field}
+                            onChange={(e) =>
+                              field.onChange(Number(e.target.value))
+                            }
+                          />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name="valuation"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Valuation</FormLabel>
+                        <FormDescription>
+                          The valuation can be found at{" "}
+                          <a
+                            href={`https://www.zoopla.co.uk/property/uprn/${form.watch(
+                              "uprn"
+                            )}/`}
+                            target="_blank"
+                            rel="noreferrer"
+                          >
+                            zoopla property page
+                          </a>
+                        </FormDescription>
+                        <FormControl>
+                          <Input
+                            type="number"
+                            placeholder="Enter valuation"
+                            {...field}
+                            onChange={(e) =>
+                              field.onChange(Number(e.target.value))
+                            }
+                          />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  <div className="flex flex-col gap-2">
+                    <p className="text-sm text-gray-600">
+                      <strong>Optional:</strong> Property Type and Built Form
+                      are only required if no EPC is available.
+                    </p>
+                    <div className="flex gap-4">
+                      <FormField
+                        control={form.control}
+                        name="propertyType"
+                        render={({ field }) => (
+                          <FormItem className="w-full">
+                            <FormLabel>Property Type</FormLabel>
+                            <FormControl>
+                              <SelectUpDropdown
+                                options={propertyTypeOptions}
                                 selectedOption={field.value}
-                                onSelectOption={(option) =>
-                                  field.onChange(option.value)
-                                }
+                                onSelectOption={(o) => field.onChange(o.value)}
                               />
                             </FormControl>
                             <FormMessage />
                           </FormItem>
                         )}
                       />
-
                       <FormField
                         control={form.control}
-                        name="addressLineOne"
+                        name="builtForm"
                         render={({ field }) => (
-                          <FormItem>
-                            <FormLabel>Address</FormLabel>
+                          <FormItem className="w-full">
+                            <FormLabel>Built Form</FormLabel>
                             <FormControl>
-                              <Input placeholder="Enter address" {...field} />
-                            </FormControl>
-                            <FormMessage />
-                          </FormItem>
-                        )}
-                      />
-
-                      <FormField
-                        control={form.control}
-                        name="postcode"
-                        render={({ field }) => (
-                          <FormItem>
-                            <FormLabel>Postcode</FormLabel>
-                            <FormControl>
-                              <Input placeholder="Enter postcode" {...field} />
-                            </FormControl>
-                            <FormMessage />
-                          </FormItem>
-                        )}
-                      />
-
-                      <FormField
-                        control={form.control}
-                        name="uprn"
-                        render={({ field }) => (
-                          <FormItem>
-                            <FormLabel>UPRN</FormLabel>
-                            <FormControl>
-                              <Input
-                                type="number"
-                                placeholder="Enter UPRN"
-                                {...field}
-                                onChange={(e) =>
-                                  field.onChange(Number(e.target.value))
-                                }
+                              <SelectUpDropdown
+                                options={builtFormOptions}
+                                selectedOption={field.value}
+                                onSelectOption={(o) => field.onChange(o.value)}
                               />
                             </FormControl>
                             <FormMessage />
                           </FormItem>
                         )}
                       />
+                    </div>
+                  </div>
 
-                      <FormField
-                        control={form.control}
-                        name="valuation"
-                        render={({ field }) => (
-                          <FormItem>
-                            <FormLabel>Valuation </FormLabel>
-                            <FormDescription>
-                              The valuation can be found at{" "}
-                              <a
-                                href={`https://www.zoopla.co.uk/property/uprn/${form.watch(
-                                  "uprn"
-                                )}/`}
-                                target="_blank"
-                              >
-                                `https://www.zoopla.co.uk/property/uprn/
-                                {form.watch("uprn")}/`
-                              </a>
-                            </FormDescription>
-                            <FormControl>
-                              <Input
-                                type="number"
-                                placeholder="Enter valuation"
-                                {...field}
-                                onChange={(e) =>
-                                  field.onChange(Number(e.target.value))
-                                }
-                              />
-                            </FormControl>
-                            <FormMessage />
-                          </FormItem>
-                        )}
-                      />
+                  <div className="flex justify-end gap-4">
+                    <Button
+                      type="button"
+                      variant="outline"
+                      onClick={() => setIsOpen(false)}
+                    >
+                      Cancel
+                    </Button>
+                    <Button type="submit" disabled={presignedUrlIsLoading}>
+                      {presignedUrlIsLoading ? "Submitting…" : "Submit"}
+                    </Button>
+                  </div>
 
-                      <div className="flex flex-col gap-2">
-                        <p className="text-sm text-gray-600">
-                          <strong>Optional:</strong> Property Type and Built
-                          Form are only required if no EPC is available.
-                        </p>
-                        <div className="flex flex-row gap-4">
-                          <div className="w-full">
-                            <FormField
-                              control={form.control}
-                              name="propertyType"
-                              render={({ field }) => (
-                                <FormItem>
-                                  <FormLabel>Property Type</FormLabel>
-                                  <FormControl>
-                                    <SelectUpDropdown
-                                      options={propertyTypeOptions}
-                                      selectedOption={field.value}
-                                      onSelectOption={(option) =>
-                                        field.onChange(option.value)
-                                      }
-                                    />
-                                  </FormControl>
-                                  <FormMessage />
-                                </FormItem>
-                              )}
-                            />
-                          </div>
-
-                          <div className="w-full">
-                            <FormField
-                              control={form.control}
-                              name="builtForm"
-                              render={({ field }) => (
-                                <FormItem>
-                                  <FormLabel>Built Form</FormLabel>
-                                  <FormControl>
-                                    <SelectUpDropdown
-                                      options={builtFormOptions}
-                                      selectedOption={field.value}
-                                      onSelectOption={(option) =>
-                                        field.onChange(option.value)
-                                      }
-                                    />
-                                  </FormControl>
-                                  <FormMessage />
-                                </FormItem>
-                              )}
-                            />
-                          </div>
-                        </div>
-                      </div>
-
-                      <div className="flex justify-end gap-4 mt-6">
-                        <Button
-                          type="button"
-                          variant="outline"
-                          onClick={() => {
-                            setIsOpen(false);
-                          }}
-                        >
-                          Cancel
-                        </Button>
-                        <Button type="submit" disabled={presignedUrlIsLoading}>
-                          {presignedUrlIsLoading ? "Submitting..." : "Submit"}
-                        </Button>
-                      </div>
-                      {presignedUrlIsError && (
-                        <p className="text-red-500 mt-2">
-                          Error uploading files
-                        </p>
-                      )}
-                    </form>
-                  </FormProvider>
-                </Dialog.Panel>
-              </Transition.Child>
+                  {presignedUrlIsError && (
+                    <p className="text-red-500">Error uploading files</p>
+                  )}
+                </form>
+              </FormProvider>
             </div>
-          </div>
-        </Dialog>
-      </Transition>
-    </>
+          </Transition.Child>
+        </div>
+      </Dialog>
+    </Transition>
   );
 }
 function setIsOpen(arg0: boolean) {
diff --git a/src/app/portfolio/[slug]/components/SelectScenarioDropdown.tsx b/src/app/portfolio/[slug]/components/SelectScenarioDropdown.tsx
new file mode 100644
index 00000000..ba01904a
--- /dev/null
+++ b/src/app/portfolio/[slug]/components/SelectScenarioDropdown.tsx
@@ -0,0 +1,80 @@
+import { Menu, Transition } from "@headlessui/react";
+import { Fragment } from "react";
+import { Button } from "@/app/shadcn_components/ui/button";
+import { PlusIcon, ChevronDownIcon } from "@heroicons/react/20/solid";
+
+export type ScenarioOption = {
+  label: string;
+  value: string;
+};
+
+interface ScenarioSelectProps {
+  selectedValue: string | null;
+  onSelect: (option: ScenarioOption) => void;
+  scenarios: ScenarioOption[];
+}
+
+export function SelectScenarioDropdown({
+  selectedValue,
+  onSelect,
+  scenarios,
+}: ScenarioSelectProps) {
+  const createOption: ScenarioOption = {
+    label: "Create new scenario…",
+    value: "__new__",
+  };
+  const options = [createOption, ...scenarios];
+
+  const selectedLabel =
+    options.find((o) => o.value === selectedValue)?.label ||
+    "Select or create...";
+
+  return (
+    <Menu as="div" className="relative w-full text-left">
+      <Menu.Button
+        as={Button}
+        variant="default"
+        className="w-full justify-between bg-brandmidblue text-white"
+      >
+        <span>{selectedLabel}</span>
+        <ChevronDownIcon className="ml-2 h-5 w-5" aria-hidden="true" />
+      </Menu.Button>
+
+      <Transition
+        as={Fragment}
+        enter="transition ease-out duration-150"
+        enterFrom="opacity-0 scale-95"
+        enterTo="opacity-100 scale-100"
+        leave="transition ease-in duration-100"
+        leaveFrom="opacity-100 scale-100"
+        leaveTo="opacity-0 scale-95"
+      >
+        <Menu.Items className="absolute mt-2 w-full bg-white border border-gray-200 rounded-lg shadow-lg z-10">
+          {options.map((opt) => (
+            <Menu.Item key={opt.value}>
+              {({ active }) => (
+                <Button
+                  variant="ghost"
+                  className={`w-full flex items-center text-left px-4 py-2 ${
+                    active ? "bg-brandmidblue text-white" : "text-gray-700"
+                  }`}
+                  onClick={() => onSelect(opt)}
+                >
+                  {opt.value === createOption.value && (
+                    <PlusIcon
+                      className={`mr-2 h-5 w-5 ${
+                        active ? "text-white" : "text-brandmidblue"
+                      }`}
+                      aria-hidden="true"
+                    />
+                  )}
+                  {opt.label}
+                </Button>
+              )}
+            </Menu.Item>
+          ))}
+        </Menu.Items>
+      </Transition>
+    </Menu>
+  );
+}
diff --git a/src/app/portfolio/[slug]/utils.ts b/src/app/portfolio/[slug]/utils.ts
index c40c70a8..40a4e4b9 100644
--- a/src/app/portfolio/[slug]/utils.ts
+++ b/src/app/portfolio/[slug]/utils.ts
@@ -68,6 +68,18 @@ export async function getPortfolio(portfolioId: string): Promise<Portfolio> {
   return data[0];
 }
 
+export async function getPortfolioScenarios(
+  portfolioId: string
+): Promise<ScenarioSelect[]> {
+  // This function will grab all scenarios from the database for a given portfolio
+  const scenarios = await db
+    .select()
+    .from(scenario)
+    .where(eq(scenario.portfolioId, BigInt(portfolioId)));
+
+  return scenarios;
+}
+
 export async function getPortfolioPerformance(
   portfolioId: string
 ): Promise<ScenarioSelect[]> {