From 73adb9347ac81773fa22fc07fcf6cb596d0f2497 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Wed, 22 Feb 2023 08:33:06 +0000
Subject: [PATCH] Update log fixtures

---
 .../imports/sales_logs_import_service.rb      | 154 +++---
 .../00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml  | 417 +++++++++++++----
 .../0b4a68df-30cc-474a-93c0-a56ce8fdad3b.xml  | 409 ++++++++++++----
 .../0ead17cb-1668-442d-898c-0d52879ff592.xml  | 439 +++++++++++++-----
 .../166fc004-392e-47a8-acb8-1c018734882b.xml  | 411 ++++++++++++----
 .../5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml  | 410 ++++++++++++----
 .../893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml  | 407 ++++++++++++----
 7 files changed, 1972 insertions(+), 675 deletions(-)

diff --git a/app/services/imports/sales_logs_import_service.rb b/app/services/imports/sales_logs_import_service.rb
index d5e31fab9..e4281d1c1 100644
--- a/app/services/imports/sales_logs_import_service.rb
+++ b/app/services/imports/sales_logs_import_service.rb
@@ -25,72 +25,71 @@ module Imports
 
       attributes["saledate"] = compose_date(xml_doc, "DAY", "MONTH", "YEAR")
       attributes["owning_organisation_id"] = find_organisation_id(xml_doc, "OWNINGORGID")
-      attributes["type"] = unsafe_string_as_integer(xml_doc, "DERSALETYPE")
+      attributes["type"] = unsafe_string_as_integer(xml_doc, "DerSaleType")
       attributes["old_id"] = meta_field_value(xml_doc, "document-id")
       attributes["created_at"] = Time.zone.parse(meta_field_value(xml_doc, "created-date"))
       attributes["updated_at"] = Time.zone.parse(meta_field_value(xml_doc, "modified-date"))
-      attributes["purchid"] = string_or_nil(xml_doc, "PURCHASERCODE")
-      attributes["ownershipsch"] = unsafe_string_as_integer(xml_doc, "OWNERSHIP")
-      attributes["othtype"] = string_or_nil(xml_doc, "Q38OTHERSALE")
-      attributes["jointmore"] = unsafe_string_as_integer(xml_doc, "JOINTMORE")
-      attributes["jointpur"] = unsafe_string_as_integer(xml_doc, "JOINT")
-      attributes["beds"] = safe_string_as_integer(xml_doc, "Q11BEDROOMS")
-      attributes["companybuy"] = unsafe_string_as_integer(xml_doc, "COMPANY")
+      attributes["purchid"] = string_or_nil(xml_doc, "PurchaserCode")
+      attributes["ownershipsch"] = unsafe_string_as_integer(xml_doc, "Ownership")
+      attributes["othtype"] = string_or_nil(xml_doc, "Q38OtherSale")
+      attributes["jointmore"] = unsafe_string_as_integer(xml_doc, "JointMore")
+      attributes["jointpur"] = unsafe_string_as_integer(xml_doc, "joint")
+      attributes["beds"] = safe_string_as_integer(xml_doc, "Q11Bedrooms")
+      attributes["companybuy"] = unsafe_string_as_integer(xml_doc, "company") if attributes["ownershipsch"] == 3
       attributes["hhmemb"] = safe_string_as_integer(xml_doc, "HHMEMB")
       (1..6).each do |index|
-        attributes["age#{index}"] = safe_string_as_integer(xml_doc, "P#{index}AGE")
+        attributes["age#{index}"] = safe_string_as_integer(xml_doc, "P#{index}Age")
         attributes["sex#{index}"] = sex(xml_doc, index)
-        attributes["ecstat#{index}"] = unsafe_string_as_integer(xml_doc, "P#{index}ECO")
+        attributes["ecstat#{index}"] = unsafe_string_as_integer(xml_doc, "P#{index}Eco")
         attributes["age#{index}_known"] = age_known(xml_doc, index, attributes["hhmemb"], attributes["age#{index}"])
       end
       (2..6).each do |index|
         attributes["relat#{index}"] = relat(xml_doc, index)
         attributes["details_known_#{index}"] = details_known(index, attributes)
       end
-
-      attributes["national"] = unsafe_string_as_integer(xml_doc, "P1NAT")
+      attributes["national"] = unsafe_string_as_integer(xml_doc, "P1Nat")
       attributes["othernational"] = nil
-      attributes["ethnic"] = unsafe_string_as_integer(xml_doc, "P1ETH")
-      attributes["ethnic_group"] = ethnic_group(attributes["ethnic"]) # check numbers
-      attributes["buy1livein"] = unsafe_string_as_integer(xml_doc, "LIVEINBUYER1")
-      attributes["buylivein"] = unsafe_string_as_integer(xml_doc, "LIVEINBUYER")
-      attributes["builtype"] = unsafe_string_as_integer(xml_doc, "Q13BUILDINGTYPE")
-      attributes["proptype"] = unsafe_string_as_integer(xml_doc, "Q12PROPERTYTYPE")
-      attributes["noint"] = safe_string_as_integer(xml_doc, "NOINT")
-      attributes["buy2livein"] = unsafe_string_as_integer(xml_doc, "LIVEINBUYER2")
-      attributes["privacynotice"] = 1 if string_or_nil(xml_doc, "QDP") == "Yes"
-      attributes["wheel"] = unsafe_string_as_integer(xml_doc, "Q10WHEELCHAIR")
-      attributes["hholdcount"] = safe_string_as_integer(xml_doc, "LIVEINOTHER")
-      attributes["la"] = string_or_nil(xml_doc, "Q14ONSLACODE")
-      attributes["income1"] = safe_string_as_integer(xml_doc, "Q2PERSON1INCOME") # should this be decimal?
-      attributes["income1nk"] = 0 if attributes["income1"].present? # known if given? there's P1IncKnown in the form should use that instead?
-      attributes["inc1mort"] = unsafe_string_as_integer(xml_doc, "Q2PERSON1MORTGAGE")
-      attributes["income2"] = safe_string_as_integer(xml_doc, "Q2PERSON2INCOME") # should this be decimal?
-      attributes["income2nk"] = 0 if attributes["income2"].present? # known if given?
-      attributes["savings"] = safe_string_as_integer(xml_doc, "Q3SAVINGS")
-      attributes["savingsnk"] = savings_known(xml_doc) # 0 -> known, 1 - not known from the sales xml form, does this actually exist?
-      attributes["prevown"] = unsafe_string_as_integer(xml_doc, "Q4PREVOWNEDPROPERTY")
+      attributes["ethnic"] = unsafe_string_as_integer(xml_doc, "P1Eth")
+      attributes["ethnic_group"] = ethnic_group(attributes["ethnic"])
+      attributes["buy1livein"] = unsafe_string_as_integer(xml_doc, "LiveInBuyer1")
+      attributes["buylivein"] = unsafe_string_as_integer(xml_doc, "LiveInBuyer") if attributes["ownershipsch"] == 3
+      attributes["builtype"] = unsafe_string_as_integer(xml_doc, "Q13BuildingType")
+      attributes["proptype"] = unsafe_string_as_integer(xml_doc, "Q12PropertyType")
+      attributes["privacynotice"] = 1 if string_or_nil(xml_doc, "Qdp") == "Yes"
+      attributes["noint"] = safe_string_as_integer(xml_doc, "NOINT") || 2 if attributes["privacynotice"] == 1
+      attributes["buy2livein"] = unsafe_string_as_integer(xml_doc, "LiveInBuyer2")
+      attributes["wheel"] = unsafe_string_as_integer(xml_doc, "Q10Wheelchair")
+      attributes["hholdcount"] = safe_string_as_integer(xml_doc, "LiveInOther") || 0
+      attributes["la"] = string_or_nil(xml_doc, "Q14ONSLACode")
+      attributes["income1"] = safe_string_as_integer(xml_doc, "Q2Person1Income")
+      attributes["income1nk"] = income_known(unsafe_string_as_integer(xml_doc, "P1IncKnown")) 
+      attributes["inc1mort"] = unsafe_string_as_integer(xml_doc, "Q2Person1Mortgage")
+      attributes["income2"] = safe_string_as_integer(xml_doc, "Q2Person2Income")
+      attributes["income2nk"] = income_known(unsafe_string_as_integer(xml_doc, "P2IncKnown"))
+      attributes["savings"] = safe_string_as_integer(xml_doc, "Q3Savings")
+      attributes["savingsnk"] = savings_known(xml_doc)
+      attributes["prevown"] = unsafe_string_as_integer(xml_doc, "Q4PrevOwnedProperty")
       attributes["mortgage"] = safe_string_as_decimal(xml_doc, "CALCMORT")
-      attributes["inc2mort"] = unsafe_string_as_integer(xml_doc, "Q2PERSON2MORTAPPLICATION")
-      attributes["hb"] = unsafe_string_as_integer(xml_doc, "Q2A")
-      attributes["frombeds"] = safe_string_as_integer(xml_doc, "Q20BEDROOMS")
-      attributes["staircase"] = unsafe_string_as_integer(xml_doc, "Q17ASTAIRCASE")
-      attributes["stairbought"] = safe_string_as_integer(xml_doc, "PERCENTBOUGHT")
-      attributes["stairowned"] = safe_string_as_integer(xml_doc, "PERCENTOWNS")
-      attributes["mrent"] = safe_string_as_decimal(xml_doc, "Q28MONTHLYRENT")
+      attributes["inc2mort"] = unsafe_string_as_integer(xml_doc, "Q2Person2MortApplication")
+      attributes["hb"] = unsafe_string_as_integer(xml_doc, "Q2a")
+      attributes["frombeds"] = safe_string_as_integer(xml_doc, "Q20Bedrooms")
+      attributes["staircase"] = unsafe_string_as_integer(xml_doc, "Q17aStaircase")
+      attributes["stairbought"] = safe_string_as_integer(xml_doc, "PercentBought")
+      attributes["stairowned"] = safe_string_as_integer(xml_doc, "PercentOwns") if attributes["staircase"] == 1
+      attributes["mrent"] = safe_string_as_decimal(xml_doc, "Q28MonthlyRent")
       attributes["exdate"] = compose_date(xml_doc, "EXDAY", "EXMONTH", "EXYEAR")
       attributes["exday"] = safe_string_as_integer(xml_doc, "EXDAY")
       attributes["exmonth"] = safe_string_as_integer(xml_doc, "EXMONTH")
       attributes["exyear"] = safe_string_as_integer(xml_doc, "EXYEAR")
-      attributes["resale"] = unsafe_string_as_integer(xml_doc, "Q17RESALE")
-      attributes["deposit"] = safe_string_as_decimal(xml_doc, "Q26CASHDEPOSIT")
-      attributes["cashdis"] = safe_string_as_decimal(xml_doc, "Q27SOCIALHOMEBUY")
-      attributes["disabled"] = unsafe_string_as_integer(xml_doc, "DISABILITY")
-      attributes["lanomagr"] = unsafe_string_as_integer(xml_doc, "Q19REHOUSED")
-      attributes["value"] = safe_string_as_decimal(xml_doc, "Q22PURCHASEPRICE")
-      attributes["equity"] = safe_string_as_decimal(xml_doc, "Q23EQUITY")
-      attributes["discount"] = safe_string_as_decimal(xml_doc, "Q33DISCOUNT")
-      attributes["grant"] = safe_string_as_decimal(xml_doc, "Q32REDUCTIONS")
+      attributes["resale"] = unsafe_string_as_integer(xml_doc, "Q17Resale")
+      attributes["deposit"] = safe_string_as_decimal(xml_doc, "Q26CashDeposit")
+      attributes["cashdis"] = safe_string_as_decimal(xml_doc, "Q27SocialHomeBuy")
+      attributes["disabled"] = unsafe_string_as_integer(xml_doc, "Disability")
+      attributes["lanomagr"] = unsafe_string_as_integer(xml_doc, "Q19Rehoused")
+      attributes["value"] = safe_string_as_decimal(xml_doc, "Q22PurchasePrice")
+      attributes["equity"] = safe_string_as_decimal(xml_doc, "Q23Equity")
+      attributes["discount"] = safe_string_as_decimal(xml_doc, "Q33Discount")
+      attributes["grant"] = safe_string_as_decimal(xml_doc, "Q32Reductions")
       attributes["pregyrha"] = 1 if string_or_nil(xml_doc, "PREGYRHA") == "Yes"
       attributes["pregla"] = 1 if string_or_nil(xml_doc, "PREGLA") == "Yes"
       attributes["pregghb"] = 1 if string_or_nil(xml_doc, "PREGHBA") == "Yes"
@@ -102,33 +101,32 @@ module Imports
       attributes["ppostc1"] = string_or_nil(xml_doc, "PPOSTC1")
       attributes["ppostc2"] = string_or_nil(xml_doc, "PPOSTC2")
       attributes["previous_la_known"] = nil
-      attributes["hhregres"] = unsafe_string_as_integer(xml_doc, "ARMEDF")
+      attributes["hhregres"] = unsafe_string_as_integer(xml_doc, "ArmedF")
       attributes["hhregresstill"] = still_serving(xml_doc)
-      attributes["proplen"] = safe_string_as_integer(xml_doc, "Q30A")
-      attributes["mscharge"] = safe_string_as_decimal(xml_doc, "Q29MONTHLYCHARGES")
+      attributes["proplen"] = safe_string_as_integer(xml_doc, "Q16aProplen2")
+      attributes["mscharge"] = safe_string_as_decimal(xml_doc, "Q29MonthlyCharges")
       attributes["mscharge_known"] = 1 if attributes["mscharge"].present?
-      attributes["prevten"] = unsafe_string_as_integer(xml_doc, "Q6PREVTENURE")
+      attributes["prevten"] = unsafe_string_as_integer(xml_doc, "Q6PrevTenure")
       attributes["mortgageused"] = unsafe_string_as_integer(xml_doc, "MORTGAGEUSED")
-      attributes["wchair"] = unsafe_string_as_integer(xml_doc, "Q15WHEELCHAIR")
+      attributes["wchair"] = unsafe_string_as_integer(xml_doc, "Q15Wheelchair")
       attributes["armedforcesspouse"] = unsafe_string_as_integer(xml_doc, "ARMEDFORCESSPOUSE")
       attributes["hodate"] = compose_date(xml_doc, "HODAY", "HOMONTH", "HOYEAR")
       attributes["hoday"] = safe_string_as_integer(xml_doc, "HODAY")
       attributes["homonth"] = safe_string_as_integer(xml_doc, "HOMONTH")
       attributes["hoyear"] = safe_string_as_integer(xml_doc, "HOYEAR")
-      attributes["fromprop"] = unsafe_string_as_integer(xml_doc, "Q21PROPERTYTYPE")
-      attributes["socprevten"] = nil # ?
+      attributes["fromprop"] = unsafe_string_as_integer(xml_doc, "Q21PropertyType")
+      attributes["socprevten"] = unsafe_string_as_integer(xml_doc, "PrevRentType")
       attributes["mortgagelender"] = mortgage_lender(xml_doc, attributes)
       attributes["mortgagelenderother"] = nil # Q24AMORTGAGELENDEROTHER Q34AMORTGAGELENDEROTHER Q41AMORTGAGELENDEROTHER
       attributes["mortlen"] = mortgage_length(xml_doc, attributes)
-      attributes["extrabor"] = unsafe_string_as_integer(xml_doc, "Q25BORROWING")
+      attributes["extrabor"] = unsafe_string_as_integer(xml_doc, "Q25Borrowing")
       attributes["totadult"] = safe_string_as_integer(xml_doc, "TOTADULT") # would get overridden
       attributes["totchild"] = safe_string_as_integer(xml_doc, "TOTCHILD") # would get overridden
       attributes["hhtype"] = unsafe_string_as_integer(xml_doc, "HHTYPE")
       attributes["pcode1"] = string_or_nil(xml_doc, "PCODE1")
       attributes["pcode2"] = string_or_nil(xml_doc, "PCODE2")
       attributes["postcode_full"] = compose_postcode(xml_doc, "PCODE1", "PCODE2")
-      attributes["pcodenk"] = postcode_known(attributes)
-      # attributes["is_la_inferred"] = nil
+      attributes["pcodenk"] = 0 if attributes["postcode_full"].present? # known if given
       attributes["bulk_upload_id"] = nil
       attributes["saledate_check"] = nil
       attributes["ethnic_group2"] = nil
@@ -138,9 +136,9 @@ module Imports
       attributes["soctenant"] = soctenant(attributes)
 
       # Required for our form invalidated questions (not present in import)
-      attributes["previous_la_known"] = attributes["prevloc"].nil? ? 0 : 1
-      attributes["is_la_inferred"] = attributes["postcode_full"].present?
-      attributes["la_known"] = attributes["la"].nil? ? 0 : 1
+      attributes["previous_la_known"] = 1 if attributes["prevloc"].present? && !attributes["ppostcode_full"].present?
+      # attributes["is_la_inferred"] = attributes["postcode_full"].present?
+      attributes["la_known"] = 1 if attributes["la"].present? && !attributes["postcode_full"].present?
 
       # Sets the log creator
       owner_id = meta_field_value(xml_doc, "owner-user-id").strip
@@ -300,7 +298,7 @@ module Imports
     end
 
     def previous_postcode_known(xml_doc, previous_postcode, prevloc)
-      previous_postcode_known = string_or_nil(xml_doc, "Q7UNKNOWNPOSTCODE")
+      previous_postcode_known = string_or_nil(xml_doc, "Q7UnknownPostcode")
       if previous_postcode_known == "If postcode not known tick" || (previous_postcode.nil? && prevloc.present?)
         1
       elsif previous_postcode.nil?
@@ -310,13 +308,8 @@ module Imports
       end
     end
 
-    def postcode_known(attributes)
-      return 0 if attributes["postcode_full"].present? # known if given
-      return 1 if attributes["la"].present? # unknown if la is given
-    end
-
     def sex(xml_doc, index)
-      sex = string_or_nil(xml_doc, "P#{index}SEX")
+      sex = string_or_nil(xml_doc, "P#{index}Sex")
       case sex
       when "Male"
         "M"
@@ -330,7 +323,7 @@ module Imports
     end
 
     def relat(xml_doc, index)
-      relat = string_or_nil(xml_doc, "P#{index}REL")
+      relat = string_or_nil(xml_doc, "P#{index}Rel")
       case relat
       when "Child"
         "C"
