diff --git a/asset_list/AssetList.py b/asset_list/AssetList.py
index 0156a2a3..76f2b145 100644
--- a/asset_list/AssetList.py
+++ b/asset_list/AssetList.py
@@ -951,7 +951,7 @@ class AssetList:
             ######################################################
             # 1) Has been flagged on the non-intrusives as being a cavity wall, empty or partially filled
             # 2) The age is before 1995
-            # TODO: 3) Remove anything that likley has access issues
+            # 3) We don't remove anything that haas access issues yet
             self.standardised_asset_list["non_intrusive_indicates_empty_cavity"] = (
                 (~self.standardised_asset_list[self.STANDARD_PROPERTY_TYPE].isin(["bedsit"])) &
                 (self.standardised_asset_list['non-intrusives: Construction'] == "CAVITY") &
@@ -976,6 +976,19 @@ class AssetList:
                         self.EPC_API_DATA_NAMES["current-energy-efficiency"]] <= self.EMPTY_CAVITY_SAP_THRESHOLD
                 )
             )
+
+            z0 = self.standardised_asset_list[
+                self.standardised_asset_list["epc_indicates_empty_cavity"] & (
+                    ~self.standardised_asset_list["non_intrusive_indicates_empty_cavity"]
+                )
+                ]
+            z0['non-intrusives: Construction'].value_counts()
+            z0['non-intrusives: Insulated'].value_counts()
+            z00 = z0[z0['non-intrusives: Insulated'] == "EWI"]
+
+            # If the EPC is estimated, perhaps we should defer to the non-intrusives?
+            z00[""]
+
             ######################################################
             # Extraction
             ######################################################
@@ -990,14 +1003,26 @@ class AssetList:
                 )
             )
 
-            z = self.standardised_asset_list[
-                self.standardised_asset_list["non-intrusives: CIGA Check Required"] == "YES"
-                ]
-            z["non-intrusives: Insulated"].value_counts()
-            z["non-intrusives: Material"].value_counts()
-            z[self.ATTRIBUTE_SAP_THRESHOLD_AND_BELOW].value_counts()
-            z[self.EPC_API_DATA_NAMES["current-energy-efficiency"]].max()
-            zz = z[z[self.EPC_API_DATA_NAMES["current-energy-efficiency"]] == 105]
+            # z3 = self.standardised_asset_list[
+            #     self.standardised_asset_list["non_intrusive_indicates_cavity_extraction"]
+            # ]
+            # z3['non-intrusives: Material'].value_counts()
+            # self.standardised_asset_list['non-intrusives: Material'].value_counts()
+            #
+            # z = self.standardised_asset_list[
+            #     self.standardised_asset_list["non-intrusives: CIGA Check Required"] == "YES"
+            #     ]
+            # z["non-intrusives: Insulated"].value_counts()
+            # z["non-intrusives: Material"].value_counts()
+            # z[self.ATTRIBUTE_SAP_THRESHOLD_AND_BELOW].value_counts()
+            # z[self.EPC_API_DATA_NAMES["current-energy-efficiency"]].max()
+            # z[self.EPC_API_DATA_NAMES["current-energy-efficiency"]].min()
+            # z[self.STANDARD_YEAR_BUILT].describe()
+            #
+            # zz = z[z[self.EPC_API_DATA_NAMES["current-energy-efficiency"]] == 105]
+            # z2 = self.standardised_asset_list[
+            #     self.standardised_asset_list["non-intrusives: CIGA Check Required"] == "NO"
+            #     ]
 
             ######################################################
             # Solar
@@ -1159,6 +1184,10 @@ class AssetList:
                         .lower().str.contains("solid")
                     ) & (
                         ~self.standardised_asset_list["epc_has_floor_recommendation"]
+                    ) & (
+                        # We do not utilise estimated EPCs for this method because we will always find that
+                        # "epc_has_floor_recommendation" is False
+                        ~self.standardised_asset_list["estimated"]
                     )
                 ) | (
                     (
@@ -1180,6 +1209,10 @@ class AssetList:
                         .lower().str.contains("suspended")
                     ) & (
                         ~self.standardised_asset_list["epc_has_floor_recommendation"]
+                    ) & (
+                        # We do not utilise estimated EPCs for this method because we will always find that
+                        # "epc_has_floor_recommendation" is False
+                        ~self.standardised_asset_list["estimated"]
                     )
                 ) | (
                     (