diff --git a/src/app/db/migrations/0019_certain_pepper_potts.sql b/src/app/db/migrations/0019_certain_pepper_potts.sql
new file mode 100644
index 00000000..a5901da1
--- /dev/null
+++ b/src/app/db/migrations/0019_certain_pepper_potts.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "property" ALTER COLUMN "uprn" SET DATA TYPE bigint;--> statement-breakpoint
+ALTER TABLE "property" ALTER COLUMN "building_reference_number" SET DATA TYPE bigint;--> statement-breakpoint
+ALTER TABLE "property_details_meter" ALTER COLUMN "uprn" SET DATA TYPE bigint;--> statement-breakpoint
+ALTER TABLE "property_details_meter" ALTER COLUMN "uprn" DROP NOT NULL;
\ No newline at end of file
diff --git a/src/app/db/migrations/meta/0019_snapshot.json b/src/app/db/migrations/meta/0019_snapshot.json
new file mode 100644
index 00000000..5e98fdd2
--- /dev/null
+++ b/src/app/db/migrations/meta/0019_snapshot.json
@@ -0,0 +1,830 @@
+{
+  "version": "5",
+  "dialect": "pg",
+  "id": "2501e06e-b010-4eab-8b98-fea030e533e3",
+  "prevId": "35b1337c-37e3-4e94-8c5e-075d64ee4d41",
+  "tables": {
+    "portfolio": {
+      "name": "portfolio",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "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
+        },
+        "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": {}
+    },
+    "portfolioUsers": {
+      "name": "portfolioUsers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "integer",
+          "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": {}
+    },
+    "property": {
+      "name": "property",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "integer",
+          "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
+        }
+      },
+      "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": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "integer",
+          "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_contols": {
+          "name": "heating_contols",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_contols_rating": {
+          "name": "heating_contols_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
+        }
+      },
+      "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": "serial",
+          "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_targets": {
+      "name": "property_targets",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "integer",
+          "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": {}
+    },
+    "user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "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": {
+    "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",
+        "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"
+      }
+    }
+  },
+  "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 a2da952f..f084ec68 100644
--- a/src/app/db/migrations/meta/_journal.json
+++ b/src/app/db/migrations/meta/_journal.json
@@ -134,6 +134,13 @@
       "when": 1690899900262,
       "tag": "0018_majestic_thaddeus_ross",
       "breakpoints": true
+    },
+    {
+      "idx": 19,
+      "version": "5",
+      "when": 1690901194560,
+      "tag": "0019_certain_pepper_potts",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/app/db/schema/property.ts b/src/app/db/schema/property.ts
index 9663d501..3a2476a9 100644
--- a/src/app/db/schema/property.ts
+++ b/src/app/db/schema/property.ts
@@ -1,5 +1,6 @@
 import {
   serial,
+  bigserial,
   text,
   timestamp,
   pgTable,
@@ -8,6 +9,7 @@ import {
   integer,
   boolean,
   smallint,
+  bigint,
 } from "drizzle-orm/pg-core";
 import { portfolio, PortfolioStatus } from "./portfolio";
 import { InferModel, relations } from "drizzle-orm";
@@ -82,8 +84,10 @@ export const property = pgTable("property", {
     .notNull()
     .references(() => portfolio.id),
   creationStatus: propertyCreationStatusEnum("creation_status").notNull(),
-  uprn: integer("uprn"),
-  buildingReferenceNumber: integer("building_reference_number"),
+  uprn: bigint("uprn", { mode: "bigint" }),
+  buildingReferenceNumber: bigint("building_reference_number", {
+    mode: "bigint",
+  }),
   status: propertyStatusEnum("status"),
   address: text("address"),
   postcode: text("postcode"),
@@ -158,7 +162,7 @@ export const propertyDetailsEpc = pgTable("property_details_epc", {
 
 export const propertyDetailsMeter = pgTable("property_details_meter", {
   id: serial("id").primaryKey(),
-  uprn: integer("uprn").notNull(),
+  uprn: bigint("uprn", { mode: "bigint" }),
   energySupplier: text("energy_supplier"),
   gasSupplier: text("gas_supplier"),
   meterReadingTotal: real("meter_reading_total"),