@@ -366,22 +359,22 @@ module Imports
     def mortgage_lender(xml_doc, attributes)
       case attributes["ownershipsch"]
       when 1
-        unsafe_string_as_integer(xml_doc, "Q24AMORTGAGELENDER")
+        unsafe_string_as_integer(xml_doc, "Q24aMortgageLender")
       when 2
-        unsafe_string_as_integer(xml_doc, "Q34AMORTGAGELENDER")
+        unsafe_string_as_integer(xml_doc, "Q34aMortgageLender")
       when 3
-        unsafe_string_as_integer(xml_doc, "Q41AMORTGAGELENDER")
+        unsafe_string_as_integer(xml_doc, "Q41aMortgageLender")
       end
     end
 
     def mortgage_length(xml_doc, attributes)
       case attributes["ownershipsch"]
       when 1
-        unsafe_string_as_integer(xml_doc, "Q24B")
+        unsafe_string_as_integer(xml_doc, "Q24b")
       when 2
-        unsafe_string_as_integer(xml_doc, "Q34B")
+        unsafe_string_as_integer(xml_doc, "Q34b")
       when 3
-        unsafe_string_as_integer(xml_doc, "Q41B")
+        unsafe_string_as_integer(xml_doc, "Q41b")
       end
     end
 
@@ -406,12 +399,21 @@ module Imports
     end
 
     def still_serving(xml_doc)
-      case unsafe_string_as_integer(xml_doc, "LEFTARMEDF")
+      case unsafe_string_as_integer(xml_doc, "LeftArmedF")
       when 4
         4
       when 5, 6
         5
       end
     end
+
+    def income_known(value)
+      case value
+      when 1 #known
+        0
+      when 2 #unknown
+        1
+      end
+    end
   end
 end
diff --git a/spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml b/spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml
index 24c8b7b01..c48e01234 100644
--- a/spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml
+++ b/spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml
@@ -1,116 +1,331 @@
-<Group xmlns="http://data.gov.uk/core/logs/2022-CORE-SR-GN" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Group xmlns="http://data.gov.uk/core/logs/2022-CORE-Sales" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <meta:metadata xmlns:es="http://www.ecmascript.org/" xmlns:xqx="http://www.w3.org/2005/XQueryX" xmlns:XSLT="http://www.w3.org/1999/XSL/Transform/compile">
-    <!-- check metadata fields /-->
-    <meta:form-name>2022-COREN</meta:form-name>
+    <meta:form-name>2022-CORE-Sales</meta:form-name>
     <meta:document-id>00d2343e-d5fa-4c89-8400-ec3854b0f2b4</meta:document-id>
     <meta:owner-user-id>c3061a2e6ea0b702e6f6210d5c52d2a92612d2aa</meta:owner-user-id>
     <meta:owner-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:owner-institution-id>
     <meta:managing-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:managing-institution-id>
-    <meta:created-date>2022-04-14T16:01:30.369241Z</meta:created-date>
-    <meta:modified-date>2022-04-14T16:01:30.369241Z</meta:modified-date>
+    <meta:created-date>2023-02-21T12:09:45.809134Z</meta:created-date>
+    <meta:modified-date>2023-02-21T12:09:45.809134Z</meta:modified-date>
     <meta:status>submitted-valid</meta:status>
     <meta:reporting-year>2022</meta:reporting-year>
     <meta:upload-method>Manual Entry</meta:upload-method>
     <meta:schema assert-valid="true"/>
     <meta:rules assert-valid="true"/>
   </meta:metadata>
-    <Group>
-    <OWNINGORGID>1</OWNINGORGID>
+  <Group>
+    <Qdp>Yes</Qdp>
+    <CompletionDate>2023-01-16</CompletionDate>
+    <PurchaserCode>Outright ownership example</PurchaserCode>
+    <Ownership>3 No - this is an outright or other sale</Ownership>
+    <Q16SaleType/>
+    <Q30SaleType/>
+    <Q38SaleType>10 Outright</Q38SaleType>
+    <Q38OtherSale/>
+    <company>2 No</company>
+    <LiveInBuyer>1 Yes</LiveInBuyer>
+    <joint>2 No</joint>
+    <JointMore/>
+    <PartAPurchaser>2 Yes</PartAPurchaser>
+  </Group>
+  <Group>
+    <Q11Bedrooms override-field="">1</Q11Bedrooms>
+    <Q12PropertyType>1 Flat or maisonette</Q12PropertyType>
+    <Q13BuildingType>1 Purpose built</Q13BuildingType>
+    <Q14Postcode override-field="">SW1A 1AA</Q14Postcode>
+    <Q14PropertyLocation>Westminster</Q14PropertyLocation>
+    <Q14ONSLACode>E09000033</Q14ONSLACode>
+    <Q15Wheelchair>2 No</Q15Wheelchair>
+  </Group>
+  <Group>
+    <P1Age>75</P1Age>
+    <P1Sex override-field="">Female</P1Sex>
+    <P1Eco>5 Retired</P1Eco>
+    <P1Eth>1 White: English/Scottish/Welsh/Northern Irish/British</P1Eth>
+    <P1Nat>18 United Kingdom</P1Nat>
+    <P2Age/>
+    <P2Sex override-field=""/>
+    <P2Rel/>
+    <P2Eco/>
+    <P3Age/>
+    <P3Sex override-field=""/>
+    <P3Rel/>
+    <P3Eco/>
+    <P4Age/>
+    <P4Sex override-field=""/>
+    <P4Rel/>
+    <P4Eco/>
+    <P5Age/>
+    <P5Sex override-field=""/>
+    <P5Rel/>
+    <P5Eco/>
+    <P6Age/>
+    <P6Sex override-field=""/>
+    <P6Rel/>
+    <P6Eco/>
+    <P7Age/>
+    <P7Sex override-field=""/>
+    <P7Rel/>
+    <P7Eco/>
+    <P8Age/>
+    <P8Sex override-field=""/>
+    <P8Rel/>
+    <P8Eco/>
+    <LiveInBuyer1>1 Yes</LiveInBuyer1>
+    <LiveInBuyer2/>
+    <LiveInOther/>
+  </Group>
+  <Group>
+    <P2Partner>0</P2Partner>
+    <P3Partner>0</P3Partner>
+    <P4Partner>0</P4Partner>
+    <P5Partner>0</P5Partner>
+    <P6Partner>0</P6Partner>
+    <P7Partner>0</P7Partner>
+    <P8Partner>0</P8Partner>
+    <Partner>0</Partner>
+    <P2AgeT>0</P2AgeT>
+    <P3AgeT>0</P3AgeT>
+    <P4AgeT>0</P4AgeT>
+    <P5AgeT>0</P5AgeT>
+    <P6AgeT>0</P6AgeT>
+    <P7AgeT>0</P7AgeT>
+    <P8AgeT>0</P8AgeT>
+    <P2SexT>0</P2SexT>
+    <P3SexT>0</P3SexT>
+    <P4SexT>0</P4SexT>
+    <P5SexT>0</P5SexT>
+    <P6SexT>0</P6SexT>
+    <P7SexT>0</P7SexT>
+    <P8SexT>0</P8SexT>
+    <P2RelT>0</P2RelT>
+    <P3RelT>0</P3RelT>
+    <P4RelT>0</P4RelT>
+    <P5RelT>0</P5RelT>
+    <P6RelT>0</P6RelT>
+    <P7RelT>0</P7RelT>
+    <P8RelT>0</P8RelT>
+    <P2EcoT>0</P2EcoT>
+    <P3EcoT>0</P3EcoT>
+    <P4EcoT>0</P4EcoT>
+    <P5EcoT>0</P5EcoT>
+    <P6EcoT>0</P6EcoT>
+    <P7EcoT>0</P7EcoT>
+    <P8EcoT>0</P8EcoT>
+    <P2HHoldT>0</P2HHoldT>
+    <P3HHoldT>0</P3HHoldT>
+    <P4HHoldT>0</P4HHoldT>
+    <P5HHoldT>0</P5HHoldT>
+    <P6HHoldT>0</P6HHoldT>
+    <P7HHoldT>0</P7HHoldT>
+    <P8HHoldT>0</P8HHoldT>
+    <P2PAge>0</P2PAge>
+    <P3PAge>0</P3PAge>
+    <P4PAge>0</P4PAge>
+    <P5PAge>0</P5PAge>
+    <P6PAge>0</P6PAge>
+    <P7PAge>0</P7PAge>
+    <P8PAge>0</P8PAge>
+    <PAGE/>
+    <Q30Answer/>
+    <P2Other>0</P2Other>
+    <P3Other>0</P3Other>
+    <P4Other>0</P4Other>
+    <P5Other>0</P5Other>
+    <P6Other>0</P6Other>
+    <P7Other>0</P7Other>
+    <P8Other>0</P8Other>
+    <Other>0</Other>
+    <P2RRefused>0</P2RRefused>
+    <P3RRefused>0</P3RRefused>
+    <P4RRefused>0</P4RRefused>
+    <P5RRefused>0</P5RRefused>
+    <P6RRefused>0</P6RRefused>
+    <P7RRefused>0</P7RRefused>
+    <P8RRefused>0</P8RRefused>
+    <TotRRefused>0</TotRRefused>
+    <CALCMORT>0</CALCMORT>
+    <MORTGAGEUSED>2</MORTGAGEUSED>
+    <IM1>0</IM1>
+    <IM2>0</IM2>
+    <IMT>0</IMT>
+    <MortMultiple>0</MortMultiple>
+    <Form>300201</Form>
+  </Group>
+  <Group>
+    <minmaxP11/>
+    <minmaxP12/>
+    <minmaxP13/>
+    <minmaxP14/>
+    <minmaxP15>B</minmaxP15>
+    <minmaxP16/>
+    <minmaxP17/>
+    <minmaxP18/>
+    <minmaxP1T>B</minmaxP1T>
+    <minmaxP19/>
+    <minmaxP10/>
+    <minmaxP21/>
+    <minmaxP22/>
+    <minmaxP23/>
+    <minmaxP24/>
+    <minmaxP25/>
+    <minmaxP26/>
+    <minmaxP27/>
+    <minmaxP28/>
+    <minmaxP2T/>
+    <minmaxP29/>
+    <minmaxP20/>
+    <Q16CHK>0</Q16CHK>
+    <Q30CHK>0</Q30CHK>
+    <Q38CHK>1</Q38CHK>
+    <SalesCHKT>1</SalesCHKT>
+    <Q23CHK>0</Q23CHK>
+    <Q16typeCHK>0</Q16typeCHK>
+    <Q16Q23>0</Q16Q23>
+    <DAY>16</DAY>
+    <MONTH>1</MONTH>
+    <YEAR>2023</YEAR>
+    <HODAY/>
+    <HOMONTH/>
+    <HOYEAR/>
+    <EXDAY/>
+    <EXMONTH/>
+    <EXYEAR/>
+    <PPOSTC1>B95</PPOSTC1>
+    <PPOSTC2>5HZ</PPOSTC2>
+    <PCODE1>SW1A</PCODE1>
+    <PCODE2>1AA</PCODE2>
+    <NOINT/>
+  </Group>
+  <Group>
+    <Q6PrevTenure/>
+    <Q7Postcode override-field="">B95 5HZ</Q7Postcode>
+    <Q7UnknownPostcode/>
+    <Q7PrevLocation>Stratford-on-Avon</Q7PrevLocation>
+    <Q7ONSLACode>E07000221</Q7ONSLACode>
+    <PREGYRHA/>
+    <PREGORHA/>
+    <PREGLA/>
+    <PREGHBA/>
+    <PREGOTHER/>
+  </Group>
+  <Group>
+    <ArmedF/>
+    <LeftArmedF/>
+    <ARMEDFORCESSPOUSE/>
+    <Disability/>
+    <Q10Wheelchair override-field=""/>
+  </Group>
+  <Group>
+    <P1IncKnown/>
+    <Q2Person1Income/>
+    <Q2Person1Mortgage/>
+    <P2IncKnown/>
+    <Q2Person2Income/>
+    <Q2Person2MortApplication/>
+    <Q2a/>
+    <savingsKnown/>
+    <Q3Savings override-field=""/>
+    <Q4PrevOwnedProperty/>
   </Group>
   <Group>
-  <DAY>5</DAY>
-    <MONTH>11</MONTH>
-    <YEAR>2022</YEAR>
-    <!-- for shared ownership testing -->
-    <OWNERSHIP>1 Yes - a shared ownership scheme</OWNERSHIP>
-    <DERSALETYPE>18 Social Homebuy (shared ownership purchase)</DERSALETYPE>
-    <COMPANY></COMPANY>
-    <JOINT>1 Yes</JOINT>
-    <Q11BEDROOMS>2</Q11BEDROOMS>
-    <JOINTMORE>1 Yes</JOINTMORE>
-    <NOINT>2</NOINT>
-    <QDP>Yes</QDP>
-    <P1AGE>30</P1AGE>
-    <P1SEX>Non-binary</P1SEX>
-    <P1NAT>17 Republic of Ireland</P1NAT>
-    <LIVEINBUYER1>1 Yes</LIVEINBUYER1>
-    <P2REL>Partner</P2REL>
-    <Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE>
-    <P2AGE>35</P2AGE>
-    <Q13BUILDINGTYPE>1 Purpose built</Q13BUILDINGTYPE>
-    <P1ETH>3 White: Other</P1ETH>
-    <P2SEX>Non-binary</P2SEX>
-    <LIVEINBUYER2>1 Yes</LIVEINBUYER2>
-    <P1ECO>1 Full Time - 30 hours or more a week</P1ECO>
-    <P2ECO>1 Full Time - 30 hours or more a week</P2ECO>
-    <Q10WHEELCHAIR>1 Yes</Q10WHEELCHAIR>
-    <P3AGE>14</P3AGE>
-    <P4AGE>18</P4AGE>
-    <P5AGE>70</P5AGE>
-    <P6AGE>40</P6AGE>
-    <Q2PERSON1INCOME>75_000</Q2PERSON1INCOME>
-    <Q2PERSON1MORTGAGE>1 Yes</Q2PERSON1MORTGAGE>
-    <Q2PERSON2INCOME>10_000</Q2PERSON2INCOME>
-    <Q2PERSON2MORTAPPLICATION>1 Yes</Q2PERSON2MORTAPPLICATION>
-    <Q14ONSLACODE>E08000035</Q14ONSLACODE>
-    <savingsKnown>1 Yes</savingsKnown>
-    <Q3SAVINGS>100_000</Q3SAVINGS>
-    <Q4PREVOWNEDPROPERTY>1 Yes</Q4PREVOWNEDPROPERTY>
-    <P3SEX>Non-binary</P3SEX>
-    <P4SEX>Non-binary</P4SEX>
-    <P5SEX>Non-binary</P5SEX>
-    <P6SEX>Non-binary</P6SEX>
-    <CALCMORT>150_000</CALCMORT>
-    <P3ECO>9 Child under 16</P3ECO>
-    <P4ECO>3 In government training into work such as New Deal</P4ECO>
-    <P5ECO>5 Retired</P5ECO>
-    <P6ECO>1 Full Time - 30 hours or more a week</P6ECO>
-    <DISABILITY>1 Yes</DISABILITY>
-    <Q28MONTHLYRENT>300</Q28MONTHLYRENT>
-    <Q26CASHDEPOSIT>70_000</Q26CASHDEPOSIT>
-    <Q22PURCHASEPRICE>230_000</Q22PURCHASEPRICE>
-    <Q30A>0</Q30A>
-    <Q17ASTAIRCASE>1 Yes</Q17ASTAIRCASE>
-    <PERCENTBOUGHT>10</PERCENTBOUGHT>
-    <PERCENTOWNS>10</PERCENTOWNS>
-    <Q19REHOUSED>1 Yes</Q19REHOUSED>
-    <Q32REDUCTIONS></Q32REDUCTIONS>
-    <Q27SOCIALHOMEBUY>10_000</Q27SOCIALHOMEBUY>
-    <Q23EQUITY>100</Q23EQUITY>
-    <PREGYRHA>Yes</PREGYRHA>
-    <PREGLA>Yes</PREGLA>
-    <PREGOTHER>Yes</PREGOTHER>
-    <PREGHBA>Yes</PREGHBA>
-    <ARMEDF>1 Yes</ARMEDF>
-    <HHMEMB>6</HHMEMB>
-    <TOTADULT>5</TOTADULT>
-    <TOTCHILD>1</TOTCHILD>
-    <LIVEINOTHER>4</LIVEINOTHER>
-    <!-- <PCODE1>LS16</PCODE1>
-    <PCODE2>6FT</PCODE2> -->
-    <HHTYPE>9 = other</HHTYPE>
-    <Q6PREVTENURE>1 Local authority tenant</Q6PREVTENURE>
-    <P3REL>Child</P3REL>
-    <P4REL>Other</P4REL>
-    <P5REL>Buyer prefers not to say</P5REL>
-    <P6REL>Buyer prefers not to say</P6REL>
-    <Q2A>4 Don’t know</Q2A>
-    <!-- not sure about q30a format /-->
-    <MORTGAGEUSED>1 Yes</MORTGAGEUSED>
-    <Q15WHEELCHAIR>1 Yes</Q15WHEELCHAIR>
-    <ARMEDFORCESSPOUSE>5 No</ARMEDFORCESSPOUSE>
-    <LEFTARMEDF>6 No they left more than 2 years ago</LEFTARMEDF>
-    <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
-    <Q24B>10</Q24B>
-    <Q34B></Q34B>
-    <Q41B></Q41B>
-    <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
-    <Q24AMORTGAGELENDER>5</Q24AMORTGAGELENDER>
-    <Q34AMORTGAGELENDER></Q34AMORTGAGELENDER>
-    <Q41AMORTGAGELENDER></Q41AMORTGAGELENDER>
-    <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
-    <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>
-    <Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER>
-    <Q25BORROWING>1 Yes</Q25BORROWING>
+    <Q16aProplen2/>
+    <Q17aStaircase/>
+    <PercentBought override-field=""/>
+    <PercentOwns/>
+    <Q17Resale/>
+    <Q18ContractExchange override-field=""/>
+    <Q18PracticalCompletion override-field=""/>
+    <Q19Rehoused/>
+    <Q20Bedrooms/>
+    <Q21PropertyType/>
+    <PrevRentType/>
+    <Q22PurchasePrice override-field=""/>
+    <Q23Equity override-field=""/>
+    <MortgageUsedSO/>
+    <Q24Mortgage override-field=""/>
+    <Q24aMortgageLender/>
+    <Q24b/>
+    <Q25Borrowing/>
+    <Q26CashDeposit override-field=""/>
+    <Q27SocialHomeBuy/>
+    <Q28MonthlyRent/>
+    <Q29MonthlyCharges/>
+  </Group>
+  <Group>
+    <Q16aProplensec2/>
+    <Q31PurchasePrice override-field=""/>
+    <Q32Reductions override-field=""/>
+    <Q33Discount override-field=""/>
+    <MortgageUsedDO/>
+    <Q34Mortgage override-field=""/>
+    <Q34a/>
+    <Q34b/>
+    <Q35Borrowing/>
+    <Q36CashDeposit/>
+    <Q37MonthlyCharges/>
+  </Group>
+  <Group>
+    <Q40PurchasePrice override-field="">300000</Q40PurchasePrice>
+    <MortgageUsedOS>2 No</MortgageUsedOS>
+    <Q41Mortgage override-field=""/>
+    <Q41aMortgageLender/>
+    <Q41b/>
+    <Q42Borrowing/>
+    <Q43CashDeposit override-field="">300000</Q43CashDeposit>
+  </Group>
+  <Group>
+    <HHMEMB>1</HHMEMB>
+    <TOTADULT>1</TOTADULT>
+    <TOTCHILD>0</TOTCHILD>
+  </Group>
+  <Group>
+    <HHTYPE>1 = 1 elder</HHTYPE>
+  </Group>
+  <Group>
+    <DerSaleType>10 Outright</DerSaleType>
+  </Group>
+  <Group>
+    <HHTYPEP1A>0</HHTYPEP1A>
+    <HHTYPEP2A>0</HHTYPEP2A>
+    <HHTYPEP3A>0</HHTYPEP3A>
+    <HHTYPEP4A>0</HHTYPEP4A>
+    <HHTYPEP5A>0</HHTYPEP5A>
+    <HHTYPEP6A>0</HHTYPEP6A>
+    <HHTYPEP7A>0</HHTYPEP7A>
+    <HHTYPEP8A>0</HHTYPEP8A>
+    <TADULT>0</TADULT>
+    <HHTYPEP1E>1</HHTYPEP1E>
+    <HHTYPEP2E>0</HHTYPEP2E>
+    <HHTYPEP3E>0</HHTYPEP3E>
+    <HHTYPEP4E>0</HHTYPEP4E>
+    <HHTYPEP5E>0</HHTYPEP5E>
+    <HHTYPEP6E>0</HHTYPEP6E>
+    <HHTYPEP7E>0</HHTYPEP7E>
+    <HHTYPEP8E>0</HHTYPEP8E>
+    <TELDER>1</TELDER>
+    <HHTYPEP1C>0</HHTYPEP1C>
+    <HHTYPEP2C>0</HHTYPEP2C>
+    <HHTYPEP3C>0</HHTYPEP3C>
+    <HHTYPEP4C>0</HHTYPEP4C>
+    <HHTYPEP5C>0</HHTYPEP5C>
+    <HHTYPEP6C>0</HHTYPEP6C>
+    <HHTYPEP7C>0</HHTYPEP7C>
+    <HHTYPEP8C>0</HHTYPEP8C>
+    <TCHILD>0</TCHILD>
+    <Q8av>0</Q8av>
+    <Q8bv>0</Q8bv>
+    <Q8cv>0</Q8cv>
+    <Q8dv>0</Q8dv>
+    <Q8ev>0</Q8ev>
+    <Q8Validate>0</Q8Validate>
+  </Group>
+  <Group>
+    <PLOACODE/>
+    <OACODE/>
+    <GOVREG>E12000007</GOVREG>
+    <OWNINGORGID>1</OWNINGORGID>
+    <OWNINGORGNAME>1 Test</OWNINGORGNAME>
+    <HCNUM>655</HCNUM>
   </Group>
 </Group>
