diff --git a/src/lib/sketch/v3/InfrastructureTypeSubform.svelte b/src/lib/sketch/v3/InfrastructureTypeSubform.svelte
index 1bc9c12c..5c916826 100644
--- a/src/lib/sketch/v3/InfrastructureTypeSubform.svelte
+++ b/src/lib/sketch/v3/InfrastructureTypeSubform.svelte
@@ -12,10 +12,24 @@
   import MeasureSubform from "./MeasureSubform.svelte";
 
   export let intervention: V3Intervention;
-  const intervention_type_options: InfrastructureSubtype[] =
-    intervention.intervention_type !== ""
-      ? infrastructureFormInformation[intervention.intervention_type].types
+  $: intervention_type_options = getInterventionTypeOptions(
+    intervention.intervention_type,
+  );
+
+  function getInterventionTypeOptions(
+    interventionType:
+      | "amenity"
+      | "bus_stop_treatment"
+      | "crossing"
+      | "junction_treatment"
+      | "link_segment"
+      | "place-making"
+      | "",
+  ): InfrastructureSubtype[] {
+    return interventionType !== ""
+      ? infrastructureFormInformation[interventionType].types
       : [];
+  }
 
   function getSubtypeObject(
     subtype: string,
@@ -44,11 +58,18 @@
     return [original, capitalisedSubsstrings.join(" ")];
   }
 
-  const subtypes: [string, string][] = intervention_type_options.map(
-    (type_options) => {
-      return formatForRadio(type_options.name);
-    },
-  );
+  $: subtypes = getSubtypes(intervention_type_options);
+
+  function getSubtypes(
+    interventionTypeOptions: InfrastructureSubtype[],
+  ): [string, string][] {
+    if (!interventionTypeOptions) {
+      return [];
+    }
+    return interventionTypeOptions.map((type_option) => {
+      return formatForRadio(type_option.name);
+    });
+  }
 
   $: subtypeObject = getSubtypeObject(
     intervention.properties.intervention_subtype,
@@ -148,17 +169,21 @@
   }
 </script>
 
