diff --git a/model_data/EpcClean.py b/model_data/EpcClean.py
index adec9978..9d3c4d74 100644
--- a/model_data/EpcClean.py
+++ b/model_data/EpcClean.py
@@ -49,6 +49,9 @@ class EpcClean:
         else:
             self.lighting_averages = lighting_averages
 
+    def insert_extra_data(self):
+        pass
+
     def _calculate_lighting_averages(self):
 
         """
diff --git a/model_data/app.py b/model_data/app.py
index 97f05531..0e75ee34 100644
--- a/model_data/app.py
+++ b/model_data/app.py
@@ -79,6 +79,9 @@ def app():
     # with open("sample_addresses.pkl", "wb") as f:
     #     pickle.dump(address_meta, f)
 
+    # Begin by setting up an empty cleaner
+    cleaner = EpcClean([])
+
     epc_directories = [entry for entry in EPC_DIRECTORY.iterdir() if entry.is_dir()]
     for directory in tqdm(epc_directories):
         data = pd.read_csv(directory / "certificates.csv", low_memory=False)
diff --git a/model_data/epc_attributes/HotWaterAttributes.py b/model_data/epc_attributes/HotWaterAttributes.py
index b117a9c5..b2fd3856 100644
--- a/model_data/epc_attributes/HotWaterAttributes.py
+++ b/model_data/epc_attributes/HotWaterAttributes.py
@@ -96,7 +96,8 @@ class HotWaterAttributes(Definitions):
     WELSH_TEXT = {
         "ogçör brif system": "from main system",
         "ogçör brif system, adfer gwres nwyon ffliw": "from main system, flue gas heat recovery",
-        "bwyler/cylchredydd nwy": "gas boiler/circulator"
+        "bwyler/cylchredydd nwy": "gas boiler/circulator",
+        "ogçör brif system, dim thermostat ar y silindr": "from main system, no cylinder thermostat"
     }
 
     def __init__(self, description: str):
diff --git a/model_data/epc_attributes/MainheatAttributes.py b/model_data/epc_attributes/MainheatAttributes.py
index 1cebc257..9ea51dea 100644
--- a/model_data/epc_attributes/MainheatAttributes.py
+++ b/model_data/epc_attributes/MainheatAttributes.py
@@ -12,7 +12,8 @@ class MainHeatAttributes(Definitions):
         # "Micro-cogeneration", also known as micro combined heat and power (micro-CHP), is a technology that
         # generates heat and electricity simultaneously from the same energy source in residential or commercial
         # buildings. The main output of micro-CHP systems is heat, with electricity generation as a secondary output.
-        "micro-cogeneration"
+        "micro-cogeneration",
+        "solar assisted heat pump",
     ]
     FUEL_TYPES = ["electric", "mains gas", "wood logs", "LPG", "coal", "oil", "wood pellets", "anthracite",
                   "dual fuel mineral and wood", "smokeless fuel", "lpg"]
diff --git a/model_data/epc_attributes/WindowAttributes.py b/model_data/epc_attributes/WindowAttributes.py
index 4fc20b03..bce2b6e3 100644
--- a/model_data/epc_attributes/WindowAttributes.py
+++ b/model_data/epc_attributes/WindowAttributes.py
@@ -19,7 +19,8 @@ class WindowAttributes(Definitions):
 
     WELSH_TEXT = {
         "gwydrau dwbl llawn": "full double glazing",
-        "gwydrau dwbl rhannol": "partial double glazing"
+        "gwydrau dwbl rhannol": "partial double glazing",
+        "gwydrau dwbl gan mwyaf": "Mostly double glazing",
     }
 
     def __init__(self, description: str):
diff --git a/model_data/tests/test_data/test_hot_water_attributes_cases.py b/model_data/tests/test_data/test_hot_water_attributes_cases.py
index 405bc339..8e0ede98 100644
--- a/model_data/tests/test_data/test_hot_water_attributes_cases.py
+++ b/model_data/tests/test_data/test_hot_water_attributes_cases.py
@@ -137,5 +137,9 @@ hotwater_cases = [
     {'original_description': 'Solid fuel range cooker', 'heater_type': 'solid fuel range cooker', 'system_type': None,
      'thermostat_characteristics': None, 'heating_scope': None, 'energy_recovery': None, 'tariff_type': None,
      'extra_features': None, 'chp_systems': None, 'distribution_system': 'circulator', 'no_system_present': None,
-     'assumed': False, "appliance": None}
+     'assumed': False, "appliance": None},
+    {'original_description': 'OGÇÖr brif system, dim thermostat ar y silindr', 'heater_type': None,
+     'system_type': 'from main system', 'thermostat_characteristics': 'no cylinder thermostat', 'heating_scope': None,
+     'energy_recovery': None, 'tariff_type': None, 'extra_features': None, 'chp_systems': None,
+     'distribution_system': None, 'no_system_present': None, 'assumed': False, "appliance": None},
 ]
diff --git a/model_data/tests/test_data/test_mainheat_attributes_cases.py b/model_data/tests/test_data/test_mainheat_attributes_cases.py
index 83835ee0..b623c4d5 100644
--- a/model_data/tests/test_data/test_mainheat_attributes_cases.py
+++ b/model_data/tests/test_data/test_mainheat_attributes_cases.py
@@ -1103,5 +1103,20 @@ mainheat_cases = [
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
      'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False,
      "has_electric_heat_pumps": False,
+     "has_micro-cogeneration": False},
+    {'original_description': 'Solar assisted heat pump, underfloor, electric', 'has_radiators': False,
+     'has_fan_coil_units': False,
+     'has_solar_assissted_heat_pump': True,
+     'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
+     'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
+     'has_room_heaters': False, 'has_electric_storage_heaters': False, 'has_warm_air': False,
+     'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False, 'has_community_scheme': False,
+     'has_ground_source_heat_pump': False, 'has_no_system_present': False, 'has_portable_electric_heaters': False,
+     'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': True, 'has_wood_logs': False,
+     'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
+     'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': True,
+     "has_electric_heat_pumps": False,
      "has_micro-cogeneration": False}
+
 ]
diff --git a/model_data/tests/test_data/test_window_attributes_cases.py b/model_data/tests/test_data/test_window_attributes_cases.py
index a4c6ba64..127402c2 100644
--- a/model_data/tests/test_data/test_window_attributes_cases.py
+++ b/model_data/tests/test_data/test_window_attributes_cases.py
@@ -40,4 +40,6 @@ windows_cases = [
      'glazing_type': 'double', 'no_data': False},
     {'original_description': 'Gwydrau dwbl rhannol', 'has_glazing': True, 'glazing_coverage': 'partial',
      'glazing_type': 'double', 'no_data': False},
+    {'original_description': 'Gwydrau dwbl gan mwyaf', 'has_glazing': True, 'glazing_coverage': 'most',
+     'glazing_type': 'double', 'no_data': False}
 ]