diff --git a/spec/fixtures/imports/sales_logs/0b4a68df-30cc-474a-93c0-a56ce8fdad3b.xml b/spec/fixtures/imports/sales_logs/0b4a68df-30cc-474a-93c0-a56ce8fdad3b.xml
index e42a0f3b5..602a4dd42 100644
--- a/spec/fixtures/imports/sales_logs/0b4a68df-30cc-474a-93c0-a56ce8fdad3b.xml
+++ b/spec/fixtures/imports/sales_logs/0b4a68df-30cc-474a-93c0-a56ce8fdad3b.xml
@@ -1,13 +1,12 @@
-<Group xmlns="http://data.gov.uk/core/logs/2021-CORE-SR-SH" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!-- check metadata fields /-->
+<Group xmlns="http://data.gov.uk/core/logs/2022-CORE-Sales" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <meta:metadata xmlns:es="http://www.ecmascript.org/" xmlns:xqx="http://www.w3.org/2005/XQueryX" xmlns:XSLT="http://www.w3.org/1999/XSL/Transform/compile">
-    <meta:form-name>2022-CORE</meta:form-name>
+    <meta:form-name>2022-CORE-Sales</meta:form-name>
     <meta:document-id>0b4a68df-30cc-474a-93c0-a56ce8fdad3b</meta:document-id>
     <meta:owner-user-id>c3061a2e6ea0b702e6f6210d5c52d2a92612d2aa</meta:owner-user-id>
     <meta:owner-institution-id>7c5bd5fb549c09z2c55d9cb90d7ba84927e64618</meta:owner-institution-id>
     <meta:managing-institution-id>7c5bd5fb549c09z2c55d9cb90d7ba84927e64618</meta:managing-institution-id>
-    <meta:created-date>2022-01-05T12:50:20.39153Z</meta:created-date>
-    <meta:modified-date>2022-01-05T12:50:20.39153Z</meta:modified-date>
+    <meta:created-date>2023-02-21T11:54:51.786722Z</meta:created-date>
+    <meta:modified-date>2023-02-21T11:54:51.786722Z</meta:modified-date>
     <meta:status>submitted-valid</meta:status>
     <meta:reporting-year>2022</meta:reporting-year>
     <meta:upload-method>Manual Entry</meta:upload-method>
@@ -15,96 +14,318 @@
     <meta:rules assert-valid="true"/>
   </meta:metadata>
   <Group>
-    <OWNINGORGID>1</OWNINGORGID>
+    <Qdp>Yes</Qdp>
+    <CompletionDate>2023-02-01</CompletionDate>
+    <PurchaserCode>Discount ownership example</PurchaserCode>
+    <Ownership>2 Yes - a discount ownership scheme</Ownership>
+    <Q16SaleType/>
+    <Q30SaleType>14 Preserved Right to Buy (PRTB)</Q30SaleType>
+    <Q38SaleType/>
+    <Q38OtherSale/>
+    <company/>
+    <LiveInBuyer/>
+    <joint>2 No</joint>
+    <JointMore/>
+    <PartAPurchaser>1 No</PartAPurchaser>
+  </Group>
+  <Group>
+    <Q11Bedrooms override-field="">3</Q11Bedrooms>
+    <Q12PropertyType>3 House</Q12PropertyType>
+    <Q13BuildingType>1 Purpose built</Q13BuildingType>
+    <Q14Postcode override-field="">SW1A 1AA</Q14Postcode>
+    <Q14PropertyLocation>Westminster</Q14PropertyLocation>
+    <Q14ONSLACode>E09000033</Q14ONSLACode>
+    <Q15Wheelchair>3 Don&#x2019;t know</Q15Wheelchair>
+  </Group>
+  <Group>
+    <P1Age/>
+    <P1Sex override-field=""/>
+    <P1Eco/>
+    <P1Eth/>
+    <P1Nat/>
+    <P2Age/>
+    <P2Sex override-field=""/>
+    <P2Rel/>
+    <P2Eco/>
+    <P3Age/>
+    <P3Sex override-field=""/>
+    <P3Rel/>
+    <P3Eco/>
+    <P4Age/>
+    <P4Sex override-field=""/>
+    <P4Rel/>
+    <P4Eco/>
+    <P5Age/>
+    <P5Sex override-field=""/>
+    <P5Rel/>
+    <P5Eco/>
+    <P6Age/>
+    <P6Sex override-field=""/>
+    <P6Rel/>
+    <P6Eco/>
+    <P7Age/>
+    <P7Sex override-field=""/>
+    <P7Rel/>
+    <P7Eco/>
+    <P8Age/>
+    <P8Sex override-field=""/>
+    <P8Rel/>
+    <P8Eco/>
+    <LiveInBuyer1>1 Yes</LiveInBuyer1>
+    <LiveInBuyer2/>
+    <LiveInOther/>
+  </Group>
+  <Group>
+    <P2Partner>0</P2Partner>
+    <P3Partner>0</P3Partner>
+    <P4Partner>0</P4Partner>
+    <P5Partner>0</P5Partner>
+    <P6Partner>0</P6Partner>
+    <P7Partner>0</P7Partner>
+    <P8Partner>0</P8Partner>
+    <Partner>0</Partner>
+    <P2AgeT>0</P2AgeT>
+    <P3AgeT>0</P3AgeT>
+    <P4AgeT>0</P4AgeT>
+    <P5AgeT>0</P5AgeT>
+    <P6AgeT>0</P6AgeT>
+    <P7AgeT>0</P7AgeT>
+    <P8AgeT>0</P8AgeT>
+    <P2SexT>0</P2SexT>
+    <P3SexT>0</P3SexT>
+    <P4SexT>0</P4SexT>
+    <P5SexT>0</P5SexT>
+    <P6SexT>0</P6SexT>
+    <P7SexT>0</P7SexT>
+    <P8SexT>0</P8SexT>
+    <P2RelT>0</P2RelT>
+    <P3RelT>0</P3RelT>
+    <P4RelT>0</P4RelT>
+    <P5RelT>0</P5RelT>
+    <P6RelT>0</P6RelT>
+    <P7RelT>0</P7RelT>
+    <P8RelT>0</P8RelT>
+    <P2EcoT>0</P2EcoT>
+    <P3EcoT>0</P3EcoT>
+    <P4EcoT>0</P4EcoT>
+    <P5EcoT>0</P5EcoT>
+    <P6EcoT>0</P6EcoT>
+    <P7EcoT>0</P7EcoT>
+    <P8EcoT>0</P8EcoT>
+    <P2HHoldT>0</P2HHoldT>
+    <P3HHoldT>0</P3HHoldT>
+    <P4HHoldT>0</P4HHoldT>
+    <P5HHoldT>0</P5HHoldT>
+    <P6HHoldT>0</P6HHoldT>
+    <P7HHoldT>0</P7HHoldT>
+    <P8HHoldT>0</P8HHoldT>
+    <P2PAge>0</P2PAge>
+    <P3PAge>0</P3PAge>
+    <P4PAge>0</P4PAge>
+    <P5PAge>0</P5PAge>
+    <P6PAge>0</P6PAge>
+    <P7PAge>0</P7PAge>
+    <P8PAge>0</P8PAge>
+    <PAGE/>
+    <Q30Answer/>
+    <P2Other>0</P2Other>
+    <P3Other>0</P3Other>
+    <P4Other>0</P4Other>
+    <P5Other>0</P5Other>
+    <P6Other>0</P6Other>
+    <P7Other>0</P7Other>
+    <P8Other>0</P8Other>
+    <Other>0</Other>
+    <P2RRefused>0</P2RRefused>
+    <P3RRefused>0</P3RRefused>
+    <P4RRefused>0</P4RRefused>
+    <P5RRefused>0</P5RRefused>
+    <P6RRefused>0</P6RRefused>
+    <P7RRefused>0</P7RRefused>
+    <P8RRefused>0</P8RRefused>
+    <TotRRefused>0</TotRRefused>
+    <CALCMORT>134750</CALCMORT>
+    <MORTGAGEUSED>1</MORTGAGEUSED>
+    <IM1>0</IM1>
+    <IM2>0</IM2>
+    <IMT>0</IMT>
+    <MortMultiple>1</MortMultiple>
+    <Form>300200</Form>
+  </Group>
+  <Group>
+    <minmaxP11/>
+    <minmaxP12/>
+    <minmaxP13/>
+    <minmaxP14/>
+    <minmaxP15/>
+    <minmaxP16/>
+    <minmaxP17/>
+    <minmaxP18/>
+    <minmaxP1T/>
+    <minmaxP19/>
+    <minmaxP10/>
+    <minmaxP21/>
+    <minmaxP22/>
+    <minmaxP23/>
+    <minmaxP24/>
+    <minmaxP25/>
+    <minmaxP26/>
+    <minmaxP27/>
+    <minmaxP28/>
+    <minmaxP2T/>
+    <minmaxP29/>
+    <minmaxP20/>
+    <Q16CHK>0</Q16CHK>
+    <Q30CHK>1</Q30CHK>
+    <Q38CHK>0</Q38CHK>
+    <SalesCHKT>1</SalesCHKT>
+    <Q23CHK>0</Q23CHK>
+    <Q16typeCHK>0</Q16typeCHK>
+    <Q16Q23>0</Q16Q23>
+    <DAY>1</DAY>
+    <MONTH>2</MONTH>
+    <YEAR>2023</YEAR>
+    <HODAY/>
+    <HOMONTH/>
+    <HOYEAR/>
+    <EXDAY/>
+    <EXMONTH/>
+    <EXYEAR/>
+    <PPOSTC1>GL51</PPOSTC1>
+    <PPOSTC2>9EX</PPOSTC2>
+    <PCODE1>SW1A</PCODE1>
+    <PCODE2>1AA</PCODE2>
+    <NOINT/>
+  </Group>
+  <Group>
+    <Q6PrevTenure/>
+    <Q7Postcode override-field="">GL51 9EX</Q7Postcode>
+    <Q7UnknownPostcode/>
+    <Q7PrevLocation>Cheltenham</Q7PrevLocation>
+    <Q7ONSLACode>E07000078</Q7ONSLACode>
+    <PREGYRHA/>
+    <PREGORHA/>
+    <PREGLA/>
+    <PREGHBA/>
+    <PREGOTHER/>
+  </Group>
+  <Group>
+    <ArmedF/>
+    <LeftArmedF/>
+    <ARMEDFORCESSPOUSE/>
+    <Disability/>
+    <Q10Wheelchair override-field=""/>
+  </Group>
+  <Group>
+    <P1IncKnown/>
+    <Q2Person1Income/>
+    <Q2Person1Mortgage/>
+    <P2IncKnown/>
+    <Q2Person2Income/>
+    <Q2Person2MortApplication/>
+    <Q2a/>
+    <savingsKnown/>
+    <Q3Savings override-field=""/>
+    <Q4PrevOwnedProperty/>
   </Group>
   <Group>