-<Radio
-  label={"Intervention Subtype"}
-  choices={subtypes}
-  bind:value={intervention.properties.intervention_subtype}
-/>
-<Radio
-  label={"Context"}
-  choices={contexts}
-  bind:value={intervention.properties.context}
-/>
-{#if subtypeObject && subtypeObject.possible_measurements}
+{#if subtypes.length > 0}
+  <Radio
+    label={"Intervention Subtype"}
+    choices={subtypes}
+    bind:value={intervention.properties.intervention_subtype}
+  />
+{/if}
+{#if contexts.length > 0}
+  <Radio
+    label={"Context"}
+    choices={contexts}
+    bind:value={intervention.properties.context}
+  />
+{/if}
+{#if subtypeObject && subtypeObject.possible_measurements && subtypeObject.possible_measurements.length > 0}
   <h2>Measures</h2>
   {#each subtypeObject.possible_measurements as _measureObject, index}
     <MeasureSubform
@@ -166,7 +191,7 @@
     />
   {/each}
 {/if}
-{#if contextObject && contextObject.possible_features}
+{#if contextObject && contextObject.possible_features && contextObject.possible_features.length > 0}
   <h2>Features</h2>
   {#each contextObject.possible_features as featureObject, index}
     <FeatureSubform
diff --git a/src/lib/sketch/v3/data.ts b/src/lib/sketch/v3/data.ts
index 8942947c..8938db70 100644
--- a/src/lib/sketch/v3/data.ts
+++ b/src/lib/sketch/v3/data.ts
@@ -1,49 +1,24 @@
 import type { InfrastructureTaxonomyObject } from "types";
 
 export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
-  crossing: {
-    group: "crossing",
+  amenity: {
+    group: "amenity",
     types: [
       {
-        name: "marked priority",
+        name: "bike hangar",
         possible_measurements: [
           {
-            name: "number of crossings",
-            unit: "crossings",
+            name: "capacity",
+            unit: "bikes",
             type: "output",
           },
-          {
-            name: "number of lanes crossed",
-            unit: "lanes",
-            type: "contextual",
-          },
-          {
-            name: "refuge width",
-            unit: "m",
-            type: "contextual",
-          },
-          {
-            name: "vehicle 85th percentile speed",
-            unit: "mph",
-            type: "contextual",
-          },
-          {
-            name: "vehicle flow (daily)",
-            unit: "vpd",
-            type: "contextual",
-          },
-          {
-            name: "vehicle flow (peak hour)",
-            unit: "vph",
-            type: "contextual",
-          },
         ],
         possible_contexts: [
           {
-            context: "at side-road",
+            context: "unspecified",
             possible_features: [
               {
-                feature: "has buildout",
+                feature: "includes place-making: art",
                 valid_options: [
                   {
                     option: "no",
@@ -54,7 +29,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has dropped kerbs",
+                feature: "includes place-making: community garden",
                 valid_options: [
                   {
                     option: "no",
@@ -65,7 +40,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has raised table",
+                feature: "includes place-making: greening",
                 valid_options: [
                   {
                     option: "no",
@@ -76,7 +51,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has tactile paving",
+                feature: "includes place-making: landscaping",
                 valid_options: [
                   {
                     option: "no",
@@ -87,7 +62,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: art",
+                feature: "includes place-making: other",
                 valid_options: [
                   {
                     option: "no",
@@ -98,7 +73,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: community garden",
+                feature: "includes place-making: pocket park",
                 valid_options: [
                   {
                     option: "no",
@@ -109,7 +84,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: greening",
+                feature: "includes place-making: social space",
                 valid_options: [
                   {
                     option: "no",
@@ -120,7 +95,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: landscaping",
+                feature: "includes place-making: wayfinding",
                 valid_options: [
                   {
                     option: "no",
@@ -130,8 +105,25 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                   },
                 ],
               },
+            ],
+          },
+        ],
+      },
+      {
+        name: "bike parking",
+        possible_measurements: [
+          {
+            name: "capacity",
+            unit: "bikes",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
               {
-                feature: "includes place-making: other",
+                feature: "includes place-making: art",
                 valid_options: [
                   {
                     option: "no",
@@ -142,7 +134,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: pocket park",
+                feature: "includes place-making: community garden",
                 valid_options: [
                   {
                     option: "no",
@@ -153,7 +145,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: social space",
+                feature: "includes place-making: greening",
                 valid_options: [
                   {
                     option: "no",
@@ -164,7 +156,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: wayfinding",
+                feature: "includes place-making: landscaping",
                 valid_options: [
                   {
                     option: "no",
@@ -175,7 +167,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is continuous footway",
+                feature: "includes place-making: other",
                 valid_options: [
                   {
                     option: "no",
@@ -186,15 +178,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is signalised",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                ],
-              },
-              {
-                feature: "junction has tight radii",
+                feature: "includes place-making: pocket park",
                 valid_options: [
                   {
                     option: "no",
@@ -205,7 +189,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "pedestrians have priority over traffic",
+                feature: "includes place-making: social space",
                 valid_options: [
                   {
                     option: "no",
@@ -216,62 +200,48 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "permitted movements at side-road junctions",
-                valid_options: [
-                  {
-                    option: "entry and exit",
-                  },
-                  {
-                    option: "entry only",
-                  },
-                  {
-                    option: "exit only",
-                  },
-                ],
-              },
-              {
-                feature: "setback from junction",
+                feature: "includes place-making: wayfinding",
                 valid_options: [
                   {
-                    option: "fully setback",
-                  },
-                  {
-                    option: "not setback",
+                    option: "no",
                   },
                   {
-                    option: "partially setback",
+                    option: "yes",
                   },
                 ],
               },
             ],
           },
+        ],
+      },
+    ],
+  },
+  bus_stop_treatment: {
+    group: "bus stop treatment",
+    types: [
+      {
+        name: "bus stop bypass",
+        possible_measurements: [],
+        possible_contexts: [
           {
-            context: "stand-alone",
+            context: "unspecified",
             possible_features: [
               {
-                feature: "fulfils routing desire line",
+                feature: "bus stop placement on highway",
                 valid_options: [
                   {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
+                    option: "built-out",
                   },
-                ],
-              },
-              {
-                feature: "fulfils single movement desire line",
-                valid_options: [
                   {
-                    option: "no",
+                    option: "in-line",
                   },
                   {
-                    option: "yes",
+                    option: "lay-by",
                   },
                 ],
               },
               {
-                feature: "has buildout",
+                feature: "has bus stop shelter",
                 valid_options: [
                   {
                     option: "no",
@@ -282,7 +252,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has dropped kerbs",
+                feature: "has level boarding",
                 valid_options: [
                   {
                     option: "no",
@@ -293,29 +263,44 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has raised table",
+                feature:
+                  "level of interaction between cyclists and bus stop users",
                 valid_options: [
                   {
-                    option: "no",
+                    option: "low interaction",
                   },
                   {
-                    option: "yes",
+                    option: "medium interaction",
                   },
                 ],
               },
+            ],
+          },
+        ],
+      },
+      {
+        name: "shared use bus stop",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
               {
-                feature: "has tactile paving",
+                feature: "bus stop placement on highway",
                 valid_options: [
                   {
-                    option: "no",
+                    option: "built-out",
                   },
                   {
-                    option: "yes",
+                    option: "in-line",
+                  },
+                  {
+                    option: "lay-by",
                   },
                 ],
               },
               {
-                feature: "includes place-making: art",
+                feature: "has bus stop shelter",
                 valid_options: [
                   {
                     option: "no",
@@ -326,7 +311,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: community garden",
+                feature: "has level boarding",
                 valid_options: [
                   {
                     option: "no",
@@ -337,29 +322,41 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: greening",
+                feature:
+                  "level of interaction between cyclists and bus stop users",
                 valid_options: [
                   {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
+                    option: "high interaction",
                   },
                 ],
               },
+            ],
+          },
+        ],
+      },
+      {
+        name: "bus stop boarder",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
               {
-                feature: "includes place-making: landscaping",
+                feature: "bus stop placement on highway",
                 valid_options: [
                   {
-                    option: "no",
+                    option: "built-out",
                   },
                   {
-                    option: "yes",
+                    option: "in-line",
+                  },
+                  {
+                    option: "lay-by",
                   },
                 ],
               },
               {
-                feature: "includes place-making: other",
+                feature: "has bus stop shelter",
                 valid_options: [
                   {
                     option: "no",
@@ -370,7 +367,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: pocket park",
+                feature: "has level boarding",
                 valid_options: [
                   {
                     option: "no",
@@ -381,37 +378,47 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: social space",
+                feature:
+                  "level of interaction between cyclists and bus stop users",
                 valid_options: [
                   {
-                    option: "no",
+                    option: "high interaction",
                   },
                   {
-                    option: "yes",
+                    option: "low interaction",
+                  },
+                  {
+                    option: "medium interaction",
                   },
                 ],
               },
+            ],
+          },
+        ],
+      },
+      {
+        name: "untreated bus stop",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
               {
-                feature: "includes place-making: wayfinding",
+                feature: "bus stop placement on highway",
                 valid_options: [
                   {
-                    option: "no",
+                    option: "built-out",
                   },
                   {
-                    option: "yes",
+                    option: "in-line",
                   },
-                ],
-              },
-              {
-                feature: "is signalised",
-                valid_options: [
                   {
-                    option: "no",
+                    option: "lay-by",
                   },
                 ],
               },
               {
-                feature: "pedestrians have priority over traffic",
+                feature: "has bus stop shelter",
                 valid_options: [
                   {
                     option: "no",
@@ -422,7 +429,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "provides connection to bus stop",
+                feature: "has level boarding",
                 valid_options: [
                   {
                     option: "no",
@@ -433,23 +440,60 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "setback from junction",
+                feature:
+                  "level of interaction between cyclists and bus stop users",
                 valid_options: [
                   {
-                    option: "fully setback",
-                  },
-                  {
-                    option: "not setback",
-                  },
-                  {
-                    option: "partially setback",
+                    option: "low interaction",
                   },
                 ],
               },
             ],
           },
+        ],
+      },
+    ],
+  },
+  crossing: {
+    group: "crossing",
+    types: [
+      {
+        name: "marked priority",
+        possible_measurements: [
+          {
+            name: "number of crossings",
+            unit: "crossings",
+            type: "output",
+          },
           {
-            context: "unspecified",
+            name: "number of lanes crossed",
+            unit: "lanes",
+            type: "contextual",
+          },
+          {
+            name: "refuge width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "at side-road",
             possible_features: [
               {
                 feature: "has buildout",
@@ -584,21 +628,57 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is signalised",
+                feature: "is continuous footway",
                 valid_options: [
                   {
                     option: "no",
                   },
+                  {
+                    option: "yes",
+                  },
                 ],
               },
               {
-                feature: "pedestrians have priority over traffic",
+                feature: "is signalised",
                 valid_options: [
                   {
                     option: "no",
                   },
-                  {
-                    option: "yes",
+                ],
+              },
+              {
+                feature: "junction has tight radii",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians have priority over traffic",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "permitted movements at side-road junctions",
+                valid_options: [
+                  {
+                    option: "entry and exit",
+                  },
+                  {
+                    option: "entry only",
+                  },
+                  {
+                    option: "exit only",
                   },
                 ],
               },
@@ -618,43 +698,11 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
               },
             ],
           },
-        ],
-      },
-      {
-        name: "parallel zebra",
-        possible_measurements: [
-          {
-            name: "number of crossings",
-            unit: "crossings",
-            type: "output",
-          },
-          {
-            name: "refuge width",
-            unit: "m",
-            type: "contextual",
-          },
-          {
-            name: "vehicle 85th percentile speed",
-            unit: "mph",
-            type: "contextual",
-          },
-          {
-            name: "vehicle flow (daily)",
-            unit: "vpd",
-            type: "contextual",
-          },
-          {
-            name: "vehicle flow (peak hour)",
-            unit: "vph",
-            type: "contextual",
-          },
-        ],
-        possible_contexts: [
           {
-            context: "at side-road",
+            context: "stand-alone",
             possible_features: [
               {
-                feature: "has buildout",
+                feature: "fulfils routing desire line",
                 valid_options: [
                   {
                     option: "no",
@@ -665,7 +713,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has dropped kerbs",
+                feature: "fulfils single movement desire line",
                 valid_options: [
                   {
                     option: "no",
@@ -676,7 +724,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has pedestrian refuge",
+                feature: "has buildout",
                 valid_options: [
                   {
                     option: "no",
@@ -687,7 +735,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has raised table",
+                feature: "has dropped kerbs",
                 valid_options: [
                   {
                     option: "no",
@@ -698,7 +746,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has tactile paving",
+                feature: "has raised table",
                 valid_options: [
                   {
                     option: "no",
@@ -709,7 +757,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: art",
+                feature: "has tactile paving",
                 valid_options: [
                   {
                     option: "no",
@@ -720,7 +768,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: community garden",
+                feature: "includes place-making: art",
                 valid_options: [
                   {
                     option: "no",
@@ -731,7 +779,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: greening",
+                feature: "includes place-making: community garden",
                 valid_options: [
                   {
                     option: "no",
@@ -742,7 +790,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: landscaping",
+                feature: "includes place-making: greening",
                 valid_options: [
                   {
                     option: "no",
@@ -753,7 +801,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: other",
+                feature: "includes place-making: landscaping",
                 valid_options: [
                   {
                     option: "no",
@@ -764,7 +812,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: pocket park",
+                feature: "includes place-making: other",
                 valid_options: [
                   {
                     option: "no",
@@ -775,7 +823,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: social space",
+                feature: "includes place-making: pocket park",
                 valid_options: [
                   {
                     option: "no",
@@ -786,7 +834,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: wayfinding",
+                feature: "includes place-making: social space",
                 valid_options: [
                   {
                     option: "no",
@@ -797,7 +845,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is continuous footway",
+                feature: "includes place-making: wayfinding",
                 valid_options: [
                   {
                     option: "no",
@@ -816,7 +864,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "junction has tight radii",
+                feature: "pedestrians have priority over traffic",
                 valid_options: [
                   {
                     option: "no",
@@ -827,16 +875,13 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "permitted movements at side-road junctions",
+                feature: "provides connection to bus stop",
                 valid_options: [
                   {
-                    option: "entry and exit",
-                  },
-                  {
-                    option: "entry only",
+                    option: "no",
                   },
                   {
-                    option: "exit only",
+                    option: "yes",
                   },
                 ],
               },
@@ -857,30 +902,8 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
             ],
           },
           {
-            context: "stand-alone",
+            context: "unspecified",
             possible_features: [
-              {
-                feature: "fulfils routing desire line",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
-              {
-                feature: "fulfils single movement desire line",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
               {
                 feature: "has buildout",
                 valid_options: [
@@ -903,17 +926,6 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                   },
                 ],
               },
-              {
-                feature: "has pedestrian refuge",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
               {
                 feature: "has raised table",
                 valid_options: [
@@ -1033,7 +1045,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "provides connection to bus stop",
+                feature: "pedestrians have priority over traffic",
                 valid_options: [
                   {
                     option: "no",
@@ -1059,8 +1071,40 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
               },
             ],
           },
+        ],
+      },
+      {
+        name: "parallel zebra",
+        possible_measurements: [
           {
-            context: "unspecified",
+            name: "number of crossings",
+            unit: "crossings",
+            type: "output",
+          },
+          {
+            name: "refuge width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "at side-road",
             possible_features: [
               {
                 feature: "has buildout",
@@ -1206,76 +1250,26 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is signalised",
+                feature: "is continuous footway",
                 valid_options: [
                   {
                     option: "no",
                   },
+                  {
+                    option: "yes",
+                  },
                 ],
               },
               {
-                feature: "setback from junction",
+                feature: "is signalised",
                 valid_options: [
                   {
-                    option: "fully setback",
-                  },
-                  {
-                    option: "not setback",
-                  },
-                  {
-                    option: "partially setback",
+                    option: "no",
                   },
                 ],
               },
-            ],
-          },
-        ],
-      },
-      {
-        name: "ped-x",
-        possible_measurements: [
-          {
-            name: "crossing speed",
-            unit: "mps",
-            type: "contextual",
-          },
-          {
-            name: "number of crossings",
-            unit: "crossings",
-            type: "output",
-          },
-          {
-            name: "refuge width",
-            unit: "m",
-            type: "contextual",
-          },
-          {
-            name: "user wait time",
-            unit: "s",
-            type: "contextual",
-          },
-          {
-            name: "vehicle 85th percentile speed",
-            unit: "mph",
-            type: "contextual",
-          },
-          {
-            name: "vehicle flow (daily)",
-            unit: "vpd",
-            type: "contextual",
-          },
-          {
-            name: "vehicle flow (peak hour)",
-            unit: "vph",
-            type: "contextual",
-          },
-        ],
-        possible_contexts: [
-          {
-            context: "unspecified",
-            possible_features: [
               {
-                feature: "has buildout",
+                feature: "junction has tight radii",
                 valid_options: [
                   {
                     option: "no",
@@ -1286,21 +1280,43 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has dropped kerbs",
+                feature: "permitted movements at side-road junctions",
                 valid_options: [
                   {
-                    option: "no",
+                    option: "entry and exit",
                   },
                   {
-                    option: "yes",
+                    option: "entry only",
+                  },
+                  {
+                    option: "exit only",
                   },
                 ],
               },
               {
-                feature: "has pedestrian refuge",
+                feature: "setback from junction",
                 valid_options: [
                   {
-                    option: "no",
+                    option: "fully setback",
+                  },
+                  {
+                    option: "not setback",
+                  },
+                  {
+                    option: "partially setback",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            context: "stand-alone",
+            possible_features: [
+              {
+                feature: "fulfils routing desire line",
+                valid_options: [
+                  {
+                    option: "no",
                   },
                   {
                     option: "yes",
@@ -1308,7 +1324,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has raised table",
+                feature: "fulfils single movement desire line",
                 valid_options: [
                   {
                     option: "no",
@@ -1319,7 +1335,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has tactile paving",
+                feature: "has buildout",
                 valid_options: [
                   {
                     option: "no",
@@ -1330,7 +1346,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: art",
+                feature: "has dropped kerbs",
                 valid_options: [
                   {
                     option: "no",
@@ -1341,7 +1357,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: community garden",
+                feature: "has pedestrian refuge",
                 valid_options: [
                   {
                     option: "no",
@@ -1352,7 +1368,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: greening",
+                feature: "has raised table",
                 valid_options: [
                   {
                     option: "no",
@@ -1363,7 +1379,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: landscaping",
+                feature: "has tactile paving",
                 valid_options: [
                   {
                     option: "no",
@@ -1374,7 +1390,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: other",
+                feature: "includes place-making: art",
                 valid_options: [
                   {
                     option: "no",
@@ -1385,7 +1401,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: pocket park",
+                feature: "includes place-making: community garden",
                 valid_options: [
                   {
                     option: "no",
@@ -1396,7 +1412,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: social space",
+                feature: "includes place-making: greening",
                 valid_options: [
                   {
                     option: "no",
@@ -1407,7 +1423,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: wayfinding",
+                feature: "includes place-making: landscaping",
                 valid_options: [
                   {
                     option: "no",
@@ -1418,15 +1434,18 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is signalised",
+                feature: "includes place-making: other",
                 valid_options: [
+                  {
+                    option: "no",
+                  },
                   {
                     option: "yes",
                   },
                 ],
               },
               {
-                feature: "safe to cross indicated by audio",
+                feature: "includes place-making: pocket park",
                 valid_options: [
                   {
                     option: "no",
@@ -1437,7 +1456,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "safe to cross indicated by rotating cone",
+                feature: "includes place-making: social space",
                 valid_options: [
                   {
                     option: "no",
@@ -1448,7 +1467,26 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "safe to cross indicated by visual aids",
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is signalised",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "provides connection to bus stop",
                 valid_options: [
                   {
                     option: "no",
@@ -1474,48 +1512,6 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
               },
             ],
           },
-        ],
-      },
-      {
-        name: "pegasus",
-        possible_measurements: [
-          {
-            name: "crossing speed",
-            unit: "mps",
-            type: "contextual",
-          },
-          {
-            name: "number of crossings",
-            unit: "crossings",
-            type: "output",
-          },
-          {
-            name: "refuge width",
-            unit: "m",
-            type: "contextual",
-          },
-          {
-            name: "user wait time",
-            unit: "s",
-            type: "contextual",
-          },
-          {
-            name: "vehicle 85th percentile speed",
-            unit: "mph",
-            type: "contextual",
-          },
-          {
-            name: "vehicle flow (daily)",
-            unit: "vpd",
-            type: "contextual",
-          },
-          {
-            name: "vehicle flow (peak hour)",
-            unit: "vph",
-            type: "contextual",
-          },
-        ],
-        possible_contexts: [
           {
             context: "unspecified",
             possible_features: [
@@ -1664,43 +1660,10 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
               },
               {
                 feature: "is signalised",
-                valid_options: [
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
-              {
-                feature: "safe to cross indicated by audio",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
-              {
-                feature: "safe to cross indicated by rotating cone",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
-              {
-                feature: "safe to cross indicated by visual aids",
                 valid_options: [
                   {
                     option: "no",
                   },
-                  {
-                    option: "yes",
-                  },
                 ],
               },
               {
@@ -1722,7 +1685,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
         ],
       },
       {
-        name: "pelican",
+        name: "ped-x",
         possible_measurements: [
           {
             name: "crossing speed",
@@ -1967,7 +1930,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
         ],
       },
       {
-        name: "puffin",
+        name: "pegasus",
         possible_measurements: [
           {
             name: "crossing speed",
@@ -2212,7 +2175,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
         ],
       },
       {
-        name: "sparrow",
+        name: "pelican",
         possible_measurements: [
           {
             name: "crossing speed",
@@ -2457,7 +2420,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
         ],
       },
       {
-        name: "toucan",
+        name: "puffin",
         possible_measurements: [
           {
             name: "crossing speed",
@@ -2702,21 +2665,26 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
         ],
       },
       {
-        name: "uncontrolled",
+        name: "sparrow",
         possible_measurements: [
+          {
+            name: "crossing speed",
+            unit: "mps",
+            type: "contextual",
+          },
           {
             name: "number of crossings",
             unit: "crossings",
             type: "output",
           },
           {
-            name: "number of lanes crossed",
-            unit: "lanes",
+            name: "refuge width",
+            unit: "m",
             type: "contextual",
           },
           {
-            name: "refuge width",
-            unit: "m",
+            name: "user wait time",
+            unit: "s",
             type: "contextual",
           },
           {
@@ -2737,10 +2705,10 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
         ],
         possible_contexts: [
           {
-            context: "stand-alone",
+            context: "unspecified",
             possible_features: [
               {
-                feature: "fulfils routing desire line",
+                feature: "has buildout",
                 valid_options: [
                   {
                     option: "no",
@@ -2751,7 +2719,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "fulfils single movement desire line",
+                feature: "has dropped kerbs",
                 valid_options: [
                   {
                     option: "no",
@@ -2762,7 +2730,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has buildout",
+                feature: "has pedestrian refuge",
                 valid_options: [
                   {
                     option: "no",
@@ -2773,7 +2741,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has dropped kerbs",
+                feature: "has raised table",
                 valid_options: [
                   {
                     option: "no",
@@ -2784,7 +2752,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has pedestrian refuge",
+                feature: "has tactile paving",
                 valid_options: [
                   {
                     option: "no",
@@ -2795,7 +2763,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has raised table",
+                feature: "includes place-making: art",
                 valid_options: [
                   {
                     option: "no",
@@ -2806,7 +2774,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has tactile paving",
+                feature: "includes place-making: community garden",
                 valid_options: [
                   {
                     option: "no",
@@ -2817,7 +2785,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: art",
+                feature: "includes place-making: greening",
                 valid_options: [
                   {
                     option: "no",
@@ -2828,7 +2796,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: community garden",
+                feature: "includes place-making: landscaping",
                 valid_options: [
                   {
                     option: "no",
@@ -2839,7 +2807,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: greening",
+                feature: "includes place-making: other",
                 valid_options: [
                   {
                     option: "no",
@@ -2850,7 +2818,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: landscaping",
+                feature: "includes place-making: pocket park",
                 valid_options: [
                   {
                     option: "no",
@@ -2861,7 +2829,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: other",
+                feature: "includes place-making: social space",
                 valid_options: [
                   {
                     option: "no",
@@ -2872,7 +2840,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: pocket park",
+                feature: "includes place-making: wayfinding",
                 valid_options: [
                   {
                     option: "no",
@@ -2883,18 +2851,15 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: social space",
+                feature: "is signalised",
                 valid_options: [
-                  {
-                    option: "no",
-                  },
                   {
                     option: "yes",
                   },
                 ],
               },
               {
-                feature: "includes place-making: wayfinding",
+                feature: "safe to cross indicated by audio",
                 valid_options: [
                   {
                     option: "no",
@@ -2905,15 +2870,18 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is signalised",
+                feature: "safe to cross indicated by rotating cone",
                 valid_options: [
                   {
                     option: "no",
                   },
+                  {
+                    option: "yes",
+                  },
                 ],
               },
               {
-                feature: "provides connection to bus stop",
+                feature: "safe to cross indicated by visual aids",
                 valid_options: [
                   {
                     option: "no",
@@ -2939,6 +2907,48 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
               },
             ],
           },
+        ],
+      },
+      {
+        name: "toucan",
+        possible_measurements: [
+          {
+            name: "crossing speed",
+            unit: "mps",
+            type: "contextual",
+          },
+          {
+            name: "number of crossings",
+            unit: "crossings",
+            type: "output",
+          },
+          {
+            name: "refuge width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "user wait time",
+            unit: "s",
+            type: "contextual",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
           {
             context: "unspecified",
             possible_features: [
@@ -3089,15 +3099,48 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 feature: "is signalised",
                 valid_options: [
                   {
-                    option: "no",
+                    option: "yes",
                   },
                 ],
               },
               {
-                feature: "setback from junction",
+                feature: "safe to cross indicated by audio",
                 valid_options: [
                   {
-                    option: "fully setback",
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "safe to cross indicated by rotating cone",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "safe to cross indicated by visual aids",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "setback from junction",
+                valid_options: [
+                  {
+                    option: "fully setback",
                   },
                   {
                     option: "not setback",
@@ -3112,13 +3155,18 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
         ],
       },
       {
-        name: "zebra",
+        name: "uncontrolled",
         possible_measurements: [
           {
             name: "number of crossings",
             unit: "crossings",
             type: "output",
           },
+          {
+            name: "number of lanes crossed",
+            unit: "lanes",
+            type: "contextual",
+          },
           {
             name: "refuge width",
             unit: "m",
@@ -3142,10 +3190,10 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
         ],
         possible_contexts: [
           {
-            context: "at side-road",
+            context: "stand-alone",
             possible_features: [
               {
-                feature: "has buildout",
+                feature: "fulfils routing desire line",
                 valid_options: [
                   {
                     option: "no",
@@ -3156,7 +3204,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has dropped kerbs",
+                feature: "fulfils single movement desire line",
                 valid_options: [
                   {
                     option: "no",
@@ -3167,7 +3215,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has pedestrian refuge",
+                feature: "has buildout",
                 valid_options: [
                   {
                     option: "no",
@@ -3178,7 +3226,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has raised table",
+                feature: "has dropped kerbs",
                 valid_options: [
                   {
                     option: "no",
@@ -3189,7 +3237,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "has tactile paving",
+                feature: "has pedestrian refuge",
                 valid_options: [
                   {
                     option: "no",
@@ -3200,7 +3248,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: art",
+                feature: "has raised table",
                 valid_options: [
                   {
                     option: "no",
@@ -3211,7 +3259,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: community garden",
+                feature: "has tactile paving",
                 valid_options: [
                   {
                     option: "no",
@@ -3222,7 +3270,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: greening",
+                feature: "includes place-making: art",
                 valid_options: [
                   {
                     option: "no",
@@ -3233,7 +3281,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: landscaping",
+                feature: "includes place-making: community garden",
                 valid_options: [
                   {
                     option: "no",
@@ -3244,7 +3292,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: other",
+                feature: "includes place-making: greening",
                 valid_options: [
                   {
                     option: "no",
@@ -3255,7 +3303,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: pocket park",
+                feature: "includes place-making: landscaping",
                 valid_options: [
                   {
                     option: "no",
@@ -3266,7 +3314,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: social space",
+                feature: "includes place-making: other",
                 valid_options: [
                   {
                     option: "no",
@@ -3277,7 +3325,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "includes place-making: wayfinding",
+                feature: "includes place-making: pocket park",
                 valid_options: [
                   {
                     option: "no",
@@ -3288,7 +3336,7 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is continuous footway",
+                feature: "includes place-making: social space",
                 valid_options: [
                   {
                     option: "no",
@@ -3299,35 +3347,32 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                 ],
               },
               {
-                feature: "is signalised",
+                feature: "includes place-making: wayfinding",
                 valid_options: [
                   {
                     option: "no",
                   },
+                  {
+                    option: "yes",
+                  },
                 ],
               },
               {
-                feature: "junction has tight radii",
+                feature: "is signalised",
                 valid_options: [
                   {
                     option: "no",
                   },
-                  {
-                    option: "yes",
-                  },
                 ],
               },
               {
-                feature: "permitted movements at side-road junctions",
+                feature: "provides connection to bus stop",
                 valid_options: [
                   {
-                    option: "entry and exit",
-                  },
-                  {
-                    option: "entry only",
+                    option: "no",
                   },
                   {
-                    option: "exit only",
+                    option: "yes",
                   },
                 ],
               },
@@ -3348,30 +3393,8 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
             ],
           },
           {
-            context: "stand-alone",
+            context: "unspecified",
             possible_features: [
-              {
-                feature: "fulfils routing desire line",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
-              {
-                feature: "fulfils single movement desire line",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
               {
                 feature: "has buildout",
                 valid_options: [
@@ -3523,17 +3546,6 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                   },
                 ],
               },
-              {
-                feature: "provides connection to bus stop",
-                valid_options: [
-                  {
-                    option: "no",
-                  },
-                  {
-                    option: "yes",
-                  },
-                ],
-              },
               {
                 feature: "setback from junction",
                 valid_options: [
@@ -3550,8 +3562,40 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
               },
             ],
           },
+        ],
+      },
+      {
+        name: "zebra",
+        possible_measurements: [
+          {
+            name: "number of crossings",
+            unit: "crossings",
+            type: "output",
+          },
           {
-            context: "unspecified",
+            name: "refuge width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "at side-road",
             possible_features: [
               {
                 feature: "has buildout",
@@ -3696,6 +3740,17 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                   },
                 ],
               },
+              {
+                feature: "is continuous footway",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
               {
                 feature: "is signalised",
                 valid_options: [
@@ -3704,6 +3759,31 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
                   },
                 ],
               },
+              {
+                feature: "junction has tight radii",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "permitted movements at side-road junctions",
+                valid_options: [
+                  {
+                    option: "entry and exit",
+                  },
+                  {
+                    option: "entry only",
+                  },
+                  {
+                    option: "exit only",
+                  },
+                ],
+              },
               {
                 feature: "setback from junction",
                 valid_options: [
@@ -3720,6 +3800,3750 @@ export const infrastructureFormInformation: InfrastructureTaxonomyObject = {
               },
             ],
           },
+          {
+            context: "stand-alone",
+            possible_features: [
+              {
+                feature: "fulfils routing desire line",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "fulfils single movement desire line",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has buildout",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has dropped kerbs",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has pedestrian refuge",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has raised table",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has tactile paving",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is signalised",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "provides connection to bus stop",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "setback from junction",
+                valid_options: [
+                  {
+                    option: "fully setback",
+                  },
+                  {
+                    option: "not setback",
+                  },
+                  {
+                    option: "partially setback",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "has buildout",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has dropped kerbs",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has pedestrian refuge",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has raised table",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has tactile paving",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is signalised",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "setback from junction",
+                valid_options: [
+                  {
+                    option: "fully setback",
+                  },
+                  {
+                    option: "not setback",
+                  },
+                  {
+                    option: "partially setback",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  junction_treatment: {
+    group: "junction treatment",
+    types: [
+      {
+        name: "cycle facilities at traffic signals",
+        possible_measurements: [
+          {
+            name: "ATE Junction Assessment Tool score",
+            unit: "%",
+            type: "contextual",
+          },
+          {
+            name: "number of junction arms",
+            unit: "arms",
+            type: "contextual",
+          },
+          {
+            name: "number of junctions",
+            unit: "junctions",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes advanced stop line",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes cycle and pedestrian only stage",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes cycle bypass",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes cycle gate",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes early release",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes hold the left",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes separate cycle phases",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes two-stage right turn",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is signalised",
+                valid_options: [
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "cycle optimised protected signals (CYCLOPS)",
+        possible_measurements: [
+          {
+            name: "ATE Junction Assessment Tool score",
+            unit: "%",
+            type: "contextual",
+          },
+          {
+            name: "number of junction arms",
+            unit: "arms",
+            type: "contextual",
+          },
+          {
+            name: "number of junctions",
+            unit: "junctions",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is signalised",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "Dutch-style roundabout",
+        possible_measurements: [
+          {
+            name: "ATE Junction Assessment Tool score",
+            unit: "%",
+            type: "contextual",
+          },
+          {
+            name: "number of junction arms",
+            unit: "arms",
+            type: "contextual",
+          },
+          {
+            name: "number of junctions",
+            unit: "junctions",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is signalised",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "roundabout",
+        possible_measurements: [
+          {
+            name: "ATE Junction Assessment Tool score",
+            unit: "%",
+            type: "contextual",
+          },
+          {
+            name: "number of junction arms",
+            unit: "arms",
+            type: "contextual",
+          },
+          {
+            name: "number of junctions",
+            unit: "junctions",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "tight entry/exit radii",
+        possible_measurements: [
+          {
+            name: "ATE Junction Assessment Tool score",
+            unit: "%",
+            type: "contextual",
+          },
+          {
+            name: "number of junction arms",
+            unit: "arms",
+            type: "contextual",
+          },
+          {
+            name: "number of junctions",
+            unit: "junctions",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is signalised",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  link_segment: {
+    group: "link segment",
+    types: [
+      {
+        name: "cycle lane marked on road",
+        possible_measurements: [
+          {
+            name: "highway lane width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "lane marking type",
+                valid_options: [
+                  {
+                    option: "advisory cycle lane",
+                  },
+                  {
+                    option: "bus lane",
+                  },
+                  {
+                    option: "mandatory cycle lane",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "side of road",
+                valid_options: [
+                  {
+                    option: "left",
+                  },
+                  {
+                    option: "right",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "no cycling provision",
+        possible_measurements: [
+          {
+            name: "highway lane width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "side of road",
+                valid_options: [
+                  {
+                    option: "left",
+                  },
+                  {
+                    option: "right",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "no equestrian provision",
+        possible_measurements: [
+          {
+            name: "highway lane width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "side of road",
+                valid_options: [
+                  {
+                    option: "left",
+                  },
+                  {
+                    option: "right",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "no pedestrian provision",
+        possible_measurements: [
+          {
+            name: "highway lane width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "side of road",
+                valid_options: [
+                  {
+                    option: "left",
+                  },
+                  {
+                    option: "right",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "pavement or footway",
+        possible_measurements: [
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "pavement width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "surface grip",
+            unit: "ptv",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "alongside carriageway",
+            possible_features: [
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is separated from carriageway by a buffer",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is separated from carriageway by a kerb",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "side of road",
+                valid_options: [
+                  {
+                    option: "left",
+                  },
+                  {
+                    option: "right",
+                  },
+                ],
+              },
+              {
+                feature: "surface type",
+                valid_options: [
+                  {
+                    option: "bound and porous",
+                  },
+                  {
+                    option: "bound and sealed",
+                  },
+                  {
+                    option: "paved with greater than 5mm joints",
+                  },
+                  {
+                    option: "paved with less than 5mm joints",
+                  },
+                  {
+                    option: "paved with mortared joints",
+                  },
+                  {
+                    option: "unbound or unsealed",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "surface type",
+                valid_options: [
+                  {
+                    option: "bound and porous",
+                  },
+                  {
+                    option: "bound and sealed",
+                  },
+                  {
+                    option: "paved with greater than 5mm joints",
+                  },
+                  {
+                    option: "paved with less than 5mm joints",
+                  },
+                  {
+                    option: "paved with mortared joints",
+                  },
+                  {
+                    option: "unbound or unsealed",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "quiet link",
+        possible_measurements: [
+          {
+            name: "highway lane width",
+            unit: "m",
+            type: "contextual",
+          },
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "vehicle 85th percentile speed",
+            unit: "mph",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (daily)",
+            unit: "vpd",
+            type: "contextual",
+          },
+          {
+            name: "vehicle flow (peak hour)",
+            unit: "vph",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "segregated cycle track",
+        possible_measurements: [
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "track width",
+            unit: "m",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "alongside carriageway",
+            possible_features: [
+              {
+                feature: "cyclist direction",
+                valid_options: [
+                  {
+                    option: "bi-directional",
+                  },
+                  {
+                    option: "single direction",
+                  },
+                ],
+              },
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has cyclist barriers causing dismount",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is at pavement level",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is separated from carriageway by a kerb",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature:
+                  "is separated from carriageway by intermittent object placement",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is stepped up from carriageway",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "side of road",
+                valid_options: [
+                  {
+                    option: "left",
+                  },
+                  {
+                    option: "right",
+                  },
+                ],
+              },
+              {
+                feature: "surface type",
+                valid_options: [
+                  {
+                    option: "blocks",
+                  },
+                  {
+                    option: "hand-laid asphalt",
+                  },
+                  {
+                    option: "machine-laid asphalt",
+                  },
+                  {
+                    option: "unbound or unsealed",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "cyclist direction",
+                valid_options: [
+                  {
+                    option: "bi-directional",
+                  },
+                  {
+                    option: "single direction",
+                  },
+                ],
+              },
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has cyclist barriers causing dismount",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "surface type",
+                valid_options: [
+                  {
+                    option: "blocks",
+                  },
+                  {
+                    option: "hand-laid asphalt",
+                  },
+                  {
+                    option: "machine-laid asphalt",
+                  },
+                  {
+                    option: "unbound or unsealed",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "shared use track",
+        possible_measurements: [
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "surface grip",
+            unit: "ptv",
+            type: "contextual",
+          },
+          {
+            name: "track width",
+            unit: "m",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "alongside carriageway",
+            possible_features: [
+              {
+                feature: "cyclist direction",
+                valid_options: [
+                  {
+                    option: "bi-directional",
+                  },
+                  {
+                    option: "single direction",
+                  },
+                ],
+              },
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has cyclist barriers causing dismount",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is separated from carriageway by a buffer",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is separated from carriageway by a kerb",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is stepped up from carriageway",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "side of road",
+                valid_options: [
+                  {
+                    option: "left",
+                  },
+                  {
+                    option: "right",
+                  },
+                ],
+              },
+              {
+                feature: "surface type",
+                valid_options: [
+                  {
+                    option: "bound and porous",
+                  },
+                  {
+                    option: "bound and sealed",
+                  },
+                  {
+                    option: "unbound or unsealed",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "cyclist direction",
+                valid_options: [
+                  {
+                    option: "bi-directional",
+                  },
+                  {
+                    option: "single direction",
+                  },
+                ],
+              },
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "has cyclist barriers causing dismount",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "surface type",
+                valid_options: [
+                  {
+                    option: "bound and porous",
+                  },
+                  {
+                    option: "bound and sealed",
+                  },
+                  {
+                    option: "unbound or unsealed",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "trotting strip",
+        possible_measurements: [
+          {
+            name: "link segment length",
+            unit: "m",
+            type: "output",
+          },
+          {
+            name: "trotting strip width",
+            unit: "m",
+            type: "contextual",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "alongside carriageway",
+            possible_features: [
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is at pavement level",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is separated from carriageway by a kerb",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature:
+                  "is separated from carriageway by intermittent object placement",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "is stepped up from carriageway",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "side of road",
+                valid_options: [
+                  {
+                    option: "left",
+                  },
+                  {
+                    option: "right",
+                  },
+                ],
+              },
+              {
+                feature: "surface type",
+                valid_options: [
+                  {
+                    option: "bound and porous",
+                  },
+                  {
+                    option: "bound and sealed",
+                  },
+                  {
+                    option: "grass",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "cyclists expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "horses expected on link",
+                valid_options: [
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "lighting",
+                valid_options: [
+                  {
+                    option: "bat-friendly lighting",
+                  },
+                  {
+                    option: "long stretches of darkness",
+                  },
+                  {
+                    option: "no lighting",
+                  },
+                  {
+                    option: "short stretches of darkness otherwise well-lit",
+                  },
+                  {
+                    option: "well-lit",
+                  },
+                ],
+              },
+              {
+                feature: "pedestrians expected on link",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                ],
+              },
+              {
+                feature: "surface type",
+                valid_options: [
+                  {
+                    option: "bound and porous",
+                  },
+                  {
+                    option: "bound and sealed",
+                  },
+                  {
+                    option: "grass",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  modal_filter: {
+    group: "modal filter",
+    types: [
+      {
+        name: "bollard / planter",
+        possible_measurements: [
+          {
+            name: "number of modal filters",
+            unit: "modal filters",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "accessibility",
+                valid_options: [
+                  {
+                    option: "accessible to wheelchair users",
+                  },
+                  {
+                    option: "inaccessible to wheelchair users",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "timing",
+                valid_options: [
+                  {
+                    option: "at all times",
+                  },
+                  {
+                    option: "part time",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "bus / tram gate",
+        possible_measurements: [
+          {
+            name: "number of modal filters",
+            unit: "modal filters",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "timing",
+                valid_options: [
+                  {
+                    option: "at all times",
+                  },
+                  {
+                    option: "part time",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "camera restriction",
+        possible_measurements: [
+          {
+            name: "number of modal filters",
+            unit: "modal filters",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "timing",
+                valid_options: [
+                  {
+                    option: "at all times",
+                  },
+                  {
+                    option: "part time",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "school street",
+        possible_measurements: [
+          {
+            name: "number of modal filters",
+            unit: "modal filters",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "timing",
+                valid_options: [
+                  {
+                    option: "at all times",
+                  },
+                  {
+                    option: "part time",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "signed restriction",
+        possible_measurements: [
+          {
+            name: "number of modal filters",
+            unit: "modal filters",
+            type: "output",
+          },
+        ],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "includes place-making: art",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: community garden",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: greening",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: landscaping",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: other",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: pocket park",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: social space",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "includes place-making: wayfinding",
+                valid_options: [
+                  {
+                    option: "no",
+                  },
+                  {
+                    option: "yes",
+                  },
+                ],
+              },
+              {
+                feature: "timing",
+                valid_options: [
+                  {
+                    option: "at all times",
+                  },
+                  {
+                    option: "part time",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  "place-making": {
+    group: "place-making",
+    types: [
+      {
+        name: "other place-making",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "None",
+                valid_options: [],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "social space",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "None",
+                valid_options: [],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "greening",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "None",
+                valid_options: [],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "art",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "None",
+                valid_options: [],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "pocket park",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "None",
+                valid_options: [],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "landscaping",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "None",
+                valid_options: [],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "wayfinding",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "None",
+                valid_options: [],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        name: "community garden",
+        possible_measurements: [],
+        possible_contexts: [
+          {
+            context: "unspecified",
+            possible_features: [
+              {
+                feature: "None",
+                valid_options: [],
+              },
+            ],
+          },
         ],
       },
     ],
diff --git a/src/lib/sketch/v3/infrastructure.json b/src/lib/sketch/v3/infrastructure.json
deleted file mode 100644
index 1bdb7995..00000000
--- a/src/lib/sketch/v3/infrastructure.json
+++ /dev/null
@@ -1,3424 +0,0 @@
-{
-  "crossing": {
-    "types": [
-      {
-        "name": "marked priority",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "at side-road",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is continuous footway",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "junction has tight radii",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "pedestrians have priority over traffic",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "permitted movements at side-road junctions",
-                "valid_options": [
-                  {
-                    "option": "entry and exit"
-                  },
-                  {
-                    "option": "entry only"
-                  },
-                  {
-                    "option": "exit only"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "context": "stand-alone",
-            "possible_features": [
-              {
-                "feature": "fulfils routing desire line",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "fulfils single movement desire line",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "pedestrians have priority over traffic",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "provides connection to bus stop",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "pedestrians have priority over traffic",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "parallel zebra",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "at side-road",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is continuous footway",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "junction has tight radii",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "permitted movements at side-road junctions",
-                "valid_options": [
-                  {
-                    "option": "entry and exit"
-                  },
-                  {
-                    "option": "entry only"
-                  },
-                  {
-                    "option": "exit only"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "context": "stand-alone",
-            "possible_features": [
-              {
-                "feature": "fulfils routing desire line",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "fulfils single movement desire line",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "provides connection to bus stop",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "ped-x",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by audio",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by rotating cone",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by visual aids",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "pegasus",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by audio",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by rotating cone",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by visual aids",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "pelican",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by audio",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by rotating cone",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by visual aids",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "puffin",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by audio",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by rotating cone",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by visual aids",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "sparrow",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by audio",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by rotating cone",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by visual aids",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "toucan",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by audio",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by rotating cone",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "safe to cross indicated by visual aids",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "uncontrolled",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "stand-alone",
-            "possible_features": [
-              {
-                "feature": "fulfils routing desire line",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "fulfils single movement desire line",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "provides connection to bus stop",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "zebra",
-        "measurement": {
-          "name": "number of crossings",
-          "unit": "crossings"
-        },
-        "possible_contexts": [
-          {
-            "context": "at side-road",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is continuous footway",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "junction has tight radii",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "permitted movements at side-road junctions",
-                "valid_options": [
-                  {
-                    "option": "entry and exit"
-                  },
-                  {
-                    "option": "entry only"
-                  },
-                  {
-                    "option": "exit only"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "context": "stand-alone",
-            "possible_features": [
-              {
-                "feature": "fulfils routing desire line",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "fulfils single movement desire line",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "provides connection to bus stop",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "context": "unspecified",
-            "possible_features": [
-              {
-                "feature": "has buildout",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has dropped kerbs",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has pedestrian refuge",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has raised table",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "has tactile paving",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: art",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: community garden",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: greening",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: landscaping",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: other",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: pocket park",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: social space",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "includes place-making: wayfinding",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  },
-                  {
-                    "option": "yes"
-                  }
-                ]
-              },
-              {
-                "feature": "is signalised",
-                "valid_options": [
-                  {
-                    "option": "no"
-                  }
-                ]
-              },
-              {
-                "feature": "setback from junction",
-                "valid_options": [
-                  {
-                    "option": "fully setback"
-                  },
-                  {
-                    "option": "not setback"
-                  },
-                  {
-                    "option": "partially setback"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/src/types.ts b/src/types.ts
index 06336963..37958636 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -148,12 +148,13 @@ export interface V2Intervention {
 }
 
 export interface V3Intervention {
-  intervention_type: // | "area"
-  // | "route"
-  | "crossing"
-    // | "modal filter"
-    // | "junction treatment"
-    // | "other"
+  intervention_type:
+    | "amenity"
+    | "bus_stop_treatment"
+    | "crossing"
+    | "junction_treatment"
+    | "link_segment"
+    | "place-making"
     | "";
   properties: V3InterventionProps;
 }
@@ -177,7 +178,13 @@ export interface InfrastructureFeature {
 }
 
 export interface InfrastructureTaxonomyObject {
+  amenity: InfrastructureGroup;
+  bus_stop_treatment: InfrastructureGroup;
   crossing: InfrastructureGroup;
+  junction_treatment: InfrastructureGroup;
+  link_segment: InfrastructureGroup;
+  modal_filter: InfrastructureGroup;
+  "place-making": InfrastructureGroup;
 }
 
 export interface InfrastructureGroup {