diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 32b8440e1..c5c60fa46 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1123,7 +1123,6 @@
                   "header": "do_you_know_the_postcode?",
                   "hint_text": "",
                   "type": "radio",
-                  "store": "false",
                   "answer_options": {
                     "0": "Yes",
                     "1": "No"
@@ -1160,7 +1159,7 @@
               "header": "",
               "description": "",
               "questions": {
-                "select_local_authority": {
+                "la": {
                   "check_answer_label": "Local Authority",
                   "header": "Select a local authority",
                   "hint_text": "",
@@ -1510,7 +1509,8 @@
                     "0": "Yes",
                     "1": "No"
                   }
-                }
+                },
+                "depends_on": { "renewal": "Not Renewal"}
               }
             },
             "type_property_most_recently_let_as": {
@@ -1530,7 +1530,7 @@
                   }
                 }
               },
-              "depends_on": { "first_time_property_let_as_social_housing": "No" }
+              "depends_on": { "first_time_property_let_as_social_housing": "No", "renewal": "Not Renewal" }
             },
             "property_vacancy_reason_not_first_let": {
               "header": "",
@@ -1556,7 +1556,7 @@
                   }
                 }
               },
-              "depends_on": { "first_time_property_let_as_social_housing": "No" }
+              "depends_on": { "first_time_property_let_as_social_housing": "No", "renewal": "Not Renewal" }
             },
             "property_vacancy_reason_first_let": {
               "header": "",
@@ -1574,7 +1574,7 @@
                   }
                 }
               },
-              "depends_on": { "first_time_property_let_as_social_housing": "Yes" }
+              "depends_on": { "first_time_property_let_as_social_housing": "Yes", "renewal": "Not Renewal" }
             },
             "property_number_of_times_relet_not_social_let": {
               "header": "",
@@ -1590,7 +1590,7 @@
                   "step": 1
                 }
               },
-              "depends_on": { "first_time_property_let_as_social_housing": "No" }
+              "depends_on": { "first_time_property_let_as_social_housing": "No", "renewal": "Not Renewal" }
             },
             "property_number_of_times_relet_social_let": {
               "header": "",
@@ -1606,7 +1606,7 @@
                   "step": 1
                 }
               },
-              "depends_on": { "first_time_property_let_as_social_housing": "Yes" }
+              "depends_on": { "first_time_property_let_as_social_housing": "Yes", "renewal": "Not Renewal" }
             },
             "property_unit_type": {
               "header": "",
@@ -1634,7 +1634,7 @@
               "header": "",
               "description": "",
               "questions": {
-                "": {
+                "builtype": {
                   "check_answer_label": "Building type",
                   "header": "Which type of building is the property?",
                   "hint_text": "",
@@ -1675,7 +1675,8 @@
                   "max": 150,
                   "step": 1
                 }
-              }
+              },
+              "depends_on": { "needstype": "General Needs" }
             },
             "void_or_renewal_date": {
               "header": "",
@@ -1688,7 +1689,7 @@
                   "type": "date"
                 }
               },
-              "depends_on": { "rsnvac": "First let of newbuild property" }
+              "depends_on": { "rsnvac": "First let of newbuild property", "renewal": "Not Renewal" }
             },
             "property_major_repairs": {
               "header": "",
@@ -1705,7 +1706,8 @@
                   },
                   "conditional_for": {
                     "mrcdate": ["Yes"]
-                  }
+                  },
+                  "depends_on": { "renewal": "Not Renewal" }
                 },
                 "mrcdate": {
                   "check_answer_label": "What was the major repairs completion date?",
@@ -1715,6 +1717,30 @@
                 }
               },
               "depends_on": { "rsnvac": "First let of newbuild property" }
+            },
+            "new_build_handover_date": {
+              "header": "",
+              "description": "",
+              "questions": {
+                "majorrepairs": {
+                  "check_answer_label": "Were major repairs carried out during the void period?",
+                  "header": "Were any major repairs completed during the void period?",
+                  "hint_text": "",
+                  "type": "radio",
+                  "answer_options": {
+                    "0": "Yes",
+                    "1": "No"
+                  },
+                  "conditional_for": {
+                    "mrcdate": ["Yes"]
+                  },
+                  "depends_on": {
+                    "renewal": "Not Renewal",
+                    "rsnvac": "First let of conversion, rehabilitation or acquired property?",
+                    "rsnvac": "First let of leased property"
+                  }
+                }
+              }
             }
           }
         }
diff --git a/db/migrate/20211119104835_add_property_info_fields.rb b/db/migrate/20211119104835_add_property_info_fields.rb
new file mode 100644
index 000000000..78362fe2a
--- /dev/null
+++ b/db/migrate/20211119104835_add_property_info_fields.rb
@@ -0,0 +1,12 @@
+class AddPropertyInfoFields < ActiveRecord::Migration[6.1]
+  def change
+    change_table :case_logs, bulk: true do |t|
+      t.column :do_you_know_the_postcode, :integer
+      t.column :do_you_know_the_local_authority, :integer
+      t.column :why_dont_you_know_la, :string
+      t.column :first_time_property_let_as_social_housing, :integer
+      t.column :type_property_most_recently_let_as, :integer
+      t.column :builtype, :integer
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 72f15b7b2..9b4b2a4bd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_11_18_090831) do
+ActiveRecord::Schema.define(version: 2021_11_19_104835) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -25,6 +25,7 @@ ActiveRecord::Schema.define(version: 2021_11_18_090831) do
     t.integer "ethnic"
     t.integer "national"
     t.integer "prevten"
+    t.string "armed_forces"
     t.integer "ecstat1"
     t.integer "hhmemb"
     t.string "relat2"
@@ -59,6 +60,7 @@ ActiveRecord::Schema.define(version: 2021_11_18_090831) do
     t.integer "underoccupation_benefitcap"
     t.integer "leftreg"
     t.integer "reservist"
+    t.string "armed_forces_partner"
     t.integer "illness"
     t.integer "preg_occ"
     t.string "accessibility_requirements"
@@ -152,7 +154,12 @@ ActiveRecord::Schema.define(version: 2021_11_18_090831) do
     t.integer "incref"
     t.datetime "sale_completion_date"
     t.datetime "startdate"
-    t.integer "armedforces"
+    t.integer "do_you_know_the_postcode"
+    t.integer "do_you_know_the_local_authority"
+    t.string "why_dont_you_know_la"
+    t.integer "first_time_property_let_as_social_housing"
+    t.integer "type_property_most_recently_let_as"
+    t.integer "builtype"
     t.index ["discarded_at"], name: "index_case_logs_on_discarded_at"
   end