-    <DAY>5</DAY>
-    <MONTH>11</MONTH>
-    <YEAR>2022</YEAR>
-    <OWNERSHIP>2 Yes - a discount ownership scheme</OWNERSHIP>
-    <DERSALETYPE>8 Right to Acquire (RTA)</DERSALETYPE>
-    <COMPANY></COMPANY>
-    <JOINT>1 Yes</JOINT>
-    <Q11BEDROOMS>2</Q11BEDROOMS>
-    <JOINTMORE>1 Yes</JOINTMORE>
-    <NOINT>1</NOINT>
-    <QDP></QDP>
-    <P1AGE>30</P1AGE>
-    <P1SEX>Non-binary</P1SEX>
-    <P1NAT>17 Republic of Ireland</P1NAT>
-    <LIVEINBUYER1>1 Yes</LIVEINBUYER1>
-    <P2REL>Partner</P2REL>
-    <Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE>
-    <P2AGE>35</P2AGE>
-    <Q13BUILDINGTYPE>1 Purpose built</Q13BUILDINGTYPE>
-    <P1ETH>3 White: Other</P1ETH>
-    <P2SEX>Non-binary</P2SEX>
-    <LIVEINBUYER2>1 Yes</LIVEINBUYER2>
-    <P1ECO>1 Full Time - 30 hours or more a week</P1ECO>
-    <P2ECO>1 Full Time - 30 hours or more a week</P2ECO>
-    <Q10WHEELCHAIR>1 Yes</Q10WHEELCHAIR>
-    <P3AGE>14</P3AGE>
-    <P4AGE>18</P4AGE>
-    <P5AGE>70</P5AGE>
-    <P6AGE>40</P6AGE>
-    <Q2PERSON1INCOME>75_000</Q2PERSON1INCOME>
-    <Q2PERSON1MORTGAGE>1 Yes</Q2PERSON1MORTGAGE>
-    <Q2PERSON2INCOME>10_000</Q2PERSON2INCOME>
-    <Q2PERSON2MORTAPPLICATION>1 Yes</Q2PERSON2MORTAPPLICATION>
-    <Q14ONSLACODE>E08000035</Q14ONSLACODE>
-    <savingsKnown>1 Yes</savingsKnown>
-    <Q3SAVINGS>100_000</Q3SAVINGS>
-    <Q4PREVOWNEDPROPERTY>1 Yes</Q4PREVOWNEDPROPERTY>
-    <P3SEX>Non-binary</P3SEX>
-    <P4SEX>Non-binary</P4SEX>
-    <P5SEX>Non-binary</P5SEX>
-    <P6SEX>Non-binary</P6SEX>
-    <CALCMORT>150_000</CALCMORT>
-    <P3ECO>9 Child under 16</P3ECO>
-    <P4ECO>3 In government training into work such as New Deal</P4ECO>
-    <P5ECO>5 Retired</P5ECO>
-    <P6ECO>1 Full Time - 30 hours or more a week</P6ECO>
-    <DISABILITY>1 Yes</DISABILITY>
-    <Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT>
-    <Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY>
-    <Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE>
-    <Q32REDUCTIONS>10_000</Q32REDUCTIONS>
-    <!-- not sure about q30a format /-->
-    <Q30A>10</Q30A>
-    <PREGYRHA>Yes</PREGYRHA>
-    <PREGLA>Yes</PREGLA>
-    <PREGOTHER>Yes</PREGOTHER>
-    <PREGHBA>Yes</PREGHBA>
-    <ARMEDF>1 Yes</ARMEDF>
-    <HHMEMB>6</HHMEMB>
-    <TOTADULT>5</TOTADULT>
-    <TOTCHILD>1</TOTCHILD>
-    <LIVEINOTHER>4</LIVEINOTHER>
-    <!-- <PCODE1>LS16</PCODE1>
-    <PCODE2>6FT</PCODE2> -->
-    <HHTYPE>9 = other</HHTYPE>
-    <Q6PREVTENURE>1 Local authority tenant</Q6PREVTENURE>
-    <P3REL>Child</P3REL>
-    <P4REL>Other</P4REL>
-    <P5REL>Buyer prefers not to say</P5REL>
-    <P6REL>Buyer prefers not to say</P6REL>
-    <Q2A>4 Don’t know</Q2A>
-    <!-- not sure about q30a format /-->
-    <MORTGAGEUSED>1 Yes</MORTGAGEUSED>
-    <Q15WHEELCHAIR>1 Yes</Q15WHEELCHAIR>
-    <ARMEDFORCESSPOUSE>5 No</ARMEDFORCESSPOUSE>
-    <LEFTARMEDF>6 No they left more than 2 years ago</LEFTARMEDF>
-    <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
-    <Q24B></Q24B>
-    <Q34B>10</Q34B>
-    <Q41B></Q41B>
-    <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
-    <Q24AMORTGAGELENDER></Q24AMORTGAGELENDER>
-    <Q34AMORTGAGELENDER>5</Q34AMORTGAGELENDER>
-    <Q41AMORTGAGELENDER></Q41AMORTGAGELENDER>
-    <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
-    <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>
-    <Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER>
-    <Q25BORROWING>1 Yes</Q25BORROWING>
+    <Q16aProplen2/>
+    <Q17aStaircase/>
+    <PercentBought override-field=""/>
+    <PercentOwns/>
+    <Q17Resale/>
+    <Q18ContractExchange override-field=""/>
+    <Q18PracticalCompletion override-field=""/>
+    <Q19Rehoused/>
+    <Q20Bedrooms/>
+    <Q21PropertyType/>
+    <PrevRentType/>
+    <Q22PurchasePrice override-field=""/>
+    <Q23Equity override-field=""/>
+    <MortgageUsedSO/>
+    <Q24Mortgage override-field=""/>
+    <Q24aMortgageLender/>
+    <Q24b/>
+    <Q25Borrowing/>
+    <Q26CashDeposit override-field=""/>
+    <Q27SocialHomeBuy/>
+    <Q28MonthlyRent/>
+    <Q29MonthlyCharges/>
+  </Group>
+  <Group>
+    <Q16aProplensec2/>
+    <Q31PurchasePrice override-field="">275000</Q31PurchasePrice>
+    <Q32Reductions override-field=""/>
+    <Q33Discount override-field="">51</Q33Discount>
+    <MortgageUsedDO>1 Yes</MortgageUsedDO>
+    <Q34Mortgage override-field="true">134750</Q34Mortgage>
+    <Q34a>Halifax</Q34a>
+    <Q34b/>
+    <Q35Borrowing>2 No</Q35Borrowing>
+    <Q36CashDeposit>0</Q36CashDeposit>
+    <Q37MonthlyCharges>0.00</Q37MonthlyCharges>
+  </Group>
+  <Group>
+    <Q40PurchasePrice override-field=""/>
+    <MortgageUsedOS/>
+    <Q41Mortgage override-field=""/>
+    <Q41aMortgageLender/>
+    <Q41b/>
+    <Q42Borrowing/>
+    <Q43CashDeposit override-field=""/>
+  </Group>
+  <Group>
+    <HHMEMB>1</HHMEMB>
+    <TOTADULT>1</TOTADULT>
+    <TOTCHILD>0</TOTCHILD>
+  </Group>
+  <Group>
+    <HHTYPE>3 = 1 adult</HHTYPE>
+  </Group>
+  <Group>
+    <DerSaleType>14 Preserved Right to Buy (PRTB)</DerSaleType>
+  </Group>
+  <Group>
+    <HHTYPEP1A>1</HHTYPEP1A>
+    <HHTYPEP2A>0</HHTYPEP2A>
+    <HHTYPEP3A>0</HHTYPEP3A>
+    <HHTYPEP4A>0</HHTYPEP4A>
+    <HHTYPEP5A>0</HHTYPEP5A>
+    <HHTYPEP6A>0</HHTYPEP6A>
+    <HHTYPEP7A>0</HHTYPEP7A>
+    <HHTYPEP8A>0</HHTYPEP8A>
+    <TADULT>1</TADULT>
+    <HHTYPEP1E>0</HHTYPEP1E>
+    <HHTYPEP2E>0</HHTYPEP2E>
+    <HHTYPEP3E>0</HHTYPEP3E>
+    <HHTYPEP4E>0</HHTYPEP4E>
+    <HHTYPEP5E>0</HHTYPEP5E>
+    <HHTYPEP6E>0</HHTYPEP6E>
+    <HHTYPEP7E>0</HHTYPEP7E>
+    <HHTYPEP8E>0</HHTYPEP8E>
+    <TELDER>0</TELDER>
+    <HHTYPEP1C>0</HHTYPEP1C>
+    <HHTYPEP2C>0</HHTYPEP2C>
+    <HHTYPEP3C>0</HHTYPEP3C>
+    <HHTYPEP4C>0</HHTYPEP4C>
+    <HHTYPEP5C>0</HHTYPEP5C>
+    <HHTYPEP6C>0</HHTYPEP6C>
+    <HHTYPEP7C>0</HHTYPEP7C>
+    <HHTYPEP8C>0</HHTYPEP8C>
+    <TCHILD>0</TCHILD>
+    <Q8av>0</Q8av>
+    <Q8bv>0</Q8bv>
+    <Q8cv>0</Q8cv>
+    <Q8dv>0</Q8dv>
+    <Q8ev>0</Q8ev>
+    <Q8Validate>0</Q8Validate>
+  </Group>
+  <Group>
+    <PLOACODE/>
+    <OACODE/>
+    <GOVREG>E12000007</GOVREG>
+    <OWNINGORGID>1</OWNINGORGID>
+    <OWNINGORGNAME>1 Test</OWNINGORGNAME>
+    <HCNUM>655</HCNUM>
   </Group>
 </Group>
diff --git a/spec/fixtures/imports/sales_logs/0ead17cb-1668-442d-898c-0d52879ff592.xml b/spec/fixtures/imports/sales_logs/0ead17cb-1668-442d-898c-0d52879ff592.xml
index 4612ae236..46bb69b9a 100644
--- a/spec/fixtures/imports/sales_logs/0ead17cb-1668-442d-898c-0d52879ff592.xml
+++ b/spec/fixtures/imports/sales_logs/0ead17cb-1668-442d-898c-0d52879ff592.xml
@@ -1,132 +1,331 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Group xmlns="http://data.gov.uk/core/logs/2021-CORE-SR-GN"
-       xmlns:app="http://www.w3.org/2007/app"
-       xmlns:atom="http://www.w3.org/2005/Atom"
-       xmlns:ev="http://www.w3.org/2001/xml-events"
-       xmlns:meta="http://data.gov.uk/core/metadata"
-       xmlns:svc="http://www.w3.org/2007/app"
-       xmlns:xf="http://www.w3.org/2002/xforms"
-       xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation"
-       xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:xxf="http://orbeon.org/oxf/xml/xforms"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!-- check metadata fields /-->
-  <meta:metadata xmlns:es="http://www.ecmascript.org/"
-                 xmlns:xqx="http://www.w3.org/2005/XQueryX"
-                 xmlns:XSLT="http://www.w3.org/1999/XSL/Transform/compile">
-    <meta:form-name>2022-CORE</meta:form-name>
+<Group xmlns="http://data.gov.uk/core/logs/2022-CORE-Sales" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <meta:metadata xmlns:es="http://www.ecmascript.org/" xmlns:xqx="http://www.w3.org/2005/XQueryX" xmlns:XSLT="http://www.w3.org/1999/XSL/Transform/compile">
+    <meta:form-name>2022-CORE-Sales</meta:form-name>
     <meta:document-id>0ead17cb-1668-442d-898c-0d52879ff592</meta:document-id>
-    <meta:owner-user-id>c3061a2e6ea0b702e6f6210d5c52d2a92612d2aa
-    </meta:owner-user-id>
-    <meta:owner-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618
-    </meta:owner-institution-id>
-    <meta:managing-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618
-    </meta:managing-institution-id>
-    <meta:created-date>2021-10-08T14:48:17.096123Z</meta:created-date>
-    <meta:modified-date>2021-10-08T14:48:17.096123Z</meta:modified-date>
+    <meta:owner-user-id>c3061a2e6ea0b702e6f6210d5c52d2a92612d2aa</meta:owner-user-id>
+    <meta:owner-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:owner-institution-id>
+    <meta:managing-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:managing-institution-id>
+    <meta:created-date>2023-02-21T11:48:28.255968Z</meta:created-date>
+    <meta:modified-date>2023-02-21T11:49:27.630543Z</meta:modified-date>
     <meta:status>submitted-valid</meta:status>
-    <meta:reporting-year>2021</meta:reporting-year>
+    <meta:reporting-year>2022</meta:reporting-year>
     <meta:upload-method>Manual Entry</meta:upload-method>
     <meta:schema assert-valid="true"/>
     <meta:rules assert-valid="true"/>
   </meta:metadata>
   <Group>
-    <OWNINGORGID>1</OWNINGORGID>
+    <Qdp>Yes</Qdp>
+    <CompletionDate>2023-01-17</CompletionDate>
+    <PurchaserCode>Shared ownership example</PurchaserCode>
+    <Ownership>1 Yes - a shared ownership scheme</Ownership>
+    <Q16SaleType>2 Shared Ownership</Q16SaleType>
+    <Q30SaleType/>
+    <Q38SaleType/>
+    <Q38OtherSale/>
+    <company>2 No</company>
+    <LiveInBuyer>1 Yes</LiveInBuyer>
+    <joint>2 No</joint>
+    <JointMore/>
+    <PartAPurchaser>2 Yes</PartAPurchaser>
   </Group>
   <Group>
-<DAY>5</DAY>
-    <MONTH>11</MONTH>
-    <YEAR>2022</YEAR>
-    <!-- for shared ownership testing -->
-    <OWNERSHIP>1 Yes - a shared ownership scheme</OWNERSHIP>
-    <DERSALETYPE>2 Shared Ownership</DERSALETYPE>
-    <COMPANY></COMPANY>
-    <JOINT>1 Yes</JOINT>
-    <Q11BEDROOMS>2</Q11BEDROOMS>
-    <JOINTMORE>1 Yes</JOINTMORE>
-    <NOINT>2</NOINT>
-    <QDP>Yes</QDP>
-    <P1AGE>30</P1AGE>
-    <P1SEX>Non-binary</P1SEX>
-    <P1NAT>17 Republic of Ireland</P1NAT>
-    <LIVEINBUYER1>1 Yes</LIVEINBUYER1>
-    <P2REL>Partner</P2REL>
-    <Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE>
-    <P2AGE>35</P2AGE>
-    <Q13BUILDINGTYPE>1 Purpose built</Q13BUILDINGTYPE>
-    <P1ETH>3 White: Other</P1ETH>
-    <P2SEX>Non-binary</P2SEX>
-    <LIVEINBUYER2>1 Yes</LIVEINBUYER2>
-    <P1ECO>1 Full Time - 30 hours or more a week</P1ECO>
-    <P2ECO>1 Full Time - 30 hours or more a week</P2ECO>
-    <Q10WHEELCHAIR>1 Yes</Q10WHEELCHAIR>
-    <P3AGE>14</P3AGE>
-    <P4AGE>18</P4AGE>
-    <P5AGE>70</P5AGE>
-    <P6AGE>40</P6AGE>
-    <Q2PERSON1INCOME>75_000</Q2PERSON1INCOME>
-    <Q2PERSON1MORTGAGE>1 Yes</Q2PERSON1MORTGAGE>
-    <Q2PERSON2INCOME>10_000</Q2PERSON2INCOME>
-    <Q2PERSON2MORTAPPLICATION>1 Yes</Q2PERSON2MORTAPPLICATION>
-    <Q14ONSLACODE>E08000035</Q14ONSLACODE>
-    <savingsKnown>1 Yes</savingsKnown>
-    <Q3SAVINGS>100_000</Q3SAVINGS>
-    <Q4PREVOWNEDPROPERTY>1 Yes</Q4PREVOWNEDPROPERTY>
-    <P3SEX>Non-binary</P3SEX>
-    <P4SEX>Non-binary</P4SEX>
-    <P5SEX>Non-binary</P5SEX>
-    <P6SEX>Non-binary</P6SEX>
-    <CALCMORT>150_000</CALCMORT>
-    <P3ECO>9 Child under 16</P3ECO>
-    <P4ECO>3 In government training into work such as New Deal</P4ECO>
-    <P5ECO>5 Retired</P5ECO>
-    <P6ECO>1 Full Time - 30 hours or more a week</P6ECO>
-    <DISABILITY>1 Yes</DISABILITY>
-    <Q28MONTHLYRENT>300</Q28MONTHLYRENT>
-    <Q26CASHDEPOSIT>70_000</Q26CASHDEPOSIT>
-    <Q22PURCHASEPRICE>220_000</Q22PURCHASEPRICE>
-    <Q30A>0</Q30A>
-    <Q17ASTAIRCASE>1 Yes</Q17ASTAIRCASE>
-    <PERCENTBOUGHT>10</PERCENTBOUGHT>
-    <PERCENTOWNS>10</PERCENTOWNS>
-    <Q19REHOUSED>1 Yes</Q19REHOUSED>
-    <Q32REDUCTIONS></Q32REDUCTIONS>
-    <Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY>
-    <Q23EQUITY>100</Q23EQUITY>
+    <Q11Bedrooms override-field="">2</Q11Bedrooms>
+    <Q12PropertyType>1 Flat or maisonette</Q12PropertyType>
+    <Q13BuildingType>1 Purpose built</Q13BuildingType>
+    <Q14Postcode override-field="">SW1A 1AA</Q14Postcode>
+    <Q14PropertyLocation>Westminster</Q14PropertyLocation>
+    <Q14ONSLACode>E09000033</Q14ONSLACode>
+    <Q15Wheelchair>3 Don&#x2019;t know</Q15Wheelchair>
+  </Group>
+  <Group>
+    <P1Age>30</P1Age>
+    <P1Sex override-field="">Male</P1Sex>
+    <P1Eco>1 Full Time - 30 hours or more a week</P1Eco>
+    <P1Eth>2 White: Irish</P1Eth>
+    <P1Nat>18 United Kingdom</P1Nat>
+    <P2Age/>
+    <P2Sex override-field=""/>
+    <P2Rel/>
+    <P2Eco/>
+    <P3Age/>
+    <P3Sex override-field=""/>
+    <P3Rel/>
+    <P3Eco/>
+    <P4Age/>
+    <P4Sex override-field=""/>
+    <P4Rel/>
+    <P4Eco/>
+    <P5Age/>
+    <P5Sex override-field=""/>
+    <P5Rel/>
+    <P5Eco/>
+    <P6Age/>
+    <P6Sex override-field=""/>
+    <P6Rel/>
+    <P6Eco/>
+    <P7Age/>
+    <P7Sex override-field=""/>
+    <P7Rel/>
+    <P7Eco/>
+    <P8Age/>
+    <P8Sex override-field=""/>
+    <P8Rel/>
+    <P8Eco/>
+    <LiveInBuyer1>1 Yes</LiveInBuyer1>
+    <LiveInBuyer2/>
+    <LiveInOther/>
+  </Group>
+  <Group>
+    <P2Partner>0</P2Partner>
+    <P3Partner>0</P3Partner>
+    <P4Partner>0</P4Partner>
+    <P5Partner>0</P5Partner>
+    <P6Partner>0</P6Partner>
+    <P7Partner>0</P7Partner>
+    <P8Partner>0</P8Partner>
+    <Partner>0</Partner>
+    <P2AgeT>0</P2AgeT>
+    <P3AgeT>0</P3AgeT>
+    <P4AgeT>0</P4AgeT>
+    <P5AgeT>0</P5AgeT>
+    <P6AgeT>0</P6AgeT>
+    <P7AgeT>0</P7AgeT>
+    <P8AgeT>0</P8AgeT>
+    <P2SexT>0</P2SexT>
+    <P3SexT>0</P3SexT>
+    <P4SexT>0</P4SexT>
+    <P5SexT>0</P5SexT>
+    <P6SexT>0</P6SexT>
+    <P7SexT>0</P7SexT>
+    <P8SexT>0</P8SexT>
+    <P2RelT>0</P2RelT>
+    <P3RelT>0</P3RelT>
+    <P4RelT>0</P4RelT>
+    <P5RelT>0</P5RelT>
+    <P6RelT>0</P6RelT>
+    <P7RelT>0</P7RelT>
+    <P8RelT>0</P8RelT>
+    <P2EcoT>0</P2EcoT>
+    <P3EcoT>0</P3EcoT>
+    <P4EcoT>0</P4EcoT>
+    <P5EcoT>0</P5EcoT>
+    <P6EcoT>0</P6EcoT>
+    <P7EcoT>0</P7EcoT>
+    <P8EcoT>0</P8EcoT>
+    <P2HHoldT>0</P2HHoldT>
+    <P3HHoldT>0</P3HHoldT>
+    <P4HHoldT>0</P4HHoldT>
+    <P5HHoldT>0</P5HHoldT>
+    <P6HHoldT>0</P6HHoldT>
+    <P7HHoldT>0</P7HHoldT>
+    <P8HHoldT>0</P8HHoldT>
+    <P2PAge>0</P2PAge>
+    <P3PAge>0</P3PAge>
+    <P4PAge>0</P4PAge>
+    <P5PAge>0</P5PAge>
+    <P6PAge>0</P6PAge>
+    <P7PAge>0</P7PAge>
+    <P8PAge>0</P8PAge>
+    <PAGE/>
+    <Q30Answer/>
+    <P2Other>0</P2Other>
+    <P3Other>0</P3Other>
+    <P4Other>0</P4Other>
+    <P5Other>0</P5Other>
+    <P6Other>0</P6Other>
+    <P7Other>0</P7Other>
+    <P8Other>0</P8Other>
+    <Other>0</Other>
+    <P2RRefused>0</P2RRefused>
+    <P3RRefused>0</P3RRefused>
+    <P4RRefused>0</P4RRefused>
+    <P5RRefused>0</P5RRefused>
+    <P6RRefused>0</P6RRefused>
+    <P7RRefused>0</P7RRefused>
+    <P8RRefused>0</P8RRefused>
+    <TotRRefused>0</TotRRefused>
+    <CALCMORT>76000</CALCMORT>
+    <MORTGAGEUSED>1</MORTGAGEUSED>
+    <IM1>47000</IM1>
+    <IM2>0</IM2>
+    <IMT>235000</IMT>
+    <MortMultiple>0</MortMultiple>
+    <Form>300199</Form>
+  </Group>
+  <Group>
+    <minmaxP11/>
+    <minmaxP12/>
+    <minmaxP13/>
+    <minmaxP14/>
+    <minmaxP15/>
+    <minmaxP16/>
+    <minmaxP17/>
+    <minmaxP18/>
+    <minmaxP1T/>
+    <minmaxP19/>
+    <minmaxP10/>
+    <minmaxP21/>
+    <minmaxP22/>
+    <minmaxP23/>
+    <minmaxP24/>
+    <minmaxP25/>
+    <minmaxP26/>
+    <minmaxP27/>
+    <minmaxP28/>
+    <minmaxP2T/>
+    <minmaxP29/>
+    <minmaxP20/>
+    <Q16CHK>1</Q16CHK>
+    <Q30CHK>0</Q30CHK>
+    <Q38CHK>0</Q38CHK>
+    <SalesCHKT>1</SalesCHKT>
+    <Q23CHK>1</Q23CHK>
+    <Q16typeCHK>2</Q16typeCHK>
+    <Q16Q23>3</Q16Q23>
+    <DAY>17</DAY>
+    <MONTH>1</MONTH>
+    <YEAR>2023</YEAR>
+    <HODAY>6</HODAY>
+    <HOMONTH>9</HOMONTH>
+    <HOYEAR>2022</HOYEAR>
+    <EXDAY>8</EXDAY>
+    <EXMONTH>1</EXMONTH>
+    <EXYEAR>2023</EXYEAR>
+    <PPOSTC1>SW14</PPOSTC1>
+    <PPOSTC2>7QP</PPOSTC2>
+    <PCODE1>SW1A</PCODE1>
+    <PCODE2>1AA</PCODE2>
+    <NOINT/>
+  </Group>
+  <Group>
+    <Q6PrevTenure>2 Private registered provider (PRP) or housing association tenant</Q6PrevTenure>
+    <Q7Postcode override-field="">SW14 7QP</Q7Postcode>
+    <Q7UnknownPostcode/>
+    <Q7PrevLocation>Richmond-upon-Thames</Q7PrevLocation>
+    <Q7ONSLACode>E09000027</Q7ONSLACode>
     <PREGYRHA>Yes</PREGYRHA>
-    <PREGLA>Yes</PREGLA>
-    <PREGOTHER>Yes</PREGOTHER>
-    <PREGHBA>Yes</PREGHBA>
-    <ARMEDF>1 Yes</ARMEDF>
-    <HHMEMB>6</HHMEMB>
-    <TOTADULT>5</TOTADULT>
-    <TOTCHILD>1</TOTCHILD>
-    <LIVEINOTHER>4</LIVEINOTHER>
-    <!-- <PCODE1>LS16</PCODE1>
-    <PCODE2>6FT</PCODE2> -->
-    <HHTYPE>9 = other</HHTYPE>
-    <Q6PREVTENURE>1 Local authority tenant</Q6PREVTENURE>
-    <P3REL>Child</P3REL>
-    <P4REL>Other</P4REL>
-    <P5REL>Buyer prefers not to say</P5REL>
-    <P6REL>Buyer prefers not to say</P6REL>
-    <Q2A>4 Don’t know</Q2A>
-    <!-- not sure about q30a format /-->
-    <MORTGAGEUSED>1 Yes</MORTGAGEUSED>
-    <Q15WHEELCHAIR>1 Yes</Q15WHEELCHAIR>
-    <ARMEDFORCESSPOUSE>5 No</ARMEDFORCESSPOUSE>
-    <LEFTARMEDF>4 Yes</LEFTARMEDF>
-    <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
-    <Q24B>10</Q24B>
-    <Q34B></Q34B>
-    <Q41B></Q41B>
-    <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
-    <Q24AMORTGAGELENDER>5</Q24AMORTGAGELENDER>
-    <Q34AMORTGAGELENDER></Q34AMORTGAGELENDER>
-    <Q41AMORTGAGELENDER></Q41AMORTGAGELENDER>
-    <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
-    <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>
-    <Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER>
-    <Q25BORROWING>1 Yes</Q25BORROWING>
+    <PREGORHA/>
+    <PREGLA/>
+    <PREGHBA/>
+    <PREGOTHER/>
+  </Group>
+  <Group>
+    <ArmedF>8 Don&#x2019;t know</ArmedF>
+    <LeftArmedF/>
+    <ARMEDFORCESSPOUSE/>
+    <Disability>2 No</Disability>
+    <Q10Wheelchair override-field="">2 No</Q10Wheelchair>
+  </Group>
+  <Group>
+    <P1IncKnown>1 Yes</P1IncKnown>
+    <Q2Person1Income>47000</Q2Person1Income>
+    <Q2Person1Mortgage>1 Yes</Q2Person1Mortgage>
+    <P2IncKnown/>
+    <Q2Person2Income/>
+    <Q2Person2MortApplication/>
+    <Q2a>4 Don&#x2019;t know</Q2a>
+    <savingsKnown>1 Yes</savingsKnown>
+    <Q3Savings override-field="true">89000</Q3Savings>
+    <Q4PrevOwnedProperty/>
+  </Group>
+  <Group>
+    <Q16aProplen2/>
+    <Q17aStaircase>2 No</Q17aStaircase>
+    <PercentBought override-field=""/>
+    <PercentOwns>30</PercentOwns>
+    <Q17Resale>2 No</Q17Resale>
+    <Q18ContractExchange override-field="">2023-01-08</Q18ContractExchange>
+    <Q18PracticalCompletion override-field="">2022-09-06</Q18PracticalCompletion>
+    <Q19Rehoused>2 No</Q19Rehoused>
+    <Q20Bedrooms/>
+    <Q21PropertyType/>
+    <PrevRentType/>
+    <Q22PurchasePrice override-field="true">550000</Q22PurchasePrice>
+    <Q23Equity override-field="">30</Q23Equity>
+    <MortgageUsedSO>1 Yes</MortgageUsedSO>
+    <Q24Mortgage override-field="">76000</Q24Mortgage>
+    <Q24aMortgageLender>Nationwide</Q24aMortgageLender>
+    <Q24b>33</Q24b>
+    <Q25Borrowing>2 No</Q25Borrowing>
+    <Q26CashDeposit override-field="">89000</Q26CashDeposit>
+    <Q27SocialHomeBuy/>
+    <Q28MonthlyRent>912.00</Q28MonthlyRent>
+    <Q29MonthlyCharges>134.24</Q29MonthlyCharges>
+  </Group>
+  <Group>
+    <Q16aProplensec2/>
+    <Q31PurchasePrice override-field=""/>
+    <Q32Reductions override-field=""/>
+    <Q33Discount override-field=""/>
+    <MortgageUsedDO/>
+    <Q34Mortgage override-field=""/>
+    <Q34a/>
+    <Q34b/>
+    <Q35Borrowing/>
+    <Q36CashDeposit/>
+    <Q37MonthlyCharges/>
+  </Group>
+  <Group>
+    <Q40PurchasePrice override-field=""/>
+    <MortgageUsedOS/>
+    <Q41Mortgage override-field=""/>
+    <Q41aMortgageLender/>
+    <Q41b/>
+    <Q42Borrowing/>
+    <Q43CashDeposit override-field=""/>
+  </Group>
+  <Group>
+    <HHMEMB>1</HHMEMB>
+    <TOTADULT>1</TOTADULT>
+    <TOTCHILD>0</TOTCHILD>
+  </Group>
+  <Group>
+    <HHTYPE>3 = 1 adult</HHTYPE>
+  </Group>
+  <Group>
+    <DerSaleType>2 Shared Ownership</DerSaleType>
+  </Group>
+  <Group>
+    <HHTYPEP1A>1</HHTYPEP1A>
+    <HHTYPEP2A>0</HHTYPEP2A>
+    <HHTYPEP3A>0</HHTYPEP3A>
+    <HHTYPEP4A>0</HHTYPEP4A>
+    <HHTYPEP5A>0</HHTYPEP5A>
+    <HHTYPEP6A>0</HHTYPEP6A>
+    <HHTYPEP7A>0</HHTYPEP7A>
+    <HHTYPEP8A>0</HHTYPEP8A>
+    <TADULT>1</TADULT>
+    <HHTYPEP1E>0</HHTYPEP1E>
+    <HHTYPEP2E>0</HHTYPEP2E>
+    <HHTYPEP3E>0</HHTYPEP3E>
+    <HHTYPEP4E>0</HHTYPEP4E>
+    <HHTYPEP5E>0</HHTYPEP5E>
+    <HHTYPEP6E>0</HHTYPEP6E>
+    <HHTYPEP7E>0</HHTYPEP7E>
+    <HHTYPEP8E>0</HHTYPEP8E>
+    <TELDER>0</TELDER>
+    <HHTYPEP1C>0</HHTYPEP1C>
+    <HHTYPEP2C>0</HHTYPEP2C>
+    <HHTYPEP3C>0</HHTYPEP3C>
+    <HHTYPEP4C>0</HHTYPEP4C>
+    <HHTYPEP5C>0</HHTYPEP5C>
+    <HHTYPEP6C>0</HHTYPEP6C>
+    <HHTYPEP7C>0</HHTYPEP7C>
+    <HHTYPEP8C>0</HHTYPEP8C>
+    <TCHILD>0</TCHILD>
+    <Q8av>1</Q8av>
+    <Q8bv>0</Q8bv>
+    <Q8cv>0</Q8cv>
+    <Q8dv>0</Q8dv>
+    <Q8ev>0</Q8ev>
+    <Q8Validate>1</Q8Validate>
+  </Group>
+  <Group>
+    <PLOACODE/>
+    <OACODE/>
+    <GOVREG>E12000007</GOVREG>
+    <OWNINGORGID>1</OWNINGORGID>
+    <OWNINGORGNAME>1 Test</OWNINGORGNAME>
+    <HCNUM>655</HCNUM>
   </Group>
 </Group>
diff --git a/spec/fixtures/imports/sales_logs/166fc004-392e-47a8-acb8-1c018734882b.xml b/spec/fixtures/imports/sales_logs/166fc004-392e-47a8-acb8-1c018734882b.xml
index 42bfab90d..83c3f9a4c 100644
--- a/spec/fixtures/imports/sales_logs/166fc004-392e-47a8-acb8-1c018734882b.xml
+++ b/spec/fixtures/imports/sales_logs/166fc004-392e-47a8-acb8-1c018734882b.xml
@@ -1,112 +1,331 @@
-<Group xmlns="http://data.gov.uk/core/logs/2021-CORE-IR-GN" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!-- check metadata fields /-->
+<Group xmlns="http://data.gov.uk/core/logs/2022-CORE-Sales" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <meta:metadata xmlns:es="http://www.ecmascript.org/" xmlns:xqx="http://www.w3.org/2005/XQueryX" xmlns:XSLT="http://www.w3.org/1999/XSL/Transform/compile">
-    <meta:form-name>2022-CORE</meta:form-name>
+    <meta:form-name>2022-CORE-Sales</meta:form-name>
     <meta:document-id>166fc004-392e-47a8-acb8-1c018734882b</meta:document-id>
     <meta:owner-user-id>c3061a2e6ea0b702e6f6210d5c52d2a92612d2aa</meta:owner-user-id>
     <meta:owner-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:owner-institution-id>
     <meta:managing-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:managing-institution-id>
-    <meta:created-date>2022-04-12T14:10:59.953121Z</meta:created-date>
-    <meta:modified-date>2022-04-12T14:10:59.953121Z</meta:modified-date>
+    <meta:created-date>2023-02-21T11:48:28.255968Z</meta:created-date>
+    <meta:modified-date>2023-02-21T11:49:27.630543Z</meta:modified-date>
     <meta:status>submitted-valid</meta:status>
-    <meta:reporting-year>2021</meta:reporting-year>
+    <meta:reporting-year>2022</meta:reporting-year>
     <meta:upload-method>Manual Entry</meta:upload-method>
     <meta:schema assert-valid="true"/>
     <meta:rules assert-valid="true"/>
   </meta:metadata>
   <Group>
-    <OWNINGORGID>1</OWNINGORGID>
+    <Qdp>Yes</Qdp>
+    <CompletionDate>2023-01-17</CompletionDate>
+    <PurchaserCode>Shared ownership example</PurchaserCode>
+    <Ownership>1 Yes - a shared ownership scheme</Ownership>
+    <Q16SaleType>2 Shared Ownership</Q16SaleType>
+    <Q30SaleType/>
+    <Q38SaleType/>
+    <Q38OtherSale/>
+    <company>2 No</company>
+    <LiveInBuyer>1 Yes</LiveInBuyer>
+    <joint>2 No</joint>
+    <JointMore/>
+    <PartAPurchaser>2 Yes</PartAPurchaser>
   </Group>
   <Group>
-    <DAY>5</DAY>
-    <MONTH>11</MONTH>
-    <YEAR>2022</YEAR>
-    <OWNERSHIP>3 No - this is an outright or other sale</OWNERSHIP>
-    <DERSALETYPE>12 Other</DERSALETYPE>
-    <Q38OTHERSALE>other</Q38OTHERSALE>
-    <COMPANY>2 No</COMPANY>
-    <JOINT>1 Yes</JOINT>
-    <Q11BEDROOMS>2</Q11BEDROOMS>
-    <JOINTMORE>1 Yes</JOINTMORE>
-    <NOINT>2</NOINT>
-    <QDP>Yes</QDP>
-    <P1AGE>30</P1AGE>
-    <P1SEX>Non-binary</P1SEX>
-    <P1NAT>17 Republic of Ireland</P1NAT>
-    <LIVEINBUYER>1 Yes</LIVEINBUYER>
-    <LIVEINBUYER1>1 Yes</LIVEINBUYER1>
-    <P2REL>Partner</P2REL>
-    <Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE>
-    <P2AGE>35</P2AGE>
-    <Q13BUILDINGTYPE>1 Purpose built</Q13BUILDINGTYPE>
-    <P1ETH>3 White: Other</P1ETH>
-    <P2SEX>Non-binary</P2SEX>
-    <LIVEINBUYER2>1 Yes</LIVEINBUYER2>
-    <P1ECO>1 Full Time - 30 hours or more a week</P1ECO>
-    <P2ECO>1 Full Time - 30 hours or more a week</P2ECO>
-    <Q10WHEELCHAIR>1 Yes</Q10WHEELCHAIR>
-    <P3AGE>14</P3AGE>
-    <P4AGE>18</P4AGE>
-    <P5AGE>70</P5AGE>
-    <P6AGE>40</P6AGE>
-    <Q2PERSON1INCOME>75_000</Q2PERSON1INCOME>
-    <Q2PERSON1MORTGAGE>1 Yes</Q2PERSON1MORTGAGE>
-    <Q2PERSON2INCOME>10_000</Q2PERSON2INCOME>
-    <Q2PERSON2MORTAPPLICATION>1 Yes</Q2PERSON2MORTAPPLICATION>
-    <Q14ONSLACODE>E08000035</Q14ONSLACODE>
-    <savingsKnown>1 Yes</savingsKnown>
-    <Q3SAVINGS>100_000</Q3SAVINGS>
-    <Q4PREVOWNEDPROPERTY>1 Yes</Q4PREVOWNEDPROPERTY>
-    <P3SEX>Non-binary</P3SEX>
-    <P4SEX>Non-binary</P4SEX>
-    <P5SEX>Non-binary</P5SEX>
-    <P6SEX>Non-binary</P6SEX>
-    <CALCMORT>150_000</CALCMORT>
-    <P3ECO>9 Child under 16</P3ECO>
-    <P4ECO>3 In government training into work such as New Deal</P4ECO>
-    <P5ECO>5 Retired</P5ECO>
-    <P6ECO>1 Full Time - 30 hours or more a week</P6ECO>
-    <DISABILITY>1 Yes</DISABILITY>
-    <Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT>
-    <Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY>
-    <Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE>
-    <Q32REDUCTIONS></Q32REDUCTIONS>
-    <!-- not sure about q30a format /-->
-    <Q30A></Q30A>
+    <Q11Bedrooms override-field="">2</Q11Bedrooms>
+    <Q12PropertyType>1 Flat or maisonette</Q12PropertyType>
+    <Q13BuildingType>1 Purpose built</Q13BuildingType>
+    <Q14Postcode override-field="">SW1A 1AA</Q14Postcode>
+    <Q14PropertyLocation>Westminster</Q14PropertyLocation>
+    <Q14ONSLACode>E09000033</Q14ONSLACode>
+    <Q15Wheelchair>3 Don&#x2019;t know</Q15Wheelchair>
+  </Group>
+  <Group>
+    <P1Age>30</P1Age>
+    <P1Sex override-field="">Male</P1Sex>
+    <P1Eco>1 Full Time - 30 hours or more a week</P1Eco>
+    <P1Eth>2 White: Irish</P1Eth>
+    <P1Nat>18 United Kingdom</P1Nat>
+    <P2Age/>
+    <P2Sex override-field=""/>
+    <P2Rel/>
+    <P2Eco/>
+    <P3Age/>
+    <P3Sex override-field=""/>
+    <P3Rel/>
+    <P3Eco/>
+    <P4Age/>
+    <P4Sex override-field=""/>
+    <P4Rel/>
+    <P4Eco/>
+    <P5Age/>
+    <P5Sex override-field=""/>
+    <P5Rel/>
+    <P5Eco/>
+    <P6Age/>
+    <P6Sex override-field=""/>
+    <P6Rel/>
+    <P6Eco/>
+    <P7Age/>
+    <P7Sex override-field=""/>
+    <P7Rel/>
+    <P7Eco/>
+    <P8Age/>
+    <P8Sex override-field=""/>
+    <P8Rel/>
+    <P8Eco/>
+    <LiveInBuyer1>1 Yes</LiveInBuyer1>
+    <LiveInBuyer2/>
+    <LiveInOther/>
+  </Group>
+  <Group>
+    <P2Partner>0</P2Partner>
+    <P3Partner>0</P3Partner>
+    <P4Partner>0</P4Partner>
+    <P5Partner>0</P5Partner>
+    <P6Partner>0</P6Partner>
+    <P7Partner>0</P7Partner>
+    <P8Partner>0</P8Partner>
+    <Partner>0</Partner>
+    <P2AgeT>0</P2AgeT>
+    <P3AgeT>0</P3AgeT>
+    <P4AgeT>0</P4AgeT>
+    <P5AgeT>0</P5AgeT>
+    <P6AgeT>0</P6AgeT>
+    <P7AgeT>0</P7AgeT>
+    <P8AgeT>0</P8AgeT>
+    <P2SexT>0</P2SexT>
+    <P3SexT>0</P3SexT>
+    <P4SexT>0</P4SexT>
+    <P5SexT>0</P5SexT>
+    <P6SexT>0</P6SexT>
+    <P7SexT>0</P7SexT>
+    <P8SexT>0</P8SexT>
+    <P2RelT>0</P2RelT>
+    <P3RelT>0</P3RelT>
+    <P4RelT>0</P4RelT>
+    <P5RelT>0</P5RelT>
+    <P6RelT>0</P6RelT>
+    <P7RelT>0</P7RelT>
+    <P8RelT>0</P8RelT>
+    <P2EcoT>0</P2EcoT>
+    <P3EcoT>0</P3EcoT>
+    <P4EcoT>0</P4EcoT>
+    <P5EcoT>0</P5EcoT>
+    <P6EcoT>0</P6EcoT>
+    <P7EcoT>0</P7EcoT>
+    <P8EcoT>0</P8EcoT>
+    <P2HHoldT>0</P2HHoldT>
+    <P3HHoldT>0</P3HHoldT>
+    <P4HHoldT>0</P4HHoldT>
+    <P5HHoldT>0</P5HHoldT>
+    <P6HHoldT>0</P6HHoldT>
+    <P7HHoldT>0</P7HHoldT>
+    <P8HHoldT>0</P8HHoldT>
+    <P2PAge>0</P2PAge>
+    <P3PAge>0</P3PAge>
+    <P4PAge>0</P4PAge>
+    <P5PAge>0</P5PAge>
+    <P6PAge>0</P6PAge>
+    <P7PAge>0</P7PAge>
+    <P8PAge>0</P8PAge>
+    <PAGE/>
+    <Q30Answer/>
+    <P2Other>0</P2Other>
+    <P3Other>0</P3Other>
+    <P4Other>0</P4Other>
+    <P5Other>0</P5Other>
+    <P6Other>0</P6Other>
+    <P7Other>0</P7Other>
+    <P8Other>0</P8Other>
+    <Other>0</Other>
+    <P2RRefused>0</P2RRefused>
+    <P3RRefused>0</P3RRefused>
+    <P4RRefused>0</P4RRefused>
+    <P5RRefused>0</P5RRefused>
+    <P6RRefused>0</P6RRefused>
+    <P7RRefused>0</P7RRefused>
+    <P8RRefused>0</P8RRefused>
+    <TotRRefused>0</TotRRefused>
+    <CALCMORT>76000</CALCMORT>
+    <MORTGAGEUSED>1</MORTGAGEUSED>
+    <IM1>47000</IM1>
+    <IM2>0</IM2>
+    <IMT>235000</IMT>
+    <MortMultiple>0</MortMultiple>
+    <Form>300199</Form>
+  </Group>
+  <Group>
+    <minmaxP11/>
+    <minmaxP12/>
+    <minmaxP13/>
+    <minmaxP14/>
+    <minmaxP15/>
+    <minmaxP16/>
+    <minmaxP17/>
+    <minmaxP18/>
+    <minmaxP1T/>
+    <minmaxP19/>
+    <minmaxP10/>
+    <minmaxP21/>
+    <minmaxP22/>
+    <minmaxP23/>
+    <minmaxP24/>
+    <minmaxP25/>
+    <minmaxP26/>
+    <minmaxP27/>
+    <minmaxP28/>
+    <minmaxP2T/>
+    <minmaxP29/>
+    <minmaxP20/>
+    <Q16CHK>1</Q16CHK>
+    <Q30CHK>0</Q30CHK>
+    <Q38CHK>0</Q38CHK>
+    <SalesCHKT>1</SalesCHKT>
+    <Q23CHK>1</Q23CHK>
+    <Q16typeCHK>2</Q16typeCHK>
+    <Q16Q23>3</Q16Q23>
+    <DAY>17</DAY>
+    <MONTH>1</MONTH>
+    <YEAR>2023</YEAR>
+    <HODAY>6</HODAY>
+    <HOMONTH>9</HOMONTH>
+    <HOYEAR>2022</HOYEAR>
+    <EXDAY>8</EXDAY>
+    <EXMONTH>1</EXMONTH>
+    <EXYEAR>2023</EXYEAR>
+    <PPOSTC1>SW14</PPOSTC1>
+    <PPOSTC2>7QP</PPOSTC2>
+    <PCODE1>SW1A</PCODE1>
+    <PCODE2>1AA</PCODE2>
+    <NOINT/>
+  </Group>
+  <Group>
+    <Q6PrevTenure>2 Private registered provider (PRP) or housing association tenant</Q6PrevTenure>
+    <Q7Postcode override-field="">SW14 7QP</Q7Postcode>
+    <Q7UnknownPostcode/>
+    <Q7PrevLocation>Richmond-upon-Thames</Q7PrevLocation>
+    <Q7ONSLACode>E09000027</Q7ONSLACode>
     <PREGYRHA>Yes</PREGYRHA>
-    <PREGLA>Yes</PREGLA>
-    <PREGOTHER>Yes</PREGOTHER>
-    <PREGHBA>Yes</PREGHBA>
-    <ARMEDF>1 Yes</ARMEDF>
-    <HHMEMB>6</HHMEMB>
-    <TOTADULT>5</TOTADULT>
-    <TOTCHILD>1</TOTCHILD>
-    <LIVEINOTHER>4</LIVEINOTHER>
-    <!-- <PCODE1>LS16</PCODE1>
-    <PCODE2>6FT</PCODE2> -->
-    <HHTYPE>9 = other</HHTYPE>
-    <Q6PREVTENURE>1 Local authority tenant</Q6PREVTENURE>
-    <P3REL>Child</P3REL>
-    <P4REL>Other</P4REL>
-    <P5REL>Buyer prefers not to say</P5REL>
-    <P6REL>Buyer prefers not to say</P6REL>
-    <Q2A>4 Don’t know</Q2A>
-    <!-- not sure about q30a format /-->
-    <MORTGAGEUSED>1 Yes</MORTGAGEUSED>
-    <Q15WHEELCHAIR>1 Yes</Q15WHEELCHAIR>
-    <ARMEDFORCESSPOUSE>5 No</ARMEDFORCESSPOUSE>
-    <LEFTARMEDF>6 No they left more than 2 years ago</LEFTARMEDF>
-    <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
-    <Q24B></Q24B>
-    <Q34B></Q34B>
-    <Q41B>10</Q41B>
-    <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
-    <Q24AMORTGAGELENDER></Q24AMORTGAGELENDER>
-    <Q34AMORTGAGELENDER></Q34AMORTGAGELENDER>
-    <Q41AMORTGAGELENDER>5</Q41AMORTGAGELENDER>
-    <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
-    <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>
-    <Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER>
-    <Q25BORROWING>1 Yes</Q25BORROWING>
+    <PREGORHA/>
+    <PREGLA/>
+    <PREGHBA/>
+    <PREGOTHER/>
+  </Group>
+  <Group>
+    <ArmedF>8 Don&#x2019;t know</ArmedF>
+    <LeftArmedF/>
+    <ARMEDFORCESSPOUSE/>
+    <Disability>2 No</Disability>
+    <Q10Wheelchair override-field="">2 No</Q10Wheelchair>
+  </Group>
+  <Group>
+    <P1IncKnown>1 Yes</P1IncKnown>
+    <Q2Person1Income>47000</Q2Person1Income>
+    <Q2Person1Mortgage>1 Yes</Q2Person1Mortgage>
+    <P2IncKnown/>
+    <Q2Person2Income/>
+    <Q2Person2MortApplication/>
+    <Q2a>4 Don&#x2019;t know</Q2a>
+    <savingsKnown>1 Yes</savingsKnown>
+    <Q3Savings override-field="true">89000</Q3Savings>
+    <Q4PrevOwnedProperty/>
+  </Group>
+  <Group>
+    <Q16aProplen2/>
+    <Q17aStaircase>2 No</Q17aStaircase>
+    <PercentBought override-field=""/>
+    <PercentOwns>30</PercentOwns>
+    <Q17Resale>2 No</Q17Resale>
+    <Q18ContractExchange override-field="">2023-01-08</Q18ContractExchange>
+    <Q18PracticalCompletion override-field="">2022-09-06</Q18PracticalCompletion>
+    <Q19Rehoused>2 No</Q19Rehoused>
+    <Q20Bedrooms/>
+    <Q21PropertyType/>
+    <PrevRentType/>
+    <Q22PurchasePrice override-field="true">550000</Q22PurchasePrice>
+    <Q23Equity override-field="">30</Q23Equity>
+    <MortgageUsedSO>1 Yes</MortgageUsedSO>
+    <Q24Mortgage override-field="">76000</Q24Mortgage>
+    <Q24aMortgageLender>Nationwide</Q24aMortgageLender>
+    <Q24b>33</Q24b>
+    <Q25Borrowing>2 No</Q25Borrowing>
+    <Q26CashDeposit override-field="">89000</Q26CashDeposit>
+    <Q27SocialHomeBuy/>
+    <Q28MonthlyRent>912.00</Q28MonthlyRent>
+    <Q29MonthlyCharges>134.24</Q29MonthlyCharges>
+  </Group>
+  <Group>
+    <Q16aProplensec2/>
+    <Q31PurchasePrice override-field=""/>
+    <Q32Reductions override-field=""/>
+    <Q33Discount override-field=""/>
+    <MortgageUsedDO/>
+    <Q34Mortgage override-field=""/>
+    <Q34a/>
+    <Q34b/>
+    <Q35Borrowing/>
+    <Q36CashDeposit/>
+    <Q37MonthlyCharges/>
+  </Group>
+  <Group>
+    <Q40PurchasePrice override-field=""/>
+    <MortgageUsedOS/>
+    <Q41Mortgage override-field=""/>
+    <Q41aMortgageLender/>
+    <Q41b/>
+    <Q42Borrowing/>
+    <Q43CashDeposit override-field=""/>
+  </Group>
+  <Group>
+    <HHMEMB>1</HHMEMB>
+    <TOTADULT>1</TOTADULT>
+    <TOTCHILD>0</TOTCHILD>
+  </Group>
+  <Group>
+    <HHTYPE>3 = 1 adult</HHTYPE>
+  </Group>
+  <Group>
+    <DerSaleType>2 Shared Ownership</DerSaleType>
+  </Group>
+  <Group>
+    <HHTYPEP1A>1</HHTYPEP1A>
+    <HHTYPEP2A>0</HHTYPEP2A>
+    <HHTYPEP3A>0</HHTYPEP3A>
+    <HHTYPEP4A>0</HHTYPEP4A>
+    <HHTYPEP5A>0</HHTYPEP5A>
+    <HHTYPEP6A>0</HHTYPEP6A>
+    <HHTYPEP7A>0</HHTYPEP7A>
+    <HHTYPEP8A>0</HHTYPEP8A>
+    <TADULT>1</TADULT>
+    <HHTYPEP1E>0</HHTYPEP1E>
+    <HHTYPEP2E>0</HHTYPEP2E>
+    <HHTYPEP3E>0</HHTYPEP3E>
+    <HHTYPEP4E>0</HHTYPEP4E>
+    <HHTYPEP5E>0</HHTYPEP5E>
+    <HHTYPEP6E>0</HHTYPEP6E>
+    <HHTYPEP7E>0</HHTYPEP7E>
+    <HHTYPEP8E>0</HHTYPEP8E>
+    <TELDER>0</TELDER>
+    <HHTYPEP1C>0</HHTYPEP1C>
+    <HHTYPEP2C>0</HHTYPEP2C>
+    <HHTYPEP3C>0</HHTYPEP3C>
+    <HHTYPEP4C>0</HHTYPEP4C>
+    <HHTYPEP5C>0</HHTYPEP5C>
+    <HHTYPEP6C>0</HHTYPEP6C>
+    <HHTYPEP7C>0</HHTYPEP7C>
+    <HHTYPEP8C>0</HHTYPEP8C>
+    <TCHILD>0</TCHILD>
+    <Q8av>1</Q8av>
+    <Q8bv>0</Q8bv>
+    <Q8cv>0</Q8cv>
+    <Q8dv>0</Q8dv>
+    <Q8ev>0</Q8ev>
+    <Q8Validate>1</Q8Validate>
+  </Group>
+  <Group>
+    <PLOACODE/>
+    <OACODE/>
+    <GOVREG>E12000007</GOVREG>
+    <OWNINGORGID>1</OWNINGORGID>
+    <OWNINGORGNAME>1 Test</OWNINGORGNAME>
+    <HCNUM>655</HCNUM>
   </Group>
 </Group>
diff --git a/spec/fixtures/imports/sales_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml b/spec/fixtures/imports/sales_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml
index 57ade3297..47249accc 100644
--- a/spec/fixtures/imports/sales_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml
+++ b/spec/fixtures/imports/sales_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml
@@ -1,111 +1,331 @@
-<Group xmlns="http://data.gov.uk/core/logs/2021-CORE-IR-GN" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!-- check metadata fields /-->
+<Group xmlns="http://data.gov.uk/core/logs/2022-CORE-Sales" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <meta:metadata xmlns:es="http://www.ecmascript.org/" xmlns:xqx="http://www.w3.org/2005/XQueryX" xmlns:XSLT="http://www.w3.org/1999/XSL/Transform/compile">
-    <meta:form-name>2022-CORE</meta:form-name>
+    <meta:form-name>2022-CORE-Sales</meta:form-name>
     <meta:document-id>5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd</meta:document-id>
     <meta:owner-user-id>e29c492473446dca4d50224f2bb7cf965a261d6f</meta:owner-user-id>
     <meta:owner-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:owner-institution-id>
     <meta:managing-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:managing-institution-id>
-    <meta:created-date>2022-04-11T13:46:23.953121Z</meta:created-date>
-    <meta:modified-date>2022-04-11T13:46:23.953121Z</meta:modified-date>
+    <meta:created-date>2023-02-21T11:48:28.255968Z</meta:created-date>
+    <meta:modified-date>2023-02-21T11:49:27.630543Z</meta:modified-date>
     <meta:status>submitted-valid</meta:status>
-    <meta:reporting-year>2021</meta:reporting-year>
+    <meta:reporting-year>2022</meta:reporting-year>
     <meta:upload-method>Manual Entry</meta:upload-method>
     <meta:schema assert-valid="true"/>
     <meta:rules assert-valid="true"/>
   </meta:metadata>
   <Group>
-    <OWNINGORGID>1</OWNINGORGID>
+    <Qdp>Yes</Qdp>
+    <CompletionDate>2023-01-17</CompletionDate>
+    <PurchaserCode>Shared ownership example</PurchaserCode>
+    <Ownership>1 Yes - a shared ownership scheme</Ownership>
+    <Q16SaleType>2 Shared Ownership</Q16SaleType>
+    <Q30SaleType/>
+    <Q38SaleType/>
+    <Q38OtherSale/>
+    <company>2 No</company>
+    <LiveInBuyer>1 Yes</LiveInBuyer>
+    <joint>2 No</joint>
+    <JointMore/>
+    <PartAPurchaser>2 Yes</PartAPurchaser>
   </Group>
   <Group>
-<DAY>5</DAY>
-    <MONTH>11</MONTH>
-    <YEAR>2022</YEAR>
-    <OWNERSHIP>3 No - this is an outright or other sale</OWNERSHIP>
-    <DERSALETYPE>10 Outright</DERSALETYPE>
-    <COMPANY>2 No</COMPANY>
-    <JOINT>1 Yes</JOINT>
-    <Q11BEDROOMS>2</Q11BEDROOMS>
-    <JOINTMORE>1 Yes</JOINTMORE>
-    <NOINT>2</NOINT>
-    <QDP>Yes</QDP>
-    <P1AGE>30</P1AGE>
-    <P1SEX>Non-binary</P1SEX>
-    <P1NAT>17 Republic of Ireland</P1NAT>
-    <LIVEINBUYER>1 Yes</LIVEINBUYER>
-    <LIVEINBUYER1>1 Yes</LIVEINBUYER1>
-    <P2REL>Partner</P2REL>
-    <Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE>
-    <P2AGE>35</P2AGE>
-    <Q13BUILDINGTYPE>1 Purpose built</Q13BUILDINGTYPE>
-    <P1ETH></P1ETH>
-    <P2SEX></P2SEX>
-    <LIVEINBUYER2>1 Yes</LIVEINBUYER2>
-    <P1ECO>1 Full Time - 30 hours or more a week</P1ECO>
-    <P2ECO>1 Full Time - 30 hours or more a week</P2ECO>
-    <Q10WHEELCHAIR>1 Yes</Q10WHEELCHAIR>
-    <P3AGE>14</P3AGE>
-    <P4AGE>18</P4AGE>
-    <P5AGE>70</P5AGE>
-    <P6AGE>40</P6AGE>
-    <Q2PERSON1INCOME>75_000</Q2PERSON1INCOME>
-    <Q2PERSON1MORTGAGE>1 Yes</Q2PERSON1MORTGAGE>
-    <Q2PERSON2INCOME>10_000</Q2PERSON2INCOME>
-    <Q2PERSON2MORTAPPLICATION>1 Yes</Q2PERSON2MORTAPPLICATION>
-    <Q14ONSLACODE>E08000035</Q14ONSLACODE>
-    <savingsKnown>1 Yes</savingsKnown>
-    <Q3SAVINGS>100_000</Q3SAVINGS>
-    <Q4PREVOWNEDPROPERTY>1 Yes</Q4PREVOWNEDPROPERTY>
-    <P3SEX>Non-binary</P3SEX>
-    <P4SEX>Non-binary</P4SEX>
-    <P5SEX>Non-binary</P5SEX>
-    <P6SEX>Non-binary</P6SEX>
-    <CALCMORT>150_000</CALCMORT>
-    <P3ECO>9 Child under 16</P3ECO>
-    <P4ECO>3 In government training into work such as New Deal</P4ECO>
-    <P5ECO>5 Retired</P5ECO>
-    <P6ECO>1 Full Time - 30 hours or more a week</P6ECO>
-    <DISABILITY>1 Yes</DISABILITY>
-    <Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT>
-    <Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY>
-    <Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE>
-    <Q32REDUCTIONS></Q32REDUCTIONS>
-    <!-- not sure about q30a format /-->
-    <Q30A></Q30A>
+    <Q11Bedrooms override-field="">2</Q11Bedrooms>
+    <Q12PropertyType>1 Flat or maisonette</Q12PropertyType>
+    <Q13BuildingType>1 Purpose built</Q13BuildingType>
+    <Q14Postcode override-field="">SW1A 1AA</Q14Postcode>
+    <Q14PropertyLocation>Westminster</Q14PropertyLocation>
+    <Q14ONSLACode>E09000033</Q14ONSLACode>
+    <Q15Wheelchair>3 Don&#x2019;t know</Q15Wheelchair>
+  </Group>
+  <Group>
+    <P1Age>30</P1Age>
+    <P1Sex override-field="">Male</P1Sex>
+    <P1Eco>1 Full Time - 30 hours or more a week</P1Eco>
+    <P1Eth>2 White: Irish</P1Eth>
+    <P1Nat>18 United Kingdom</P1Nat>
+    <P2Age/>
+    <P2Sex override-field=""/>
+    <P2Rel/>
+    <P2Eco/>
+    <P3Age/>
+    <P3Sex override-field=""/>
+    <P3Rel/>
+    <P3Eco/>
+    <P4Age/>
+    <P4Sex override-field=""/>
+    <P4Rel/>
+    <P4Eco/>
+    <P5Age/>
+    <P5Sex override-field=""/>
+    <P5Rel/>
+    <P5Eco/>
+    <P6Age/>
+    <P6Sex override-field=""/>
+    <P6Rel/>
+    <P6Eco/>
+    <P7Age/>
+    <P7Sex override-field=""/>
+    <P7Rel/>
+    <P7Eco/>
+    <P8Age/>
+    <P8Sex override-field=""/>
+    <P8Rel/>
+    <P8Eco/>
+    <LiveInBuyer1>1 Yes</LiveInBuyer1>
+    <LiveInBuyer2/>
+    <LiveInOther/>
+  </Group>
+  <Group>
+    <P2Partner>0</P2Partner>
+    <P3Partner>0</P3Partner>
+    <P4Partner>0</P4Partner>
+    <P5Partner>0</P5Partner>
+    <P6Partner>0</P6Partner>
+    <P7Partner>0</P7Partner>
+    <P8Partner>0</P8Partner>
+    <Partner>0</Partner>
+    <P2AgeT>0</P2AgeT>
+    <P3AgeT>0</P3AgeT>
+    <P4AgeT>0</P4AgeT>
+    <P5AgeT>0</P5AgeT>
+    <P6AgeT>0</P6AgeT>
+    <P7AgeT>0</P7AgeT>
+    <P8AgeT>0</P8AgeT>
+    <P2SexT>0</P2SexT>
+    <P3SexT>0</P3SexT>
+    <P4SexT>0</P4SexT>
+    <P5SexT>0</P5SexT>
+    <P6SexT>0</P6SexT>
+    <P7SexT>0</P7SexT>
+    <P8SexT>0</P8SexT>
+    <P2RelT>0</P2RelT>
+    <P3RelT>0</P3RelT>
+    <P4RelT>0</P4RelT>
+    <P5RelT>0</P5RelT>
+    <P6RelT>0</P6RelT>
+    <P7RelT>0</P7RelT>
+    <P8RelT>0</P8RelT>
+    <P2EcoT>0</P2EcoT>
+    <P3EcoT>0</P3EcoT>
+    <P4EcoT>0</P4EcoT>
+    <P5EcoT>0</P5EcoT>
+    <P6EcoT>0</P6EcoT>
+    <P7EcoT>0</P7EcoT>
+    <P8EcoT>0</P8EcoT>
+    <P2HHoldT>0</P2HHoldT>
+    <P3HHoldT>0</P3HHoldT>
+    <P4HHoldT>0</P4HHoldT>
+    <P5HHoldT>0</P5HHoldT>
+    <P6HHoldT>0</P6HHoldT>
+    <P7HHoldT>0</P7HHoldT>
+    <P8HHoldT>0</P8HHoldT>
+    <P2PAge>0</P2PAge>
+    <P3PAge>0</P3PAge>
+    <P4PAge>0</P4PAge>
+    <P5PAge>0</P5PAge>
+    <P6PAge>0</P6PAge>
+    <P7PAge>0</P7PAge>
+    <P8PAge>0</P8PAge>
+    <PAGE/>
+    <Q30Answer/>
+    <P2Other>0</P2Other>
+    <P3Other>0</P3Other>
+    <P4Other>0</P4Other>
+    <P5Other>0</P5Other>
+    <P6Other>0</P6Other>
+    <P7Other>0</P7Other>
+    <P8Other>0</P8Other>
+    <Other>0</Other>
+    <P2RRefused>0</P2RRefused>
+    <P3RRefused>0</P3RRefused>
+    <P4RRefused>0</P4RRefused>
+    <P5RRefused>0</P5RRefused>
+    <P6RRefused>0</P6RRefused>
+    <P7RRefused>0</P7RRefused>
+    <P8RRefused>0</P8RRefused>
+    <TotRRefused>0</TotRRefused>
+    <CALCMORT>76000</CALCMORT>
+    <MORTGAGEUSED>1</MORTGAGEUSED>
+    <IM1>47000</IM1>
+    <IM2>0</IM2>
+    <IMT>235000</IMT>
+    <MortMultiple>0</MortMultiple>
+    <Form>300199</Form>
+  </Group>
+  <Group>
+    <minmaxP11/>
+    <minmaxP12/>
+    <minmaxP13/>
+    <minmaxP14/>
+    <minmaxP15/>
+    <minmaxP16/>
+    <minmaxP17/>
+    <minmaxP18/>
+    <minmaxP1T/>
+    <minmaxP19/>
+    <minmaxP10/>
+    <minmaxP21/>
+    <minmaxP22/>
+    <minmaxP23/>
+    <minmaxP24/>
+    <minmaxP25/>
+    <minmaxP26/>
+    <minmaxP27/>
+    <minmaxP28/>
+    <minmaxP2T/>
+    <minmaxP29/>
+    <minmaxP20/>
+    <Q16CHK>1</Q16CHK>
+    <Q30CHK>0</Q30CHK>
+    <Q38CHK>0</Q38CHK>
+    <SalesCHKT>1</SalesCHKT>
+    <Q23CHK>1</Q23CHK>
+    <Q16typeCHK>2</Q16typeCHK>
+    <Q16Q23>3</Q16Q23>
+    <DAY>17</DAY>
+    <MONTH>1</MONTH>
+    <YEAR>2023</YEAR>
+    <HODAY>6</HODAY>
+    <HOMONTH>9</HOMONTH>
+    <HOYEAR>2022</HOYEAR>
+    <EXDAY>8</EXDAY>
+    <EXMONTH>1</EXMONTH>
+    <EXYEAR>2023</EXYEAR>
+    <PPOSTC1>SW14</PPOSTC1>
+    <PPOSTC2>7QP</PPOSTC2>
+    <PCODE1>SW1A</PCODE1>
+    <PCODE2>1AA</PCODE2>
+    <NOINT/>
+  </Group>
+  <Group>
+    <Q6PrevTenure>2 Private registered provider (PRP) or housing association tenant</Q6PrevTenure>
+    <Q7Postcode override-field="">SW14 7QP</Q7Postcode>
+    <Q7UnknownPostcode/>
+    <Q7PrevLocation>Richmond-upon-Thames</Q7PrevLocation>
+    <Q7ONSLACode>E09000027</Q7ONSLACode>
     <PREGYRHA>Yes</PREGYRHA>
-    <PREGLA>Yes</PREGLA>
-    <PREGOTHER>Yes</PREGOTHER>
-    <PREGHBA>Yes</PREGHBA>
-    <ARMEDF>1 Yes</ARMEDF>
-    <HHMEMB>6</HHMEMB>
-    <TOTADULT>5</TOTADULT>
-    <TOTCHILD>1</TOTCHILD>
-    <LIVEINOTHER>4</LIVEINOTHER>
-    <!-- <PCODE1>LS16</PCODE1>
-    <PCODE2>6FT</PCODE2> -->
-    <HHTYPE>9 = other</HHTYPE>
-    <Q6PREVTENURE>1 Local authority tenant</Q6PREVTENURE>
-    <P3REL>Child</P3REL>
-    <P4REL>Other</P4REL>
-    <P5REL>Buyer prefers not to say</P5REL>
-    <P6REL>Buyer prefers not to say</P6REL>
-    <Q2A>4 Don’t know</Q2A>
-    <!-- not sure about q30a format /-->
-    <MORTGAGEUSED>1 Yes</MORTGAGEUSED>
-    <Q15WHEELCHAIR>1 Yes</Q15WHEELCHAIR>
-    <ARMEDFORCESSPOUSE>5 No</ARMEDFORCESSPOUSE>
-    <LEFTARMEDF>5 No they left up to and including 2 years ago</LEFTARMEDF>
-    <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
-    <Q24B></Q24B>
-    <Q34B></Q34B>
-    <Q41B>10</Q41B>
-    <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
-    <Q24AMORTGAGELENDER></Q24AMORTGAGELENDER>
-    <Q34AMORTGAGELENDER></Q34AMORTGAGELENDER>
-    <Q41AMORTGAGELENDER>5</Q41AMORTGAGELENDER>
-    <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
-    <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>
-    <Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER>
-    <Q25BORROWING>1 Yes</Q25BORROWING>
+    <PREGORHA/>
+    <PREGLA/>
+    <PREGHBA/>
+    <PREGOTHER/>
+  </Group>
+  <Group>
+    <ArmedF>8 Don&#x2019;t know</ArmedF>
+    <LeftArmedF/>
+    <ARMEDFORCESSPOUSE/>
+    <Disability>2 No</Disability>
+    <Q10Wheelchair override-field="">2 No</Q10Wheelchair>
+  </Group>
+  <Group>
+    <P1IncKnown>1 Yes</P1IncKnown>
+    <Q2Person1Income>47000</Q2Person1Income>
+    <Q2Person1Mortgage>1 Yes</Q2Person1Mortgage>
+    <P2IncKnown/>
+    <Q2Person2Income/>
+    <Q2Person2MortApplication/>
+    <Q2a>4 Don&#x2019;t know</Q2a>
+    <savingsKnown>1 Yes</savingsKnown>
+    <Q3Savings override-field="true">89000</Q3Savings>
+    <Q4PrevOwnedProperty/>
+  </Group>
+  <Group>
+    <Q16aProplen2/>
+    <Q17aStaircase>2 No</Q17aStaircase>
+    <PercentBought override-field=""/>
+    <PercentOwns>30</PercentOwns>
+    <Q17Resale>2 No</Q17Resale>
+    <Q18ContractExchange override-field="">2023-01-08</Q18ContractExchange>
+    <Q18PracticalCompletion override-field="">2022-09-06</Q18PracticalCompletion>
+    <Q19Rehoused>2 No</Q19Rehoused>
+    <Q20Bedrooms/>
+    <Q21PropertyType/>
+    <PrevRentType/>
+    <Q22PurchasePrice override-field="true">550000</Q22PurchasePrice>
+    <Q23Equity override-field="">30</Q23Equity>
+    <MortgageUsedSO>1 Yes</MortgageUsedSO>
+    <Q24Mortgage override-field="">76000</Q24Mortgage>
+    <Q24aMortgageLender>Nationwide</Q24aMortgageLender>
+    <Q24b>33</Q24b>
+    <Q25Borrowing>2 No</Q25Borrowing>
+    <Q26CashDeposit override-field="">89000</Q26CashDeposit>
+    <Q27SocialHomeBuy/>
+    <Q28MonthlyRent>912.00</Q28MonthlyRent>
+    <Q29MonthlyCharges>134.24</Q29MonthlyCharges>
+  </Group>
+  <Group>
+    <Q16aProplensec2/>
+    <Q31PurchasePrice override-field=""/>
+    <Q32Reductions override-field=""/>
+    <Q33Discount override-field=""/>
+    <MortgageUsedDO/>
+    <Q34Mortgage override-field=""/>
+    <Q34a/>
+    <Q34b/>
+    <Q35Borrowing/>
+    <Q36CashDeposit/>
+    <Q37MonthlyCharges/>
+  </Group>
+  <Group>
+    <Q40PurchasePrice override-field=""/>
+    <MortgageUsedOS/>
+    <Q41Mortgage override-field=""/>
+    <Q41aMortgageLender/>
+    <Q41b/>
+    <Q42Borrowing/>
+    <Q43CashDeposit override-field=""/>
+  </Group>
+  <Group>
+    <HHMEMB>1</HHMEMB>
+    <TOTADULT>1</TOTADULT>
+    <TOTCHILD>0</TOTCHILD>
+  </Group>
+  <Group>
+    <HHTYPE>3 = 1 adult</HHTYPE>
+  </Group>
+  <Group>
+    <DerSaleType>2 Shared Ownership</DerSaleType>
+  </Group>
+  <Group>
+    <HHTYPEP1A>1</HHTYPEP1A>
+    <HHTYPEP2A>0</HHTYPEP2A>
+    <HHTYPEP3A>0</HHTYPEP3A>
+    <HHTYPEP4A>0</HHTYPEP4A>
+    <HHTYPEP5A>0</HHTYPEP5A>
+    <HHTYPEP6A>0</HHTYPEP6A>
+    <HHTYPEP7A>0</HHTYPEP7A>
+    <HHTYPEP8A>0</HHTYPEP8A>
+    <TADULT>1</TADULT>
+    <HHTYPEP1E>0</HHTYPEP1E>
+    <HHTYPEP2E>0</HHTYPEP2E>
+    <HHTYPEP3E>0</HHTYPEP3E>
+    <HHTYPEP4E>0</HHTYPEP4E>
+    <HHTYPEP5E>0</HHTYPEP5E>
+    <HHTYPEP6E>0</HHTYPEP6E>
+    <HHTYPEP7E>0</HHTYPEP7E>
+    <HHTYPEP8E>0</HHTYPEP8E>
+    <TELDER>0</TELDER>
+    <HHTYPEP1C>0</HHTYPEP1C>
+    <HHTYPEP2C>0</HHTYPEP2C>
+    <HHTYPEP3C>0</HHTYPEP3C>
+    <HHTYPEP4C>0</HHTYPEP4C>
+    <HHTYPEP5C>0</HHTYPEP5C>
+    <HHTYPEP6C>0</HHTYPEP6C>
+    <HHTYPEP7C>0</HHTYPEP7C>
+    <HHTYPEP8C>0</HHTYPEP8C>
+    <TCHILD>0</TCHILD>
+    <Q8av>1</Q8av>
+    <Q8bv>0</Q8bv>
+    <Q8cv>0</Q8cv>
+    <Q8dv>0</Q8dv>
+    <Q8ev>0</Q8ev>
+    <Q8Validate>1</Q8Validate>
+  </Group>
+  <Group>
+    <PLOACODE/>
+    <OACODE/>
+    <GOVREG>E12000007</GOVREG>
+    <OWNINGORGID>1</OWNINGORGID>
+    <OWNINGORGNAME>1 Test</OWNINGORGNAME>
+    <HCNUM>655</HCNUM>
   </Group>
 </Group>
diff --git a/spec/fixtures/imports/sales_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml b/spec/fixtures/imports/sales_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml
index 4a2f9218d..61063c217 100644
--- a/spec/fixtures/imports/sales_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml
+++ b/spec/fixtures/imports/sales_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml
@@ -1,13 +1,12 @@
-<Group xmlns="http://data.gov.uk/core/logs/2021-CORE-IR-GN" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <!-- check metadata fields /-->
+<Group xmlns="http://data.gov.uk/core/logs/2022-CORE-Sales" xmlns:app="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:meta="http://data.gov.uk/core/metadata" xmlns:svc="http://www.w3.org/2007/app" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xfimpl="http://www.w3.org/2002/xforms/implementation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <meta:metadata xmlns:es="http://www.ecmascript.org/" xmlns:xqx="http://www.w3.org/2005/XQueryX" xmlns:XSLT="http://www.w3.org/1999/XSL/Transform/compile">
-    <meta:form-name>2022-CORE=</meta:form-name>
+    <meta:form-name>2022-CORE-Sales</meta:form-name>
     <meta:document-id>893ufj2s-lq77-42m4-rty6-ej09gh585uy1</meta:document-id>
     <meta:owner-user-id>c3061a2e6ea0b702e6f6210d5c52d2a92612d2aa</meta:owner-user-id>
     <meta:owner-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:owner-institution-id>
     <meta:managing-institution-id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</meta:managing-institution-id>
-    <meta:created-date>2022-04-11T13:46:23.953121Z</meta:created-date>
-    <meta:modified-date>2022-04-11T13:46:23.953121Z</meta:modified-date>
+    <meta:created-date>2023-02-21T11:48:28.255968Z</meta:created-date>
+    <meta:modified-date>2023-02-21T11:49:27.630543Z</meta:modified-date>
     <meta:status>submitted-valid</meta:status>
     <meta:reporting-year>2022</meta:reporting-year>
     <meta:upload-method>Manual Entry</meta:upload-method>
@@ -15,96 +14,318 @@
     <meta:rules assert-valid="true"/>
   </meta:metadata>
   <Group>
-    <OWNINGORGID>1</OWNINGORGID>
+    <Qdp>Yes</Qdp>
+    <CompletionDate>2023-01-17</CompletionDate>
+    <PurchaserCode>Shared ownership example</PurchaserCode>
+    <Ownership>1 Yes - a shared ownership scheme</Ownership>
+    <Q16SaleType>2 Shared Ownership</Q16SaleType>
+    <Q30SaleType/>
+    <Q38SaleType/>
+    <Q38OtherSale/>
+    <company>2 No</company>
+    <LiveInBuyer>1 Yes</LiveInBuyer>
+    <joint>2 No</joint>
+    <JointMore/>
+    <PartAPurchaser>2 Yes</PartAPurchaser>
   </Group>
   <Group>
-<DAY>5</DAY>
-    <MONTH>11</MONTH>
-    <YEAR>2022</YEAR>
-    <OWNERSHIP>2 Yes - a discount ownership scheme</OWNERSHIP>
-    <DERSALETYPE>8 Right to Acquire (RTA)</DERSALETYPE>
-    <COMPANY></COMPANY>
-    <JOINT>1 Yes</JOINT>
-    <Q11BEDROOMS>2</Q11BEDROOMS>
-    <JOINTMORE>1 Yes</JOINTMORE>
-    <NOINT>2</NOINT>
-    <QDP>Yes</QDP>
-    <P1AGE>30</P1AGE>
-    <P1SEX>Non-binary</P1SEX>
-    <P1NAT>17 Republic of Ireland</P1NAT>
-    <LIVEINBUYER1>1 Yes</LIVEINBUYER1>
-    <P2REL>Partner</P2REL>
-    <Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE>
-    <P2AGE>35</P2AGE>
-    <Q13BUILDINGTYPE>1 Purpose built</Q13BUILDINGTYPE>
-    <P1ETH>3 White: Other</P1ETH>
-    <P2SEX>Non-binary</P2SEX>
-    <LIVEINBUYER2>1 Yes</LIVEINBUYER2>
-    <P1ECO>1 Full Time - 30 hours or more a week</P1ECO>
-    <P2ECO>1 Full Time - 30 hours or more a week</P2ECO>
-    <Q10WHEELCHAIR>1 Yes</Q10WHEELCHAIR>
-    <P3AGE>14</P3AGE>
-    <P4AGE>18</P4AGE>
-    <P5AGE>70</P5AGE>
-    <P6AGE>40</P6AGE>
-    <Q2PERSON1INCOME>75_000</Q2PERSON1INCOME>
-    <Q2PERSON1MORTGAGE>1 Yes</Q2PERSON1MORTGAGE>
-    <Q2PERSON2INCOME></Q2PERSON2INCOME>
-    <Q2PERSON2MORTAPPLICATION>1 Yes</Q2PERSON2MORTAPPLICATION>
-    <Q14ONSLACODE>E08000035</Q14ONSLACODE>
-    <savingsKnown>1 Yes</savingsKnown>
-    <Q3SAVINGS>100_000</Q3SAVINGS>
-    <Q4PREVOWNEDPROPERTY>1 Yes</Q4PREVOWNEDPROPERTY>
-    <P3SEX>Non-binary</P3SEX>
-    <P4SEX>Non-binary</P4SEX>
-    <P5SEX>Non-binary</P5SEX>
-    <P6SEX>Non-binary</P6SEX>
-    <CALCMORT></CALCMORT>
-    <P3ECO>9 Child under 16</P3ECO>
-    <P4ECO>3 In government training into work such as New Deal</P4ECO>
-    <P5ECO>5 Retired</P5ECO>
-    <P6ECO>1 Full Time - 30 hours or more a week</P6ECO>
-    <DISABILITY>1 Yes</DISABILITY>
-    <Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT>
-    <Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY>
-    <Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE>
-    <Q32REDUCTIONS>10_000</Q32REDUCTIONS>
-    <!-- not sure about q30a format /-->
-    <Q30A>10</Q30A>
+    <Q11Bedrooms override-field="">2</Q11Bedrooms>
+    <Q12PropertyType>1 Flat or maisonette</Q12PropertyType>
+    <Q13BuildingType>1 Purpose built</Q13BuildingType>
+    <Q14Postcode override-field="">SW1A 1AA</Q14Postcode>
+    <Q14PropertyLocation>Westminster</Q14PropertyLocation>
+    <Q14ONSLACode>E09000033</Q14ONSLACode>
+    <Q15Wheelchair>3 Don&#x2019;t know</Q15Wheelchair>
+  </Group>
+  <Group>
+    <P1Age>30</P1Age>
+    <P1Sex override-field="">Male</P1Sex>
+    <P1Eco>1 Full Time - 30 hours or more a week</P1Eco>
+    <P1Eth>2 White: Irish</P1Eth>
+    <P1Nat>18 United Kingdom</P1Nat>
+    <P2Age/>
+    <P2Sex override-field=""/>
+    <P2Rel/>
+    <P2Eco/>
+    <P3Age/>
+    <P3Sex override-field=""/>
+    <P3Rel/>
+    <P3Eco/>
+    <P4Age/>
+    <P4Sex override-field=""/>
+    <P4Rel/>
+    <P4Eco/>
+    <P5Age/>
+    <P5Sex override-field=""/>
+    <P5Rel/>
+    <P5Eco/>
+    <P6Age/>
+    <P6Sex override-field=""/>
+    <P6Rel/>
+    <P6Eco/>
+    <P7Age/>
+    <P7Sex override-field=""/>
+    <P7Rel/>
+    <P7Eco/>
+    <P8Age/>
+    <P8Sex override-field=""/>
+    <P8Rel/>
+    <P8Eco/>
+    <LiveInBuyer1>1 Yes</LiveInBuyer1>
+    <LiveInBuyer2/>
+    <LiveInOther/>
+  </Group>
+  <Group>
+    <P2Partner>0</P2Partner>
+    <P3Partner>0</P3Partner>
+    <P4Partner>0</P4Partner>
+    <P5Partner>0</P5Partner>
+    <P6Partner>0</P6Partner>
+    <P7Partner>0</P7Partner>
+    <P8Partner>0</P8Partner>
+    <Partner>0</Partner>
+    <P2AgeT>0</P2AgeT>
+    <P3AgeT>0</P3AgeT>
+    <P4AgeT>0</P4AgeT>
+    <P5AgeT>0</P5AgeT>
+    <P6AgeT>0</P6AgeT>
+    <P7AgeT>0</P7AgeT>
+    <P8AgeT>0</P8AgeT>
+    <P2SexT>0</P2SexT>
+    <P3SexT>0</P3SexT>
+    <P4SexT>0</P4SexT>
+    <P5SexT>0</P5SexT>
+    <P6SexT>0</P6SexT>
+    <P7SexT>0</P7SexT>
+    <P8SexT>0</P8SexT>
+    <P2RelT>0</P2RelT>
+    <P3RelT>0</P3RelT>
+    <P4RelT>0</P4RelT>
+    <P5RelT>0</P5RelT>
+    <P6RelT>0</P6RelT>
+    <P7RelT>0</P7RelT>
+    <P8RelT>0</P8RelT>
+    <P2EcoT>0</P2EcoT>
+    <P3EcoT>0</P3EcoT>
+    <P4EcoT>0</P4EcoT>
+    <P5EcoT>0</P5EcoT>
+    <P6EcoT>0</P6EcoT>
+    <P7EcoT>0</P7EcoT>
+    <P8EcoT>0</P8EcoT>
+    <P2HHoldT>0</P2HHoldT>
+    <P3HHoldT>0</P3HHoldT>
+    <P4HHoldT>0</P4HHoldT>
+    <P5HHoldT>0</P5HHoldT>
+    <P6HHoldT>0</P6HHoldT>
+    <P7HHoldT>0</P7HHoldT>
+    <P8HHoldT>0</P8HHoldT>
+    <P2PAge>0</P2PAge>
+    <P3PAge>0</P3PAge>
+    <P4PAge>0</P4PAge>
+    <P5PAge>0</P5PAge>
+    <P6PAge>0</P6PAge>
+    <P7PAge>0</P7PAge>
+    <P8PAge>0</P8PAge>
+    <PAGE/>
+    <Q30Answer/>
+    <P2Other>0</P2Other>
+    <P3Other>0</P3Other>
+    <P4Other>0</P4Other>
+    <P5Other>0</P5Other>
+    <P6Other>0</P6Other>
+    <P7Other>0</P7Other>
+    <P8Other>0</P8Other>
+    <Other>0</Other>
+    <P2RRefused>0</P2RRefused>
+    <P3RRefused>0</P3RRefused>
+    <P4RRefused>0</P4RRefused>
+    <P5RRefused>0</P5RRefused>
+    <P6RRefused>0</P6RRefused>
+    <P7RRefused>0</P7RRefused>
+    <P8RRefused>0</P8RRefused>
+    <TotRRefused>0</TotRRefused>
+    <CALCMORT>76000</CALCMORT>
+    <MORTGAGEUSED>1</MORTGAGEUSED>
+    <IM1>47000</IM1>
+    <IM2>0</IM2>
+    <IMT>235000</IMT>
+    <MortMultiple>0</MortMultiple>
+    <Form>300199</Form>
+  </Group>
+  <Group>
+    <minmaxP11/>
+    <minmaxP12/>
+    <minmaxP13/>
+    <minmaxP14/>
+    <minmaxP15/>
+    <minmaxP16/>
+    <minmaxP17/>
+    <minmaxP18/>
+    <minmaxP1T/>
+    <minmaxP19/>
+    <minmaxP10/>
+    <minmaxP21/>
+    <minmaxP22/>
+    <minmaxP23/>
+    <minmaxP24/>
+    <minmaxP25/>
+    <minmaxP26/>
+    <minmaxP27/>
+    <minmaxP28/>
+    <minmaxP2T/>
+    <minmaxP29/>
+    <minmaxP20/>
+    <Q16CHK>1</Q16CHK>
+    <Q30CHK>0</Q30CHK>
+    <Q38CHK>0</Q38CHK>
+    <SalesCHKT>1</SalesCHKT>
+    <Q23CHK>1</Q23CHK>
+    <Q16typeCHK>2</Q16typeCHK>
+    <Q16Q23>3</Q16Q23>
+    <DAY>17</DAY>
+    <MONTH>1</MONTH>
+    <YEAR>2023</YEAR>
+    <HODAY>6</HODAY>
+    <HOMONTH>9</HOMONTH>
+    <HOYEAR>2022</HOYEAR>
+    <EXDAY>8</EXDAY>
+    <EXMONTH>1</EXMONTH>
+    <EXYEAR>2023</EXYEAR>
+    <PPOSTC1>SW14</PPOSTC1>
+    <PPOSTC2>7QP</PPOSTC2>
+    <PCODE1>SW1A</PCODE1>
+    <PCODE2>1AA</PCODE2>
+    <NOINT/>
+  </Group>
+  <Group>
+    <Q6PrevTenure>2 Private registered provider (PRP) or housing association tenant</Q6PrevTenure>
+    <Q7Postcode override-field="">SW14 7QP</Q7Postcode>
+    <Q7UnknownPostcode/>
+    <Q7PrevLocation>Richmond-upon-Thames</Q7PrevLocation>
+    <Q7ONSLACode>E09000027</Q7ONSLACode>
     <PREGYRHA>Yes</PREGYRHA>
-    <PREGLA>Yes</PREGLA>
-    <PREGOTHER>Yes</PREGOTHER>
-    <PREGHBA>Yes</PREGHBA>
-    <ARMEDF>1 Yes</ARMEDF>
-    <HHMEMB>6</HHMEMB>
-    <TOTADULT>5</TOTADULT>
-    <TOTCHILD>1</TOTCHILD>
-    <LIVEINOTHER>4</LIVEINOTHER>
-    <!-- <PCODE1>LS16</PCODE1>
-    <PCODE2>6FT</PCODE2> -->
-    <HHTYPE>9 = other</HHTYPE>
-    <Q6PREVTENURE>1 Local authority tenant</Q6PREVTENURE>
-    <P3REL>Child</P3REL>
-    <P4REL>Other</P4REL>
-    <P5REL>Buyer prefers not to say</P5REL>
-    <P6REL>Buyer prefers not to say</P6REL>
-    <Q2A>4 Don’t know</Q2A>
-    <!-- not sure about q30a format /-->
-    <MORTGAGEUSED>1 Yes</MORTGAGEUSED>
-    <Q15WHEELCHAIR>1 Yes</Q15WHEELCHAIR>
-    <ARMEDFORCESSPOUSE>5 No</ARMEDFORCESSPOUSE>
-    <LEFTARMEDF>6 No they left more than 2 years ago</LEFTARMEDF>
-    <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
-    <Q24B></Q24B>
-    <Q34B>10</Q34B>
-    <Q41B></Q41B>
-    <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
-    <Q24AMORTGAGELENDER></Q24AMORTGAGELENDER>
-    <Q34AMORTGAGELENDER>5</Q34AMORTGAGELENDER>
-    <Q41AMORTGAGELENDER></Q41AMORTGAGELENDER>
-    <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
-    <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>
-    <Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER>
-    <Q25BORROWING>1 Yes</Q25BORROWING>
+    <PREGORHA/>
+    <PREGLA/>
+    <PREGHBA/>
+    <PREGOTHER/>
+  </Group>
+  <Group>
+    <ArmedF>8 Don&#x2019;t know</ArmedF>
+    <LeftArmedF/>
+    <ARMEDFORCESSPOUSE/>
+    <Disability>2 No</Disability>
+    <Q10Wheelchair override-field="">2 No</Q10Wheelchair>
+  </Group>
+  <Group>
+    <P1IncKnown>1 Yes</P1IncKnown>
+    <Q2Person1Income>47000</Q2Person1Income>
+    <Q2Person1Mortgage>1 Yes</Q2Person1Mortgage>
+    <P2IncKnown/>
+    <Q2Person2Income/>
+    <Q2Person2MortApplication/>
+    <Q2a>4 Don&#x2019;t know</Q2a>
+    <savingsKnown>1 Yes</savingsKnown>
+    <Q3Savings override-field="true">89000</Q3Savings>
+    <Q4PrevOwnedProperty/>
+  </Group>
+  <Group>
+    <Q16aProplen2/>
+    <Q17aStaircase>2 No</Q17aStaircase>
+    <PercentBought override-field=""/>
+    <PercentOwns>30</PercentOwns>
+    <Q17Resale>2 No</Q17Resale>
+    <Q18ContractExchange override-field="">2023-01-08</Q18ContractExchange>
+    <Q18PracticalCompletion override-field="">2022-09-06</Q18PracticalCompletion>
+    <Q19Rehoused>2 No</Q19Rehoused>
+    <Q20Bedrooms/>
+    <Q21PropertyType/>
+    <PrevRentType/>
+    <Q22PurchasePrice override-field="true">550000</Q22PurchasePrice>
+    <Q23Equity override-field="">30</Q23Equity>
+    <MortgageUsedSO>1 Yes</MortgageUsedSO>
+    <Q24Mortgage override-field="">76000</Q24Mortgage>
+    <Q24aMortgageLender>Nationwide</Q24aMortgageLender>
+    <Q24b>33</Q24b>
+    <Q25Borrowing>2 No</Q25Borrowing>
+    <Q26CashDeposit override-field="">89000</Q26CashDeposit>
+    <Q27SocialHomeBuy/>
+    <Q28MonthlyRent>912.00</Q28MonthlyRent>
+    <Q29MonthlyCharges>134.24</Q29MonthlyCharges>
+  </Group>
+  <Group>
+    <Q16aProplensec2/>
+    <Q31PurchasePrice override-field=""/>
+    <Q32Reductions override-field=""/>
+    <Q33Discount override-field=""/>
+    <MortgageUsedDO/>
+    <Q34Mortgage override-field=""/>
+    <Q34a/>
+    <Q34b/>
+    <Q35Borrowing/>
+    <Q36CashDeposit/>
+    <Q37MonthlyCharges/>
+  </Group>
+  <Group>
+    <Q40PurchasePrice override-field=""/>
+    <MortgageUsedOS/>
+    <Q41Mortgage override-field=""/>
+    <Q41aMortgageLender/>
+    <Q41b/>
+    <Q42Borrowing/>
+    <Q43CashDeposit override-field=""/>
+  </Group>
+  <Group>
+    <HHMEMB>1</HHMEMB>
+    <TOTADULT>1</TOTADULT>
+    <TOTCHILD>0</TOTCHILD>
+  </Group>
+  <Group>
+    <HHTYPE>3 = 1 adult</HHTYPE>
+  </Group>
+  <Group>
+    <DerSaleType>2 Shared Ownership</DerSaleType>
+  </Group>
+  <Group>
+    <HHTYPEP1A>1</HHTYPEP1A>
+    <HHTYPEP2A>0</HHTYPEP2A>
+    <HHTYPEP3A>0</HHTYPEP3A>
+    <HHTYPEP4A>0</HHTYPEP4A>
+    <HHTYPEP5A>0</HHTYPEP5A>
+    <HHTYPEP6A>0</HHTYPEP6A>
+    <HHTYPEP7A>0</HHTYPEP7A>
+    <HHTYPEP8A>0</HHTYPEP8A>
+    <TADULT>1</TADULT>
+    <HHTYPEP1E>0</HHTYPEP1E>
+    <HHTYPEP2E>0</HHTYPEP2E>
+    <HHTYPEP3E>0</HHTYPEP3E>
+    <HHTYPEP4E>0</HHTYPEP4E>
+    <HHTYPEP5E>0</HHTYPEP5E>
+    <HHTYPEP6E>0</HHTYPEP6E>
+    <HHTYPEP7E>0</HHTYPEP7E>
+    <HHTYPEP8E>0</HHTYPEP8E>
+    <TELDER>0</TELDER>
+    <HHTYPEP1C>0</HHTYPEP1C>
+    <HHTYPEP2C>0</HHTYPEP2C>
+    <HHTYPEP3C>0</HHTYPEP3C>
+    <HHTYPEP4C>0</HHTYPEP4C>
+    <HHTYPEP5C>0</HHTYPEP5C>
+    <HHTYPEP6C>0</HHTYPEP6C>
+    <HHTYPEP7C>0</HHTYPEP7C>
+    <HHTYPEP8C>0</HHTYPEP8C>
+    <TCHILD>0</TCHILD>
+    <Q8av>1</Q8av>
+    <Q8bv>0</Q8bv>
+    <Q8cv>0</Q8cv>
+    <Q8dv>0</Q8dv>
+    <Q8ev>0</Q8ev>
+    <Q8Validate>1</Q8Validate>
+  </Group>
+  <Group>
+    <PLOACODE/>
+    <OACODE/>
+    <GOVREG>E12000007</GOVREG>
+    <OWNINGORGID>1</OWNINGORGID>
+    <OWNINGORGNAME>1 Test</OWNINGORGNAME>
+    <HCNUM>655</HCNUM>
   </Group>
 </Group>